diff options
| -rw-r--r-- | bfd/ChangeLog | 31 | ||||
| -rw-r--r-- | bfd/cpu-a29k.c | 2 | ||||
| -rw-r--r-- | bfd/cpu-alpha.c | 2 | ||||
| -rw-r--r-- | bfd/cpu-arm.c | 9 | ||||
| -rw-r--r-- | bfd/cpu-avr.c | 2 | ||||
| -rw-r--r-- | bfd/cpu-d10v.c | 76 | ||||
| -rw-r--r-- | bfd/cpu-h8500.c | 22 | ||||
| -rw-r--r-- | bfd/cpu-i370.c | 2 | ||||
| -rw-r--r-- | bfd/cpu-i386.c | 6 | ||||
| -rw-r--r-- | bfd/cpu-i960.c | 39 | ||||
| -rw-r--r-- | bfd/cpu-ia64-opc.c | 7 | ||||
| -rw-r--r-- | bfd/cpu-ia64.c | 5 | ||||
| -rw-r--r-- | bfd/cpu-m32r.c | 2 | ||||
| -rw-r--r-- | bfd/cpu-m68hc11.c | 22 | ||||
| -rw-r--r-- | bfd/cpu-m68hc12.c | 22 | ||||
| -rw-r--r-- | bfd/cpu-m68k.c | 2 | ||||
| -rw-r--r-- | bfd/cpu-m88k.c | 5 | ||||
| -rw-r--r-- | bfd/cpu-mips.c | 27 | ||||
| -rw-r--r-- | bfd/cpu-ns32k.c | 4 | ||||
| -rw-r--r-- | bfd/cpu-pj.c | 7 | ||||
| -rw-r--r-- | bfd/cpu-powerpc.c | 16 | ||||
| -rw-r--r-- | bfd/cpu-sh.c | 6 | ||||
| -rw-r--r-- | bfd/cpu-sparc.c | 20 | ||||
| -rw-r--r-- | bfd/cpu-tic54x.c | 2 | ||||
| -rw-r--r-- | bfd/cpu-v850.c | 16 | ||||
| -rw-r--r-- | bfd/cpu-vax.c | 2 | ||||
| -rw-r--r-- | bfd/cpu-w65.c | 5 | ||||
| -rw-r--r-- | bfd/cpu-we32k.c | 2 | ||||
| -rw-r--r-- | bfd/cpu-z8k.c | 8 |
29 files changed, 180 insertions, 191 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ae2c846db61..d7168568ba0 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,6 +1,35 @@ 2000-11-16 Kazu Hirata <kazu@hxi.com> - * dwarf1.c: Fix formatting. + * cpu-a29k.c: Fix formatting. + * cpu-alpha.c: Likewise. + * cpu-arm.c: Likewise. + * cpu-avr.c: Likewise. + * cpu-d10v.c: Likewise. + * cpu-h8500.c: Likewise. + * cpu-hppa.c: Likewise. + * cpu-i370.c: Likewise. + * cpu-i386.c: Likewise. + * cpu-i960.c: Likewise. + * cpu-ia64-opc.c: Likewise. + * cpu-ia64.c: Likewise. + * cpu-m32r.c: Likewise. + * cpu-m68hc11.c: Likewise. + * cpu-m68hc12.c: Likewise. + * cpu-m68k.c: Likewise. + * cpu-m88k.c: Likewise. + * cpu-mips.c: Likewise. + * cpu-ns32k.c: Likewise. + * cpu-pj.c: Likewise. + * cpu-powerpc.c: Likewise. + * cpu-sh.c: Likewise. + * cpu-sparc.c: Likewise. + * cpu-tic54x.c: Likewise. + * cpu-v850.c: Likewise. + * cpu-vax.c: Likewise. + * cpu-w65.c: Likewise. + * cpu-we32k.c: Likewise. + * cpu-z8k.c: Likewise. + * dwarf1.c: Likewise. * dwarf2.c: Likewise. 2000-11-15 Kazu Hirata <kazu@hxi.com> diff --git a/bfd/cpu-a29k.c b/bfd/cpu-a29k.c index 5bd25a47720..5b79937ff9c 100644 --- a/bfd/cpu-a29k.c +++ b/bfd/cpu-a29k.c @@ -33,7 +33,7 @@ const bfd_arch_info_type bfd_a29k_arch = "a29k", 4, true, /* the one and only */ - bfd_default_compatible, + bfd_default_compatible, bfd_default_scan , 0, }; diff --git a/bfd/cpu-alpha.c b/bfd/cpu-alpha.c index b89900be3b7..48a16e31319 100644 --- a/bfd/cpu-alpha.c +++ b/bfd/cpu-alpha.c @@ -40,7 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define NN(index) (&arch_info_struct[index]) /* These exist only so that we can resonably disassemble PALcode. */ -static const bfd_arch_info_type arch_info_struct[] = +static const bfd_arch_info_type arch_info_struct[] = { N (64, 64, bfd_mach_alpha_ev4, "alpha:ev4", false, NN(1)), N (64, 64, bfd_mach_alpha_ev5, "alpha:ev5", false, NN(2)), diff --git a/bfd/cpu-arm.c b/bfd/cpu-arm.c index bda9c4489a6..7b351f5c0b5 100644 --- a/bfd/cpu-arm.c +++ b/bfd/cpu-arm.c @@ -47,7 +47,7 @@ compatible (a,b) it can be polymorphed into the other */ if (a->the_default) return b; - + if (b->the_default) return a; @@ -95,7 +95,7 @@ processors[] = { bfd_mach_arm_4, "strongarm1100" }, }; -static boolean +static boolean scan (info, string) const struct bfd_arch_info * info; const char * string; @@ -119,16 +119,15 @@ scan (info, string) /* Finally check for the default architecture */ if (strcasecmp (string, "arm") == 0) return info->the_default; - + return false; } - #define N(number, print, default, next) \ { 32, 32, 8, bfd_arch_arm, number, "arm", print, 4, default, compatible, scan, next } static const bfd_arch_info_type arch_info_struct[] = -{ +{ N( bfd_mach_arm_2, "armv2", false, & arch_info_struct[1] ), N( bfd_mach_arm_2a, "armv2a", false, & arch_info_struct[2] ), N( bfd_mach_arm_3, "armv3", false, & arch_info_struct[3] ), diff --git a/bfd/cpu-avr.c b/bfd/cpu-avr.c index 9180d901915..c86339d33a6 100644 --- a/bfd/cpu-avr.c +++ b/bfd/cpu-avr.c @@ -22,11 +22,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "sysdep.h" #include "libbfd.h" - static const bfd_arch_info_type *compatible PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *)); - #define N(addr_bits, machine, print, default, next) \ { \ 8, /* 8 bits in a word */ \ diff --git a/bfd/cpu-d10v.c b/bfd/cpu-d10v.c index e16c3b79fa9..868cbcff5ae 100644 --- a/bfd/cpu-d10v.c +++ b/bfd/cpu-d10v.c @@ -22,50 +22,50 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "sysdep.h" #include "libbfd.h" -static const bfd_arch_info_type d10v_ts3_info = -{ - 16, /* 16 bits in a word */ - 16, /* 16 bits in an address */ - 8, /* 8 bits in a byte */ +static const bfd_arch_info_type d10v_ts3_info = +{ + 16, /* 16 bits in a word */ + 16, /* 16 bits in an address */ + 8, /* 8 bits in a byte */ bfd_arch_d10v, - bfd_mach_d10v_ts3, - "d10v", - "d10v:ts3", - 4, /* section alignment power */ - false, - bfd_default_compatible, - bfd_default_scan, - 0, + bfd_mach_d10v_ts3, + "d10v", + "d10v:ts3", + 4, /* section alignment power */ + false, + bfd_default_compatible, + bfd_default_scan, + 0, }; -static const bfd_arch_info_type d10v_ts2_info = +static const bfd_arch_info_type d10v_ts2_info = { - 16, /* 16 bits in a word */ - 16, /* 16 bits in an address */ - 8, /* 8 bits in a byte */ + 16, /* 16 bits in a word */ + 16, /* 16 bits in an address */ + 8, /* 8 bits in a byte */ bfd_arch_d10v, - bfd_mach_d10v_ts2, - "d10v", - "d10v:ts2", - 4, /* section alignment power */ - false, - bfd_default_compatible, - bfd_default_scan, - &d10v_ts3_info, + bfd_mach_d10v_ts2, + "d10v", + "d10v:ts2", + 4, /* section alignment power */ + false, + bfd_default_compatible, + bfd_default_scan, + &d10v_ts3_info, }; -const bfd_arch_info_type bfd_d10v_arch = -{ - 16, /* 16 bits in a word */ - 16, /* 16 bits in an address */ - 8, /* 8 bits in a byte */ +const bfd_arch_info_type bfd_d10v_arch = +{ + 16, /* 16 bits in a word */ + 16, /* 16 bits in an address */ + 8, /* 8 bits in a byte */ bfd_arch_d10v, - bfd_mach_d10v, - "d10v", - "d10v", - 4, /* section alignment power */ - true, - bfd_default_compatible, - bfd_default_scan, - &d10v_ts2_info, + bfd_mach_d10v, + "d10v", + "d10v", + 4, /* section alignment power */ + true, + bfd_default_compatible, + bfd_default_scan, + &d10v_ts2_info, }; diff --git a/bfd/cpu-h8500.c b/bfd/cpu-h8500.c index eae42e3abf2..c16a316372c 100644 --- a/bfd/cpu-h8500.c +++ b/bfd/cpu-h8500.c @@ -24,11 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #if 0 -/* +/* Relocations for the Z8K */ -static bfd_reloc_status_type +static bfd_reloc_status_type howto16_callback (abfd, reloc_entry, symbol_in, data, ignore_input_section, ignore_bfd) bfd *abfd; @@ -50,8 +50,7 @@ howto16_callback (abfd, reloc_entry, symbol_in, data, return bfd_reloc_ok; } - -static bfd_reloc_status_type +static bfd_reloc_status_type howto8_callback (abfd, reloc_entry, symbol_in, data, ignore_input_section, ignore_bfd) bfd *abfd; @@ -73,8 +72,7 @@ howto8_callback (abfd, reloc_entry, symbol_in, data, return bfd_reloc_ok; } - -static bfd_reloc_status_type +static bfd_reloc_status_type howto8_FFnn_callback (abfd, reloc_entry, symbol_in, data, ignore_input_section, ignore_bfd) bfd *abfd; @@ -88,7 +86,7 @@ howto8_FFnn_callback (abfd, reloc_entry, symbol_in, data, bfd_vma addr = reloc_entry->address; long x = bfd_get_8(abfd, (bfd_byte *)data + addr); - abort(); + abort (); HOWTO_PREPARE(relocation, symbol_in); x = (x + relocation + reloc_entry->addend); @@ -97,7 +95,7 @@ howto8_FFnn_callback (abfd, reloc_entry, symbol_in, data, return bfd_reloc_ok; } -static bfd_reloc_status_type +static bfd_reloc_status_type howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data, ignore_input_section, ignore_bfd) bfd *abfd; @@ -110,7 +108,7 @@ howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data, long relocation = 0; bfd_vma addr = reloc_entry->address; long x = bfd_get_8(abfd, (bfd_byte *)data + addr); - abort(); + abort (); HOWTO_PREPARE(relocation, symbol_in); x = (x + relocation + reloc_entry->addend); @@ -119,8 +117,6 @@ howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data, return bfd_reloc_ok; } - - static reloc_howto_type howto_16 = NEWHOWTO(howto16_callback,"abs16",1,false,false); static reloc_howto_type howto_8 @@ -132,7 +128,6 @@ static reloc_howto_type howto_8_FFnn static reloc_howto_type howto_8_pcrel = NEWHOWTO(howto8_pcrel_callback,"pcrel8",0,false,true); - static reloc_howto_type * local_bfd_reloc_type_lookup (arch, code) const struct bfd_arch_info *arch; @@ -154,7 +149,7 @@ local_bfd_reloc_type_lookup (arch, code) int bfd_default_scan_num_mach(); -static boolean +static boolean scan_mach (info, string) const struct bfd_arch_info *info ATTRIBUTE_UNUSED; const char *string; @@ -166,7 +161,6 @@ scan_mach (info, string) return false; } - #if 0 /* not used currently */ /* This routine is provided two arch_infos and returns whether they'd be compatible */ diff --git a/bfd/cpu-i370.c b/bfd/cpu-i370.c index 2331eef913f..b07a4c7709b 100644 --- a/bfd/cpu-i370.c +++ b/bfd/cpu-i370.c @@ -46,7 +46,7 @@ i370_compatible (a, b) static const bfd_arch_info_type arch_info_struct[] = { - /* hack alert: old old machines are really 16 and 24 bit arch ... */ + /* hack alert: old old machines are really 16 and 24 bit arch ... */ { 32, /* 32 bits in a word */ 32, /* 32 bits in an address */ diff --git a/bfd/cpu-i386.c b/bfd/cpu-i386.c index f5b9b181d18..a881470208b 100644 --- a/bfd/cpu-i386.c +++ b/bfd/cpu-i386.c @@ -32,7 +32,7 @@ const bfd_arch_info_type bfd_i386_arch_intel_syntax = "i386:intel", 3, true, - bfd_default_compatible, + bfd_default_compatible, bfd_default_scan , 0, }; @@ -47,7 +47,7 @@ static const bfd_arch_info_type i8086_arch = "i8086", 3, false, - bfd_default_compatible, + bfd_default_compatible, bfd_default_scan , &bfd_i386_arch_intel_syntax, }; @@ -63,7 +63,7 @@ const bfd_arch_info_type bfd_i386_arch = "i386", 3, true, - bfd_default_compatible, + bfd_default_compatible, bfd_default_scan , &i8086_arch, }; diff --git a/bfd/cpu-i960.c b/bfd/cpu-i960.c index 2374b2fdf37..071d2a0ce2d 100644 --- a/bfd/cpu-i960.c +++ b/bfd/cpu-i960.c @@ -18,12 +18,10 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - #include "bfd.h" #include "sysdep.h" #include "libbfd.h" - /* This routine is provided a string, and tries to work out if it could possibly refer to the i960 machine pointed at in the info_struct pointer */ @@ -36,7 +34,7 @@ scan_960_mach (ap, string) unsigned long machine; int i; int fail_because_not_80960 = false; - + for (i = 0; i < strlen (string); i ++) string[i] = tolower (string[i]); @@ -48,7 +46,7 @@ scan_960_mach (ap, string) /* i960 on it's own means core to us. */ if (* string == 0) return ap->mach == bfd_mach_i960_core; - + /* "i960:*" is valid, anything else is not. */ if (* string != ':') return false; @@ -68,10 +66,10 @@ scan_960_mach (ap, string) /* No match, can't be us. */ else return false; - + if (* string == '\0') return false; - + if (string[0] == 'c' && string[1] == 'o' && string[2] == 'r' && string[3] == 'e' && string[4] == '\0') machine = bfd_mach_i960_core; @@ -104,15 +102,13 @@ scan_960_mach (ap, string) if (fail_because_not_80960) return false; - + if (machine == ap->mach) return true; - + return false; } - - /* This routine is provided two arch_infos and works out the i960 machine which would be compatible with both and returns a pointer to its info structure */ @@ -124,17 +120,17 @@ compatible (a,b) { /* The i960 has distinct subspecies which may not interbreed: - CORE CA + CORE CA CORE KA KB MC XA CORE HX JX Any architecture on the same line is compatible, the one on - the right is the least restrictive. - + the right is the least restrictive. + We represent this information in an array, each machine to a side */ #define ERROR 0 -#define CORE bfd_mach_i960_core /*1*/ -#define KA bfd_mach_i960_ka_sa /*2*/ +#define CORE bfd_mach_i960_core /*1*/ +#define KA bfd_mach_i960_ka_sa /*2*/ #define KB bfd_mach_i960_kb_sb /*3*/ #define MC bfd_mach_i960_mc /*4*/ #define XA bfd_mach_i960_xa /*5*/ @@ -143,7 +139,7 @@ compatible (a,b) #define HX bfd_mach_i960_hx /*8*/ #define MAX_ARCH ((int)HX) - static CONST unsigned long matrix[MAX_ARCH+1][MAX_ARCH+1] = + static CONST unsigned long matrix[MAX_ARCH+1][MAX_ARCH+1] = { { ERROR, CORE, KA, KB, MC, XA, CA, JX, HX }, { CORE, CORE, KA, KB, MC, XA, CA, JX, HX }, @@ -156,25 +152,22 @@ compatible (a,b) { HX, HX, ERROR, ERROR, ERROR, ERROR, ERROR, HX, HX }, }; - - if (a->arch != b->arch || matrix[a->mach][b->mach] == ERROR) + if (a->arch != b->arch || matrix[a->mach][b->mach] == ERROR) { return NULL; } - else + else { return (a->mach == matrix[a->mach][b->mach]) ? a : b; } } - - int bfd_default_scan_num_mach(); #define N(a,b,d,n) \ { 32, 32, 8,bfd_arch_i960,a,"i960",b,3,d,compatible,scan_960_mach,n,} -static const bfd_arch_info_type arch_info_struct[] = -{ +static const bfd_arch_info_type arch_info_struct[] = +{ N(bfd_mach_i960_ka_sa,"i960:ka_sa",false, &arch_info_struct[1]), N(bfd_mach_i960_kb_sb,"i960:kb_sb",false, &arch_info_struct[2]), N(bfd_mach_i960_mc, "i960:mc", false, &arch_info_struct[3]), diff --git a/bfd/cpu-ia64-opc.c b/bfd/cpu-ia64-opc.c index 130dbe7b998..36de3c818e2 100644 --- a/bfd/cpu-ia64-opc.c +++ b/bfd/cpu-ia64-opc.c @@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - /* Logically, this code should be part of libopcode but since some of the operand insertion/extraction functions help bfd to implement relocations, this code is included as part of elf64-ia64.c. This @@ -555,7 +554,7 @@ const struct ia64_operand elf64_ia64_operands[IA64_OPND_COUNT] = { ABS, ins_imms16,ext_imms16,0, {{27, 6}, { 1, 36}}, 0, /* IMM44 */ "a 44-bit unsigned (least 16 bits ignored/zeroes)" }, { ABS, ins_rsvd, ext_rsvd, 0, {{0, 0}}, 0, /* IMMU62 */ - "a 62-bit unsigned" }, + "a 62-bit unsigned" }, { ABS, ins_rsvd, ext_rsvd, 0, {{0, 0}}, 0, /* IMMU64 */ "a 64-bit unsigned" }, { ABS, ins_inc3, ext_inc3, 0, {{ 3, 13}}, SDEC, /* INC3 */ @@ -580,7 +579,7 @@ const struct ia64_operand elf64_ia64_operands[IA64_OPND_COUNT] = {{ 7, 6}, {13, 20}, { 1, 36}}, 0, "a branch target" }, { REL, ins_imms4, ext_imms4, 0, {{20, 13}, { 1, 36}}, 0, /* TGT25c */ - "a branch target" }, - { REL, ins_rsvd, ext_rsvd, 0, {{0, 0}}, 0, /* TGT64 */ + "a branch target" }, + { REL, ins_rsvd, ext_rsvd, 0, {{0, 0}}, 0, /* TGT64 */ "a branch target" }, }; diff --git a/bfd/cpu-ia64.c b/bfd/cpu-ia64.c index 0bbd095bc24..924e862fd8d 100644 --- a/bfd/cpu-ia64.c +++ b/bfd/cpu-ia64.c @@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - #include "bfd.h" #include "sysdep.h" #include "libbfd.h" @@ -34,7 +33,7 @@ const bfd_arch_info_type bfd_ia64_elf32_arch = "ia64-elf32", 3, /* log2 of section alignment */ true, /* the one and only */ - bfd_default_compatible, + bfd_default_compatible, bfd_default_scan , 0, }; @@ -50,7 +49,7 @@ const bfd_arch_info_type bfd_ia64_arch = "ia64-elf64", 3, /* log2 of section alignment */ true, /* the one and only */ - bfd_default_compatible, + bfd_default_compatible, bfd_default_scan , &bfd_ia64_elf32_arch, }; diff --git a/bfd/cpu-m32r.c b/bfd/cpu-m32r.c index 895ad413b26..490224637fc 100644 --- a/bfd/cpu-m32r.c +++ b/bfd/cpu-m32r.c @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define NEXT NULL -static const bfd_arch_info_type arch_info_struct[] = +static const bfd_arch_info_type arch_info_struct[] = { N (bfd_mach_m32rx, "m32rx", false, NULL) }; diff --git a/bfd/cpu-m68hc11.c b/bfd/cpu-m68hc11.c index 0df14c8d30b..2cf3bf55c18 100644 --- a/bfd/cpu-m68hc11.c +++ b/bfd/cpu-m68hc11.c @@ -21,19 +21,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "sysdep.h" #include "libbfd.h" -const bfd_arch_info_type bfd_m68hc11_arch = -{ +const bfd_arch_info_type bfd_m68hc11_arch = +{ 16, /* 16 bits in a word */ - 16, /* 16 bits in an address */ - 8, /* 8 bits in a byte */ + 16, /* 16 bits in an address */ + 8, /* 8 bits in a byte */ bfd_arch_m68hc11, - 0, + 0, "m68hc11", - "m68hc11", - 4, /* section alignment power */ - true, - bfd_default_compatible, - bfd_default_scan, - 0, + "m68hc11", + 4, /* section alignment power */ + true, + bfd_default_compatible, + bfd_default_scan, + 0, }; diff --git a/bfd/cpu-m68hc12.c b/bfd/cpu-m68hc12.c index 830ddb51ae5..1810438b291 100644 --- a/bfd/cpu-m68hc12.c +++ b/bfd/cpu-m68hc12.c @@ -21,18 +21,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "sysdep.h" #include "libbfd.h" -const bfd_arch_info_type bfd_m68hc12_arch = -{ +const bfd_arch_info_type bfd_m68hc12_arch = +{ 16, /* 16 bits in a word */ - 16, /* 16 bits in an address */ - 8, /* 8 bits in a byte */ + 16, /* 16 bits in an address */ + 8, /* 8 bits in a byte */ bfd_arch_m68hc12, - 0, + 0, "m68hc12", - "m68hc12", - 4, /* section alignment power */ - true, - bfd_default_compatible, - bfd_default_scan, - 0, + "m68hc12", + 4, /* section alignment power */ + true, + bfd_default_compatible, + bfd_default_scan, + 0, }; diff --git a/bfd/cpu-m68k.c b/bfd/cpu-m68k.c index 184182d695e..6b67f1829f1 100644 --- a/bfd/cpu-m68k.c +++ b/bfd/cpu-m68k.c @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ { 32, 32, 8, bfd_arch_m68k, name, "m68k",print,2,d,bfd_default_compatible,bfd_default_scan, next, } static const bfd_arch_info_type arch_info_struct[] = -{ +{ N(bfd_mach_m68000, "m68k:68000", false, &arch_info_struct[1]), N(bfd_mach_m68008, "m68k:68008", false, &arch_info_struct[2]), N(bfd_mach_m68010, "m68k:68010", false, &arch_info_struct[3]), diff --git a/bfd/cpu-m88k.c b/bfd/cpu-m88k.c index c3716c5a394..e5cc1a1f390 100644 --- a/bfd/cpu-m88k.c +++ b/bfd/cpu-m88k.c @@ -22,9 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "sysdep.h" #include "libbfd.h" - - - const bfd_arch_info_type bfd_m88k_arch = { 32, /* 32 bits in a word */ @@ -36,7 +33,7 @@ const bfd_arch_info_type bfd_m88k_arch = "m88k:88100", 3, true, /* the one and only */ - bfd_default_compatible, + bfd_default_compatible, bfd_default_scan , 0, }; diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c index 8090b7c54ea..e15af2e4aa2 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c @@ -39,28 +39,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ } enum { -I_mips3000, -I_mips3900, -I_mips4000, -I_mips4010, -I_mips4100, +I_mips3000, +I_mips3900, +I_mips4000, +I_mips4010, +I_mips4100, I_mips4111, -I_mips4300, -I_mips4400, -I_mips4600, -I_mips4650, -I_mips5000, -I_mips6000, -I_mips8000, +I_mips4300, +I_mips4400, +I_mips4600, +I_mips4650, +I_mips5000, +I_mips6000, +I_mips8000, I_mips10000, I_mips4K, I_mips16 }; - #define NN(index) (&arch_info_struct[(index)+1]) -static const bfd_arch_info_type arch_info_struct[] = +static const bfd_arch_info_type arch_info_struct[] = { N (32, 32, bfd_mach_mips3000, "mips:3000", false, NN(I_mips3000)), N (32, 32, bfd_mach_mips3900, "mips:3900", false, NN(I_mips3900)), diff --git a/bfd/cpu-ns32k.c b/bfd/cpu-ns32k.c index c49630ca5e4..e381c91d191 100644 --- a/bfd/cpu-ns32k.c +++ b/bfd/cpu-ns32k.c @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ { 32, 32, 8, bfd_arch_ns32k, machine, "ns32k",printable,3,d,bfd_default_compatible,bfd_default_scan, next, } static const bfd_arch_info_type arch_info_struct[] = -{ +{ N(32532,"ns32k:32532",true, 0), /* the word ns32k will match this too */ }; @@ -200,7 +200,6 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, && output_bfd == (bfd *) NULL) flag = bfd_reloc_undefined; - /* Is the address of the relocation really within the section? */ if (reloc_entry->address > input_section->_cooked_size) return bfd_reloc_outofrange; @@ -214,7 +213,6 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, else relocation = symbol->value; - reloc_target_output_section = symbol->section->output_section; /* Convert input-section-relative symbol value to absolute. */ diff --git a/bfd/cpu-pj.c b/bfd/cpu-pj.c index 44ddd332602..913cbc58ee2 100644 --- a/bfd/cpu-pj.c +++ b/bfd/cpu-pj.c @@ -22,8 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "sysdep.h" #include "libbfd.h" - -static boolean +static boolean scan_mach (info, string) const struct bfd_arch_info *info; const char *string; @@ -33,7 +32,6 @@ scan_mach (info, string) return false; } - #if 0 /* This routine is provided two arch_infos and returns whether they'd be compatible */ @@ -49,8 +47,7 @@ compatible (a,b) } #endif - -static const bfd_arch_info_type arch_info_struct[] = +static const bfd_arch_info_type arch_info_struct[] = { { 32, /* 32 bits in a word */ diff --git a/bfd/cpu-powerpc.c b/bfd/cpu-powerpc.c index 3f4182dca20..2e41899a441 100644 --- a/bfd/cpu-powerpc.c +++ b/bfd/cpu-powerpc.c @@ -59,7 +59,7 @@ static const bfd_arch_info_type arch_info_struct[] = "powerpc:603", 3, false, /* not the default */ - powerpc_compatible, + powerpc_compatible, bfd_default_scan, &arch_info_struct[1] }, @@ -73,7 +73,7 @@ static const bfd_arch_info_type arch_info_struct[] = "powerpc:EC603e", 3, false, /* not the default */ - powerpc_compatible, + powerpc_compatible, bfd_default_scan, &arch_info_struct[2] }, @@ -87,7 +87,7 @@ static const bfd_arch_info_type arch_info_struct[] = "powerpc:604", 3, false, /* not the default */ - powerpc_compatible, + powerpc_compatible, bfd_default_scan, &arch_info_struct[3] }, @@ -101,7 +101,7 @@ static const bfd_arch_info_type arch_info_struct[] = "powerpc:403", 3, false, /* not the default */ - powerpc_compatible, + powerpc_compatible, bfd_default_scan, &arch_info_struct[4] }, @@ -115,11 +115,11 @@ static const bfd_arch_info_type arch_info_struct[] = "powerpc:601", 3, false, /* not the default */ - powerpc_compatible, + powerpc_compatible, bfd_default_scan, &arch_info_struct[5] }, - { + { 64, /* 64 bits in a word */ 64, /* 64 bits in an address */ 8, /* 8 bits in a byte */ @@ -129,7 +129,7 @@ static const bfd_arch_info_type arch_info_struct[] = "powerpc:620", 3, false, /* not the default */ - powerpc_compatible, + powerpc_compatible, bfd_default_scan, &arch_info_struct[6] }, @@ -230,7 +230,7 @@ const bfd_arch_info_type bfd_powerpc_arch = "powerpc:common", 3, true, /* the default */ - powerpc_compatible, + powerpc_compatible, bfd_default_scan, &arch_info_struct[0] }; diff --git a/bfd/cpu-sh.c b/bfd/cpu-sh.c index cb54e7d0c44..64b8e7c2c35 100644 --- a/bfd/cpu-sh.c +++ b/bfd/cpu-sh.c @@ -22,8 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "sysdep.h" #include "libbfd.h" - -static boolean +static boolean scan_mach (info, string) const struct bfd_arch_info *info; const char *string; @@ -33,7 +32,6 @@ scan_mach (info, string) return false; } - #if 0 /* This routine is provided two arch_infos and returns whether they'd be compatible */ @@ -57,7 +55,7 @@ compatible (a,b) #define SH3E_NEXT &arch_info_struct[5] #define SH4_NEXT NULL -static const bfd_arch_info_type arch_info_struct[] = +static const bfd_arch_info_type arch_info_struct[] = { { 32, /* 32 bits in a word */ diff --git a/bfd/cpu-sparc.c b/bfd/cpu-sparc.c index 57ccc2ed8c9..5c777d20d5b 100644 --- a/bfd/cpu-sparc.c +++ b/bfd/cpu-sparc.c @@ -49,7 +49,7 @@ static const bfd_arch_info_type arch_info_struct[] = "sparc:sparclet", 3, false, - sparc_compatible, + sparc_compatible, bfd_default_scan, &arch_info_struct[1], }, @@ -63,7 +63,7 @@ static const bfd_arch_info_type arch_info_struct[] = "sparc:sparclite", 3, false, - sparc_compatible, + sparc_compatible, bfd_default_scan, &arch_info_struct[2], }, @@ -77,7 +77,7 @@ static const bfd_arch_info_type arch_info_struct[] = "sparc:v8plus", 3, false, - sparc_compatible, + sparc_compatible, bfd_default_scan, &arch_info_struct[3], }, @@ -91,7 +91,7 @@ static const bfd_arch_info_type arch_info_struct[] = "sparc:v8plusa", 3, false, - sparc_compatible, + sparc_compatible, bfd_default_scan, &arch_info_struct[4], }, @@ -105,7 +105,7 @@ static const bfd_arch_info_type arch_info_struct[] = "sparc:sparclite_le", 3, false, - sparc_compatible, + sparc_compatible, bfd_default_scan, &arch_info_struct[5], }, @@ -119,7 +119,7 @@ static const bfd_arch_info_type arch_info_struct[] = "sparc:v9", 3, false, - sparc_compatible, + sparc_compatible, bfd_default_scan, &arch_info_struct[6], }, @@ -133,7 +133,7 @@ static const bfd_arch_info_type arch_info_struct[] = "sparc:v9a", 3, false, - sparc_compatible, + sparc_compatible, bfd_default_scan, &arch_info_struct[7], }, @@ -147,7 +147,7 @@ static const bfd_arch_info_type arch_info_struct[] = "sparc:v8plusb", 3, false, - sparc_compatible, + sparc_compatible, bfd_default_scan, &arch_info_struct[8], }, @@ -161,7 +161,7 @@ static const bfd_arch_info_type arch_info_struct[] = "sparc:v9b", 3, false, - sparc_compatible, + sparc_compatible, bfd_default_scan, 0, } @@ -178,7 +178,7 @@ const bfd_arch_info_type bfd_sparc_arch = "sparc", 3, true, /* the default */ - sparc_compatible, + sparc_compatible, bfd_default_scan, &arch_info_struct[0], }; diff --git a/bfd/cpu-tic54x.c b/bfd/cpu-tic54x.c index 6f5e2c31ce8..f82432d21bc 100644 --- a/bfd/cpu-tic54x.c +++ b/bfd/cpu-tic54x.c @@ -34,6 +34,6 @@ const bfd_arch_info_type bfd_tic54x_arch = 1, true, /* the one and only */ bfd_default_compatible, - bfd_default_scan, + bfd_default_scan, 0, }; diff --git a/bfd/cpu-v850.c b/bfd/cpu-v850.c index 539413de022..55606f8c165 100644 --- a/bfd/cpu-v850.c +++ b/bfd/cpu-v850.c @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <ctype.h> -static boolean +static boolean scan (info, string) const struct bfd_arch_info * info; const char * string; @@ -41,9 +41,9 @@ scan (info, string) architecture, eg the string m68k:68020 would match the m68k entry up to the :, then we get left with the machine number */ - for (ptr_src = string, ptr_tst = info->arch_name; + for (ptr_src = string, ptr_tst = info->arch_name; *ptr_src && *ptr_tst; - ptr_src++, ptr_tst++) + ptr_src++, ptr_tst++) { if (*ptr_src != *ptr_tst) break; } @@ -52,7 +52,7 @@ scan (info, string) colons */ if (*ptr_src == ':') ptr_src++; - + if (*ptr_src == 0) { /* nothing more, then only keep this one if it is the default @@ -67,15 +67,15 @@ scan (info, string) ptr_src++; } - switch (number) + switch (number) { case bfd_mach_v850e: arch = bfd_arch_v850; break; case bfd_mach_v850ea: arch = bfd_arch_v850; break; - default: + default: return false; } - if (arch != info->arch) + if (arch != info->arch) return false; if (number != info->mach) @@ -90,7 +90,7 @@ scan (info, string) #define NEXT NULL -static const bfd_arch_info_type arch_info_struct[] = +static const bfd_arch_info_type arch_info_struct[] = { N (bfd_mach_v850e, "v850e", false, &arch_info_struct[1]), N (bfd_mach_v850ea, "v850ea", false, NULL) diff --git a/bfd/cpu-vax.c b/bfd/cpu-vax.c index bdc6d39e451..e42ec101499 100644 --- a/bfd/cpu-vax.c +++ b/bfd/cpu-vax.c @@ -33,7 +33,7 @@ const bfd_arch_info_type bfd_vax_arch = "vax", 3, true, /* the one and only */ - bfd_default_compatible, + bfd_default_compatible, bfd_default_scan , 0, }; diff --git a/bfd/cpu-w65.c b/bfd/cpu-w65.c index 13f68b3138d..9a31772de48 100644 --- a/bfd/cpu-w65.c +++ b/bfd/cpu-w65.c @@ -22,10 +22,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "sysdep.h" #include "libbfd.h" - int bfd_default_scan_num_mach(); -static boolean +static boolean scan_mach (info, string) const struct bfd_arch_info *info ATTRIBUTE_UNUSED; const char *string; @@ -35,8 +34,6 @@ scan_mach (info, string) return false; } - - const bfd_arch_info_type bfd_w65_arch = { 16, /* 16 bits in a word */ diff --git a/bfd/cpu-we32k.c b/bfd/cpu-we32k.c index a38cbc1268b..2133015d0a4 100644 --- a/bfd/cpu-we32k.c +++ b/bfd/cpu-we32k.c @@ -33,7 +33,7 @@ const bfd_arch_info_type bfd_we32k_arch = "we32k:32000", 3, true, /* the one and only */ - bfd_default_compatible, + bfd_default_compatible, bfd_default_scan , 0, }; diff --git a/bfd/cpu-z8k.c b/bfd/cpu-z8k.c index 5cce8eb0689..29682c1ec4c 100644 --- a/bfd/cpu-z8k.c +++ b/bfd/cpu-z8k.c @@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "sysdep.h" #include "libbfd.h" - #if 0 /* not used currently */ /* Relocations for the Z8K @@ -50,7 +49,6 @@ howto16_callback (abfd, reloc_entry, symbol_in, data, return bfd_reloc_ok; } - static bfd_reloc_status_type howto8_callback (abfd, reloc_entry, symbol_in, data, ignore_input_section, ignore_bfd) @@ -73,7 +71,6 @@ howto8_callback (abfd, reloc_entry, symbol_in, data, return bfd_reloc_ok; } - static bfd_reloc_status_type howto8_FFnn_callback (abfd, reloc_entry, symbol_in, data, ignore_input_section, ignore_bfd) @@ -119,8 +116,6 @@ howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data, return bfd_reloc_ok; } - - static reloc_howto_type howto_16 = NEWHOWTO (howto16_callback, "abs16", 1, false, false); static reloc_howto_type howto_8 @@ -132,7 +127,6 @@ static reloc_howto_type howto_8_FFnn static reloc_howto_type howto_8_pcrel = NEWHOWTO (howto8_pcrel_callback, "pcrel8", 0, false, true); - static reloc_howto_type * local_bfd_reloc_type_lookup (arch, code) const struct bfd_arch_info *arch; @@ -172,7 +166,6 @@ scan_mach (info, string) return false; } - /* This routine is provided two arch_infos and returns whether they'd be compatible */ @@ -186,7 +179,6 @@ compatible (a, b) return a; } - static const bfd_arch_info_type arch_info_struct[] = { {32, 32, 8, bfd_arch_z8k, bfd_mach_z8001, "z8k", "z8001", 1, false, compatible, scan_mach, 0,}, |