Constify target name, reloc name, and carsym name
bfd/ * bfd-in.h (carsym.name): Make const. * reloc.c (struct reloc_howto_struct.name): Likewise. * targets.c (bfd_target.name): Likewise.! * bfd.c (bfd_get_sign_extend_vma): Make variable const. * som.c (som_bfd_fill_in_ar_symbols): Use an intermediary variable when setting carsym.name. * bfd-in2.h: Regenerate. gdb/ * amd64-dicos-tdep.c (amd64_dicos_osabi_sniffer): Constify target. * i386-cygwin-tdep.c (i386_cygwin_init_abi): Likewise. * i386-dicos-tdep.c (i386_dicos_osabi_sniffer): Likewise. ld/ * ldlang.c (stricpy, strcut, name_compare): Constify params. (get_first_input_target): Make return and "target" const.
This commit is contained in:
parent
90d92a632a
commit
1d38e9d14c
@ -1,3 +1,13 @@
|
|||||||
|
2019-09-18 Alan Modra <amodra@gmail.com>
|
||||||
|
|
||||||
|
* bfd-in.h (carsym.name): Make const.
|
||||||
|
* reloc.c (struct reloc_howto_struct.name): Likewise.
|
||||||
|
* targets.c (bfd_target.name): Likewise.!
|
||||||
|
* bfd.c (bfd_get_sign_extend_vma): Make variable const.
|
||||||
|
* som.c (som_bfd_fill_in_ar_symbols): Use an intermediary variable
|
||||||
|
when setting carsym.name.
|
||||||
|
* bfd-in2.h: Regenerate.
|
||||||
|
|
||||||
2019-09-18 Alan Modra <amodra@gmail.com>
|
2019-09-18 Alan Modra <amodra@gmail.com>
|
||||||
|
|
||||||
* mach-o.c (bfd_mach_o_fat_member_init): Likewise. Replace
|
* mach-o.c (bfd_mach_o_fat_member_init): Likewise. Replace
|
||||||
|
@ -257,7 +257,7 @@ typedef unsigned long symindex;
|
|||||||
/* This is a type pun with struct ranlib on purpose! */
|
/* This is a type pun with struct ranlib on purpose! */
|
||||||
typedef struct carsym
|
typedef struct carsym
|
||||||
{
|
{
|
||||||
char *name;
|
const char *name;
|
||||||
file_ptr file_offset; /* Look here to find the file. */
|
file_ptr file_offset; /* Look here to find the file. */
|
||||||
}
|
}
|
||||||
carsym; /* To make these you call a carsymogen. */
|
carsym; /* To make these you call a carsymogen. */
|
||||||
|
@ -264,7 +264,7 @@ typedef unsigned long symindex;
|
|||||||
/* This is a type pun with struct ranlib on purpose! */
|
/* This is a type pun with struct ranlib on purpose! */
|
||||||
typedef struct carsym
|
typedef struct carsym
|
||||||
{
|
{
|
||||||
char *name;
|
const char *name;
|
||||||
file_ptr file_offset; /* Look here to find the file. */
|
file_ptr file_offset; /* Look here to find the file. */
|
||||||
}
|
}
|
||||||
carsym; /* To make these you call a carsymogen. */
|
carsym; /* To make these you call a carsymogen. */
|
||||||
@ -2718,7 +2718,7 @@ struct reloc_howto_struct
|
|||||||
bfd *, char **);
|
bfd *, char **);
|
||||||
|
|
||||||
/* The textual name of the relocation type. */
|
/* The textual name of the relocation type. */
|
||||||
char *name;
|
const char *name;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define HOWTO(type, right, size, bits, pcrel, left, ovf, func, name, \
|
#define HOWTO(type, right, size, bits, pcrel, left, ovf, func, name, \
|
||||||
@ -7634,7 +7634,7 @@ typedef struct flag_info flag_info;
|
|||||||
typedef struct bfd_target
|
typedef struct bfd_target
|
||||||
{
|
{
|
||||||
/* Identifies the kind of target, e.g., SunOS4, Ultrix, etc. */
|
/* Identifies the kind of target, e.g., SunOS4, Ultrix, etc. */
|
||||||
char *name;
|
const char *name;
|
||||||
|
|
||||||
/* The "flavour" of a back end is a general indication about
|
/* The "flavour" of a back end is a general indication about
|
||||||
the contents of a file. */
|
the contents of a file. */
|
||||||
|
@ -1507,7 +1507,7 @@ RETURNS
|
|||||||
int
|
int
|
||||||
bfd_get_sign_extend_vma (bfd *abfd)
|
bfd_get_sign_extend_vma (bfd *abfd)
|
||||||
{
|
{
|
||||||
char *name;
|
const char *name;
|
||||||
|
|
||||||
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
|
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
|
||||||
return get_elf_backend_data (abfd)->sign_extend_vma;
|
return get_elf_backend_data (abfd)->sign_extend_vma;
|
||||||
|
@ -361,7 +361,7 @@ CODE_FRAGMENT
|
|||||||
. bfd *, char **);
|
. bfd *, char **);
|
||||||
.
|
.
|
||||||
. {* The textual name of the relocation type. *}
|
. {* The textual name of the relocation type. *}
|
||||||
. char *name;
|
. const char *name;
|
||||||
.};
|
.};
|
||||||
.
|
.
|
||||||
*/
|
*/
|
||||||
|
19
bfd/som.c
19
bfd/som.c
@ -5995,6 +5995,7 @@ som_bfd_fill_in_ar_symbols (bfd *abfd,
|
|||||||
unsigned int hash_val;
|
unsigned int hash_val;
|
||||||
unsigned int len;
|
unsigned int len;
|
||||||
unsigned char ext_len[4];
|
unsigned char ext_len[4];
|
||||||
|
char *name;
|
||||||
|
|
||||||
/* An empty chain has zero as it's file offset. */
|
/* An empty chain has zero as it's file offset. */
|
||||||
hash_val = bfd_getb32 (hash_table + 4 * i);
|
hash_val = bfd_getb32 (hash_table + 4 * i);
|
||||||
@ -6025,13 +6026,14 @@ som_bfd_fill_in_ar_symbols (bfd *abfd,
|
|||||||
len = bfd_getb32 (ext_len);
|
len = bfd_getb32 (ext_len);
|
||||||
|
|
||||||
/* Allocate space for the name and null terminate it too. */
|
/* Allocate space for the name and null terminate it too. */
|
||||||
set->name = bfd_zalloc (abfd, (bfd_size_type) len + 1);
|
name = bfd_zalloc (abfd, (bfd_size_type) len + 1);
|
||||||
if (!set->name)
|
if (!name)
|
||||||
goto error_return;
|
goto error_return;
|
||||||
if (bfd_bread (set->name, (bfd_size_type) len, abfd) != len)
|
if (bfd_bread (name, (bfd_size_type) len, abfd) != len)
|
||||||
goto error_return;
|
goto error_return;
|
||||||
|
|
||||||
set->name[len] = 0;
|
name[len] = 0;
|
||||||
|
set->name = name;
|
||||||
|
|
||||||
/* Fill in the file offset. Note that the "location" field points
|
/* Fill in the file offset. Note that the "location" field points
|
||||||
to the SOM itself, not the ar_hdr in front of it. */
|
to the SOM itself, not the ar_hdr in front of it. */
|
||||||
@ -6068,13 +6070,14 @@ som_bfd_fill_in_ar_symbols (bfd *abfd,
|
|||||||
len = bfd_getb32 (ext_len);
|
len = bfd_getb32 (ext_len);
|
||||||
|
|
||||||
/* Allocate space for the name and null terminate it too. */
|
/* Allocate space for the name and null terminate it too. */
|
||||||
set->name = bfd_zalloc (abfd, (bfd_size_type) len + 1);
|
name = bfd_zalloc (abfd, (bfd_size_type) len + 1);
|
||||||
if (!set->name)
|
if (!name)
|
||||||
goto error_return;
|
goto error_return;
|
||||||
|
|
||||||
if (bfd_bread (set->name, (bfd_size_type) len, abfd) != len)
|
if (bfd_bread (name, (bfd_size_type) len, abfd) != len)
|
||||||
goto error_return;
|
goto error_return;
|
||||||
set->name[len] = 0;
|
name[len] = 0;
|
||||||
|
set->name = name;
|
||||||
|
|
||||||
/* Fill in the file offset. Note that the "location" field points
|
/* Fill in the file offset. Note that the "location" field points
|
||||||
to the SOM itself, not the ar_hdr in front of it. */
|
to the SOM itself, not the ar_hdr in front of it. */
|
||||||
|
@ -179,7 +179,7 @@ DESCRIPTION
|
|||||||
.typedef struct bfd_target
|
.typedef struct bfd_target
|
||||||
.{
|
.{
|
||||||
. {* Identifies the kind of target, e.g., SunOS4, Ultrix, etc. *}
|
. {* Identifies the kind of target, e.g., SunOS4, Ultrix, etc. *}
|
||||||
. char *name;
|
. const char *name;
|
||||||
.
|
.
|
||||||
. {* The "flavour" of a back end is a general indication about
|
. {* The "flavour" of a back end is a general indication about
|
||||||
. the contents of a file. *}
|
. the contents of a file. *}
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2019-09-18 Alan Modra <amodra@gmail.com>
|
||||||
|
|
||||||
|
* amd64-dicos-tdep.c (amd64_dicos_osabi_sniffer): Constify target.
|
||||||
|
* i386-cygwin-tdep.c (i386_cygwin_init_abi): Likewise.
|
||||||
|
* i386-dicos-tdep.c (i386_dicos_osabi_sniffer): Likewise.
|
||||||
|
|
||||||
2019-09-18 Alan Modra <amodra@gmail.com>
|
2019-09-18 Alan Modra <amodra@gmail.com>
|
||||||
|
|
||||||
* solib-spu.c (spu_bfd_open): Use bfd_set_filename.
|
* solib-spu.c (spu_bfd_open): Use bfd_set_filename.
|
||||||
|
@ -35,7 +35,7 @@ amd64_dicos_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
|
|||||||
static enum gdb_osabi
|
static enum gdb_osabi
|
||||||
amd64_dicos_osabi_sniffer (bfd *abfd)
|
amd64_dicos_osabi_sniffer (bfd *abfd)
|
||||||
{
|
{
|
||||||
char *target_name = bfd_get_target (abfd);
|
const char *target_name = bfd_get_target (abfd);
|
||||||
|
|
||||||
/* On amd64-DICOS, the Load Module's "header" section is 72
|
/* On amd64-DICOS, the Load Module's "header" section is 72
|
||||||
bytes. */
|
bytes. */
|
||||||
|
@ -229,7 +229,7 @@ i386_cygwin_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
|
|||||||
static enum gdb_osabi
|
static enum gdb_osabi
|
||||||
i386_cygwin_osabi_sniffer (bfd *abfd)
|
i386_cygwin_osabi_sniffer (bfd *abfd)
|
||||||
{
|
{
|
||||||
char *target_name = bfd_get_target (abfd);
|
const char *target_name = bfd_get_target (abfd);
|
||||||
|
|
||||||
if (strcmp (target_name, "pei-i386") == 0)
|
if (strcmp (target_name, "pei-i386") == 0)
|
||||||
return GDB_OSABI_CYGWIN;
|
return GDB_OSABI_CYGWIN;
|
||||||
|
@ -31,7 +31,7 @@ i386_dicos_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
|
|||||||
static enum gdb_osabi
|
static enum gdb_osabi
|
||||||
i386_dicos_osabi_sniffer (bfd *abfd)
|
i386_dicos_osabi_sniffer (bfd *abfd)
|
||||||
{
|
{
|
||||||
char *target_name = bfd_get_target (abfd);
|
const char *target_name = bfd_get_target (abfd);
|
||||||
|
|
||||||
/* On x86-DICOS, the Load Module's "header" section is 36 bytes. */
|
/* On x86-DICOS, the Load Module's "header" section is 36 bytes. */
|
||||||
if (strcmp (target_name, "elf32-i386") == 0
|
if (strcmp (target_name, "elf32-i386") == 0
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
2019-09-18 Alan Modra <amodra@gmail.com>
|
||||||
|
|
||||||
|
* ldlang.c (stricpy, strcut, name_compare): Constify params.
|
||||||
|
(get_first_input_target): Make return and "target" const.
|
||||||
|
|
||||||
2019-09-18 Alan Modra <amodra@gmail.com>
|
2019-09-18 Alan Modra <amodra@gmail.com>
|
||||||
|
|
||||||
* emultempl/pe.em (after_open): Use bfd_set_filename.
|
* emultempl/pe.em (after_open): Use bfd_set_filename.
|
||||||
|
10
ld/ldlang.c
10
ld/ldlang.c
@ -3149,7 +3149,7 @@ get_target (const bfd_target *target, void *data)
|
|||||||
/* Like strcpy() but convert to lower case as well. */
|
/* Like strcpy() but convert to lower case as well. */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
stricpy (char *dest, char *src)
|
stricpy (char *dest, const char *src)
|
||||||
{
|
{
|
||||||
char c;
|
char c;
|
||||||
|
|
||||||
@ -3163,7 +3163,7 @@ stricpy (char *dest, char *src)
|
|||||||
from haystack. */
|
from haystack. */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
strcut (char *haystack, char *needle)
|
strcut (char *haystack, const char *needle)
|
||||||
{
|
{
|
||||||
haystack = strstr (haystack, needle);
|
haystack = strstr (haystack, needle);
|
||||||
|
|
||||||
@ -3182,7 +3182,7 @@ strcut (char *haystack, char *needle)
|
|||||||
Return a value indicating how "similar" they are. */
|
Return a value indicating how "similar" they are. */
|
||||||
|
|
||||||
static int
|
static int
|
||||||
name_compare (char *first, char *second)
|
name_compare (const char *first, const char *second)
|
||||||
{
|
{
|
||||||
char *copy1;
|
char *copy1;
|
||||||
char *copy2;
|
char *copy2;
|
||||||
@ -3267,10 +3267,10 @@ closest_target_match (const bfd_target *target, void *data)
|
|||||||
|
|
||||||
/* Return the BFD target format of the first input file. */
|
/* Return the BFD target format of the first input file. */
|
||||||
|
|
||||||
static char *
|
static const char *
|
||||||
get_first_input_target (void)
|
get_first_input_target (void)
|
||||||
{
|
{
|
||||||
char *target = NULL;
|
const char *target = NULL;
|
||||||
|
|
||||||
LANG_FOR_EACH_INPUT_STATEMENT (s)
|
LANG_FOR_EACH_INPUT_STATEMENT (s)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user