From c17ae8a24ed279ed7e58af6fe08ead6e0600a74a Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 18 Aug 2005 03:51:51 +0000 Subject: [PATCH] Remove a29k support. --- bfd/ChangeLog | 19 ++++++++++++ bfd/Makefile.am | 8 ------ bfd/Makefile.in | 8 ------ bfd/aoutf1.h | 9 ------ bfd/aoutx.h | 6 ---- bfd/archures.c | 4 --- bfd/bfd-in2.h | 2 -- bfd/coffcode.h | 32 --------------------- bfd/config.bfd | 17 +---------- bfd/configure | 1 - bfd/configure.in | 1 - bfd/ieee.c | 5 ---- bfd/mipsbsd.c | 4 --- bfd/pdp11.c | 4 --- bfd/po/SRC-POTFILES.in | 2 -- bfd/sparclynx.c | 9 ------ bfd/targets.c | 2 -- binutils/testsuite/ChangeLog | 5 ++++ binutils/testsuite/binutils-all/objcopy.exp | 1 - binutils/testsuite/binutils-all/objdump.exp | 2 +- include/ChangeLog | 6 ++++ include/aout/encap.h | 1 - include/bfdlink.h | 3 +- include/dis-asm.h | 2 -- ld/ChangeLog | 7 +++++ ld/Makefile.am | 12 -------- ld/Makefile.in | 12 -------- ld/configure.tgt | 4 --- ld/ld.texinfo | 1 - ld/testsuite/ChangeLog | 5 ++++ ld/testsuite/ld-scripts/crossref.exp | 7 ----- ld/testsuite/ld-srec/srec.exp | 7 ----- opcodes/ChangeLog | 9 ++++++ opcodes/Makefile.am | 4 --- opcodes/Makefile.in | 4 --- opcodes/configure | 3 -- opcodes/configure.in | 3 -- opcodes/disassemble.c | 7 ----- opcodes/po/POTFILES.in | 1 - 39 files changed, 54 insertions(+), 185 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 27b6231106..4a168c8eba 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,22 @@ +2005-08-18 Alan Modra + + * Makefile.am: Remove mention of a29k files. + * aoutf1.h: Remove a29k support. + * aoutx.h: Likewise. + * archures.c: Likewise. + * coffcode.h: Likewise. + * config.bfd: Likewise. + * configure.in: Likewise. + * ieee.c: Likewise. + * mipsbsd.c: Likewise. + * pdp11.c: Likewise. + * sparclynx.c: Likewise. + * targets.c: Likewise. + * Makefile.in: Regenerate. + * configure: Regenerate. + * bfd-in2.h: Regenerate. + * po/SRC-POTFILES.in: Regenerate. + 2005-08-18 Alan Modra * elf-m10300.c (_bfd_mn10300_elf_adjust_dynamic_symbol): Warn on diff --git a/bfd/Makefile.am b/bfd/Makefile.am index c038e86c9d..a4fcc64a6e 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -54,7 +54,6 @@ BFD64_LIBS_CFILES = archive64.c # This list is alphabetized to make it easier to keep in sync # with the decls and initializer in archures.c. ALL_MACHINES = \ - cpu-a29k.lo \ cpu-alpha.lo \ cpu-arc.lo \ cpu-arm.lo \ @@ -114,7 +113,6 @@ ALL_MACHINES = \ cpu-z8k.lo ALL_MACHINES_CFILES = \ - cpu-a29k.c \ cpu-alpha.c \ cpu-arc.c \ cpu-arm.c \ @@ -188,7 +186,6 @@ BFD32_BACKENDS = \ bout.lo \ cf-i386lynx.lo \ cf-sparclynx.lo \ - coff-a29k.lo \ coff-apollo.lo \ coff-arm.lo \ coff-aux.lo \ @@ -358,7 +355,6 @@ BFD32_BACKENDS_CFILES = \ bout.c \ cf-i386lynx.c \ cf-sparclynx.c \ - coff-a29k.c \ coff-apollo.c \ coff-arm.c \ coff-aux.c \ @@ -961,7 +957,6 @@ simple.lo: simple.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/bfdlink.h archive64.lo: archive64.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/aout/ar.h -cpu-a29k.lo: cpu-a29k.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-alpha.lo: cpu-alpha.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-arc.lo: cpu-arc.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-arm.lo: cpu-arm.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ @@ -1074,9 +1069,6 @@ cf-sparclynx.lo: cf-sparclynx.c coff-sparc.c $(INCDIR)/filenames.h \ $(INCDIR)/hashtab.h $(INCDIR)/coff/sparc.h $(INCDIR)/coff/external.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-a29k.lo: coff-a29k.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ - $(INCDIR)/coff/a29k.h $(INCDIR)/coff/external.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h coff-apollo.lo: coff-apollo.c $(INCDIR)/filenames.h \ $(INCDIR)/hashtab.h $(INCDIR)/coff/apollo.h $(INCDIR)/coff/external.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 5d8043c16c..ff66e3c8bf 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -291,7 +291,6 @@ BFD64_LIBS_CFILES = archive64.c # This list is alphabetized to make it easier to keep in sync # with the decls and initializer in archures.c. ALL_MACHINES = \ - cpu-a29k.lo \ cpu-alpha.lo \ cpu-arc.lo \ cpu-arm.lo \ @@ -351,7 +350,6 @@ ALL_MACHINES = \ cpu-z8k.lo ALL_MACHINES_CFILES = \ - cpu-a29k.c \ cpu-alpha.c \ cpu-arc.c \ cpu-arm.c \ @@ -426,7 +424,6 @@ BFD32_BACKENDS = \ bout.lo \ cf-i386lynx.lo \ cf-sparclynx.lo \ - coff-a29k.lo \ coff-apollo.lo \ coff-arm.lo \ coff-aux.lo \ @@ -596,7 +593,6 @@ BFD32_BACKENDS_CFILES = \ bout.c \ cf-i386lynx.c \ cf-sparclynx.c \ - coff-a29k.c \ coff-apollo.c \ coff-arm.c \ coff-aux.c \ @@ -1528,7 +1524,6 @@ simple.lo: simple.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/bfdlink.h archive64.lo: archive64.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/aout/ar.h -cpu-a29k.lo: cpu-a29k.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-alpha.lo: cpu-alpha.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-arc.lo: cpu-arc.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h cpu-arm.lo: cpu-arm.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ @@ -1641,9 +1636,6 @@ cf-sparclynx.lo: cf-sparclynx.c coff-sparc.c $(INCDIR)/filenames.h \ $(INCDIR)/hashtab.h $(INCDIR)/coff/sparc.h $(INCDIR)/coff/external.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ coffcode.h coffswap.h -coff-a29k.lo: coff-a29k.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ - $(INCDIR)/coff/a29k.h $(INCDIR)/coff/external.h $(INCDIR)/coff/internal.h \ - libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h coff-apollo.lo: coff-apollo.c $(INCDIR)/filenames.h \ $(INCDIR)/hashtab.h $(INCDIR)/coff/apollo.h $(INCDIR)/coff/external.h \ $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \ diff --git a/bfd/aoutf1.h b/bfd/aoutf1.h index 36d8a7992b..cff7b3c756 100644 --- a/bfd/aoutf1.h +++ b/bfd/aoutf1.h @@ -143,11 +143,6 @@ sunos_set_arch_mach (bfd *abfd, enum machine_type machtype) machine = 0; break; - case M_29K: - arch = bfd_arch_a29k; - machine = 0; - break; - case M_HPUX: arch = bfd_arch_m68k; machine = 0; @@ -173,7 +168,6 @@ choose_reloc_size (bfd *abfd) switch (bfd_get_arch (abfd)) { case bfd_arch_sparc: - case bfd_arch_a29k: obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE; break; default: @@ -229,9 +223,6 @@ sunos_write_object_contents (bfd *abfd) case bfd_arch_i386: N_SET_MACHTYPE (*execp, M_386); break; - case bfd_arch_a29k: - N_SET_MACHTYPE (*execp, M_29K); - break; default: N_SET_MACHTYPE (*execp, M_UNKNOWN); } diff --git a/bfd/aoutx.h b/bfd/aoutx.h index cb577b2471..4079147d30 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -730,11 +730,6 @@ NAME (aout, machine_type) (enum bfd_architecture arch, arch_flags = M_386; break; - case bfd_arch_a29k: - if (machine == 0) - arch_flags = M_29K; - break; - case bfd_arch_arm: if (machine == 0) arch_flags = M_ARM; @@ -848,7 +843,6 @@ NAME (aout, set_arch_mach) (bfd *abfd, switch (arch) { case bfd_arch_sparc: - case bfd_arch_a29k: case bfd_arch_mips: obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE; break; diff --git a/bfd/archures.c b/bfd/archures.c index eca46010e0..a6d96541e9 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -111,7 +111,6 @@ DESCRIPTION . . bfd_arch_or32, {* OpenRISC 32 *} . -. bfd_arch_a29k, {* AMD 29000 *} . bfd_arch_sparc, {* SPARC *} .#define bfd_mach_sparc 1 .{* The difference between v8plus and v9 is that v9 is a true 64 bit env. *} @@ -170,7 +169,6 @@ DESCRIPTION . bfd_arch_i860, {* Intel 860 *} . bfd_arch_i370, {* IBM 360/370 Mainframes *} . bfd_arch_romp, {* IBM ROMP PC/RT *} -. bfd_arch_alliant, {* Alliant *} . bfd_arch_convex, {* Convex *} . bfd_arch_m88k, {* Motorola 88xxx *} . bfd_arch_m98k, {* Motorola 98xxx *} @@ -403,7 +401,6 @@ DESCRIPTION . */ -extern const bfd_arch_info_type bfd_a29k_arch; extern const bfd_arch_info_type bfd_alpha_arch; extern const bfd_arch_info_type bfd_arc_arch; extern const bfd_arch_info_type bfd_arm_arch; @@ -468,7 +465,6 @@ static const bfd_arch_info_type * const bfd_archures_list[] = #ifdef SELECT_ARCHITECTURES SELECT_ARCHITECTURES, #else - &bfd_a29k_arch, &bfd_alpha_arch, &bfd_arc_arch, &bfd_arm_arch, diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 139627aeb5..2014c548c8 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1695,7 +1695,6 @@ enum bfd_architecture bfd_arch_or32, /* OpenRISC 32 */ - bfd_arch_a29k, /* AMD 29000 */ bfd_arch_sparc, /* SPARC */ #define bfd_mach_sparc 1 /* The difference between v8plus and v9 is that v9 is a true 64 bit env. */ @@ -1754,7 +1753,6 @@ enum bfd_architecture bfd_arch_i860, /* Intel 860 */ bfd_arch_i370, /* IBM 360/370 Mainframes */ bfd_arch_romp, /* IBM ROMP PC/RT */ - bfd_arch_alliant, /* Alliant */ bfd_arch_convex, /* Convex */ bfd_arch_m88k, /* Motorola 88xxx */ bfd_arch_m98k, /* Motorola 98xxx */ diff --git a/bfd/coffcode.h b/bfd/coffcode.h index 8b01f9ee93..3b94dff431 100644 --- a/bfd/coffcode.h +++ b/bfd/coffcode.h @@ -1888,12 +1888,6 @@ coff_set_arch_mach_hook (bfd *abfd, void * filehdr) arch = bfd_arch_ia64; break; #endif -#ifdef A29K_MAGIC_BIG - case A29K_MAGIC_BIG: - case A29K_MAGIC_LITTLE: - arch = bfd_arch_a29k; - break; -#endif #ifdef ARMMAGIC case ARMMAGIC: case ARMPEMAGIC: @@ -2781,15 +2775,6 @@ coff_set_flags (bfd * abfd, break; #endif -#ifdef A29K_MAGIC_BIG - case bfd_arch_a29k: - if (bfd_big_endian (abfd)) - *magicp = A29K_MAGIC_BIG; - else - *magicp = A29K_MAGIC_LITTLE; - return TRUE; -#endif - #ifdef WE32KMAGIC case bfd_arch_we32k: *magicp = WE32KMAGIC; @@ -3771,18 +3756,6 @@ coff_write_object_contents (bfd * abfd) internal_f.f_flags |= flags; /* ...and the "opt"hdr... */ -#ifdef A29K -#ifdef ULTRA3 /* NYU's machine */ - /* FIXME: This is a bogus check. I really want to see if there - is a .shbss or a .shdata section, if so then set the magic - number to indicate a shared data executable. */ - if (internal_f.f_nscns >= 7) - internal_a.magic = SHMAGIC; /* Shared magic. */ - else -#endif /* ULTRA3 */ - internal_a.magic = NMAGIC; /* Assume separate i/d. */ -#define __A_MAGIC_SET__ -#endif /* A29K */ #ifdef TICOFF_AOUT_MAGIC internal_a.magic = TICOFF_AOUT_MAGIC; #define __A_MAGIC_SET__ @@ -4481,11 +4454,6 @@ coff_slurp_symbol_table (bfd * abfd) case C_MOS: /* Member of structure. */ case C_EOS: /* End of structure. */ -#ifdef NOTDEF /* C_AUTOARG has the same value. */ -#ifdef C_GLBLREG - case C_GLBLREG: /* A29k-specific storage class. */ -#endif -#endif case C_REGPARM: /* Register parameter. */ case C_REG: /* register variable. */ /* C_AUTOARG conflicts with TI COFF C_UEXT. */ diff --git a/bfd/config.bfd b/bfd/config.bfd index 2fe741b040..180e8959f3 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -53,7 +53,7 @@ case $targ in vax-*-vms* | \ arm-*-oabi | \ thumb-*-oabi | \ - a29k-*rtems* | \ + a29k-* | \ hppa*-*-rtems* | \ *-go32-rtems* | \ i[3-7]86*-*-rtemscoff* | \ @@ -305,17 +305,6 @@ case "${targ}" in targ_underscore=yes ;; - a29k-*-ebmon* | a29k-*-udi* | a29k-*-coff* | a29k-*-sym1* | \ - a29k-*-vxworks* | a29k-*-sysv*) - targ_defvec=a29kcoff_big_vec - targ_selvecs=sunos_big_vec - targ_underscore=yes - ;; - a29k-*-aout* | a29k-*-bsd* | a29k-*-vsta*) - targ_defvec=sunos_big_vec - targ_underscore=yes - ;; - avr-*-*) targ_defvec=bfd_elf32_avr_vec ;; @@ -1243,10 +1232,6 @@ case "${targ}" in targ_defvec=bfd_elf32_sparc_vec targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec" ;; - sparc-*-lynxos*) - targ_defvec=sparclynx_coff_vec - targ_selvecs=sparclynx_aout_vec - ;; sparc-*-netbsdelf*) targ_defvec=bfd_elf32_sparc_vec targ_selvecs=sparcnetbsd_vec diff --git a/bfd/configure b/bfd/configure index c5296ad1c6..bffdfb0bcc 100755 --- a/bfd/configure +++ b/bfd/configure @@ -12939,7 +12939,6 @@ do # This list is alphabetized to make it easy to compare # with the two vector lists in targets.c. For the same reason, # use one entry per line, even though this leads to long lines. - a29kcoff_big_vec) tb="$tb coff-a29k.lo cofflink.lo" ;; a_out_adobe_vec) tb="$tb aout-adobe.lo aout32.lo" ;; aix5coff64_vec) tb="$tb coff64-rs6000.lo xcofflink.lo aix5ppc-core.lo"; target_size=64 ;; aout0_big_vec) tb="$tb aout0.lo aout32.lo" ;; diff --git a/bfd/configure.in b/bfd/configure.in index 15d9798d7c..7876cd4c88 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -560,7 +560,6 @@ do # This list is alphabetized to make it easy to compare # with the two vector lists in targets.c. For the same reason, # use one entry per line, even though this leads to long lines. - a29kcoff_big_vec) tb="$tb coff-a29k.lo cofflink.lo" ;; a_out_adobe_vec) tb="$tb aout-adobe.lo aout32.lo" ;; aix5coff64_vec) tb="$tb coff64-rs6000.lo xcofflink.lo aix5ppc-core.lo"; target_size=64 ;; aout0_big_vec) tb="$tb aout0.lo aout32.lo" ;; diff --git a/bfd/ieee.c b/bfd/ieee.c index b517c02a3f..3dca9b3e93 100644 --- a/bfd/ieee.c +++ b/bfd/ieee.c @@ -3412,11 +3412,6 @@ ieee_write_processor (bfd *abfd) return FALSE; break; - case bfd_arch_a29k: - if (! ieee_write_id (abfd, "29000")) - return FALSE; - break; - case bfd_arch_h8300: if (! ieee_write_id (abfd, "H8/300")) return FALSE; diff --git a/bfd/mipsbsd.c b/bfd/mipsbsd.c index c38df5473e..b8621e486a 100644 --- a/bfd/mipsbsd.c +++ b/bfd/mipsbsd.c @@ -115,7 +115,6 @@ MY (choose_reloc_size) (abfd) switch (bfd_get_arch (abfd)) { case bfd_arch_sparc: - case bfd_arch_a29k: case bfd_arch_mips: obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE; break; @@ -157,9 +156,6 @@ MY (write_object_contents) (abfd) case bfd_arch_i386: N_SET_MACHTYPE (*execp, M_386); break; - case bfd_arch_a29k: - N_SET_MACHTYPE (*execp, M_29K); - break; case bfd_arch_mips: switch (bfd_get_mach (abfd)) { diff --git a/bfd/pdp11.c b/bfd/pdp11.c index f548e9894f..83029c46d0 100644 --- a/bfd/pdp11.c +++ b/bfd/pdp11.c @@ -719,10 +719,6 @@ NAME (aout, machine_type) (enum bfd_architecture arch, arch_flags = M_386; break; - case bfd_arch_a29k: - if (machine == 0) arch_flags = M_29K; - break; - case bfd_arch_arm: if (machine == 0) arch_flags = M_ARM; break; diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in index dc3dc38448..332782d7c7 100644 --- a/bfd/po/SRC-POTFILES.in +++ b/bfd/po/SRC-POTFILES.in @@ -26,7 +26,6 @@ cf-i386lynx.c cf-sparclynx.c cisco-core.c coff64-rs6000.c -coff-a29k.c coff-alpha.c coff-apollo.c coff-arm.c @@ -60,7 +59,6 @@ coff-w65.c coff-we32k.c coff-z8k.c corefile.c -cpu-a29k.c cpu-alpha.c cpu-arc.c cpu-arm.c diff --git a/bfd/sparclynx.c b/bfd/sparclynx.c index 29a9dba6ce..81aa554815 100644 --- a/bfd/sparclynx.c +++ b/bfd/sparclynx.c @@ -108,11 +108,6 @@ NAME(lynx,set_arch_mach) (abfd, machtype) machine = 0; break; - case M_29K: - arch = bfd_arch_a29k; - machine = 0; - break; - case M_HPUX: arch = bfd_arch_m68k; machine = 0; @@ -139,7 +134,6 @@ choose_reloc_size (abfd) switch (bfd_get_arch (abfd)) { case bfd_arch_sparc: - case bfd_arch_a29k: obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE; break; default: @@ -180,9 +174,6 @@ NAME(aout,sparclynx_write_object_contents) (abfd) case bfd_arch_i386: N_SET_MACHTYPE (*execp, M_386); break; - case bfd_arch_a29k: - N_SET_MACHTYPE (*execp, M_29K); - break; default: N_SET_MACHTYPE (*execp, M_UNKNOWN); } diff --git a/bfd/targets.c b/bfd/targets.c index 33951865be..009f9066aa 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -522,7 +522,6 @@ to find an alternative output format that is suitable. Alphabetized for easy reference. They are listed a second time below, since we can't intermix extern's and initializers. */ -extern const bfd_target a29kcoff_big_vec; extern const bfd_target a_out_adobe_vec; extern const bfd_target aix5coff64_vec; extern const bfd_target aout0_big_vec; @@ -808,7 +807,6 @@ static const bfd_target * const _bfd_target_vector[] = { Vectors that don't compile on all systems, or aren't finished, should have an entry here with #if 0 around it, to show that it wasn't omitted by mistake. */ - &a29kcoff_big_vec, &a_out_adobe_vec, #ifdef BFD64 &aix5coff64_vec, diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index e370dac00c..d42de3c27b 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-08-18 Alan Modra + + * binutils-all/objcopy.exp: Remove a29k support. + * binutils-all/objdump.exp: Likewise, alliant and convex too. + 2005-05-07 Nick Clifton * Update the address and phone number of the FSF organization in diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp index 14330b5c68..cb9850a8a9 100644 --- a/binutils/testsuite/binutils-all/objcopy.exp +++ b/binutils/testsuite/binutils-all/objcopy.exp @@ -71,7 +71,6 @@ if ![string match "" $got] then { # in the first place, and may order things a little differently. # Those systems should use setup_xfail here. - setup_xfail "a29k-*" setup_xfail "h8300-*-rtems*" "h8300-*-coff" setup_xfail "h8500-*-rtems*" "h8500-*-coff" setup_xfail "hppa*-*-*" diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp index 858020d4bd..1774c854e1 100644 --- a/binutils/testsuite/binutils-all/objdump.exp +++ b/binutils/testsuite/binutils-all/objdump.exp @@ -36,7 +36,7 @@ send_user "Version [binutil_version $OBJDUMP]" set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -i"] set cpus_expected [list] -lappend cpus_expected a29k alliant alpha arc arm convex cris +lappend cpus_expected alpha arc arm cris lappend cpus_expected d10v d30v fr30 fr500 fr550 h8 hppa i386 i860 i960 ip2022 lappend cpus_expected m32r m68hc11 m68hc12 m68k m88k MCore lappend cpus_expected mips mn10200 mn10300 msp ns32k pj powerpc pyramid diff --git a/include/ChangeLog b/include/ChangeLog index 570af43859..ba7cfbe6b2 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,9 @@ +2005-08-18 Alan Modra + + * bfdlink.h: Remove mention of a29k. + * dis-asm.h: Remove a29k support. + * aout/encap.h: Likewise. + 2005-08-17 Mark Kettenis * floatformat.h (struct floatformat): Change type of large diff --git a/include/aout/encap.h b/include/aout/encap.h index 0808ae6c2a..be8e88ccd6 100644 --- a/include/aout/encap.h +++ b/include/aout/encap.h @@ -85,7 +85,6 @@ struct coffheader #define COFF_MAGIC_I386 0514 /* I386MAGIC */ #define COFF_MAGIC_M68K 0520 /* MC68MAGIC */ -#define COFF_MAGIC_A29K 0x17A /* Used by asm29k cross-tools */ #ifdef COFF_MAGIC short __header_offset_temp; diff --git a/include/bfdlink.h b/include/bfdlink.h index a3a11fa638..66a5b42841 100644 --- a/include/bfdlink.h +++ b/include/bfdlink.h @@ -510,8 +510,7 @@ struct bfd_link_callbacks const char *name, const char *reloc_name, bfd_vma addend, bfd *abfd, asection *section, bfd_vma address); /* A function which is called when a dangerous reloc is performed. - The canonical example is an a29k IHCONST reloc which does not - follow an IHIHALF reloc. MESSAGE is an appropriate message. + MESSAGE is an appropriate message. ABFD, SECTION and ADDRESS identify the location at which the problem occurred; if this is the result of a bfd_section_reloc_link_order or bfd_symbol_reloc_link_order, then diff --git a/include/dis-asm.h b/include/dis-asm.h index 37c8101ca9..67eebfc1be 100644 --- a/include/dis-asm.h +++ b/include/dis-asm.h @@ -218,8 +218,6 @@ extern int print_insn_alpha (bfd_vma, disassemble_info *); extern int print_insn_big_arm (bfd_vma, disassemble_info *); extern int print_insn_little_arm (bfd_vma, disassemble_info *); extern int print_insn_sparc (bfd_vma, disassemble_info *); -extern int print_insn_big_a29k (bfd_vma, disassemble_info *); -extern int print_insn_little_a29k (bfd_vma, disassemble_info *); extern int print_insn_avr (bfd_vma, disassemble_info *); extern int print_insn_d10v (bfd_vma, disassemble_info *); extern int print_insn_d30v (bfd_vma, disassemble_info *); diff --git a/ld/ChangeLog b/ld/ChangeLog index 0d31afc232..5c3412052f 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2005-08-18 Alan Modra + + * Makefile.am: Remove a29k support. + * configure.tgt: Likewise. + * ld.texinfo: Likewise. + * Makefile.in: Regenerate. + 2005-08-17 Jakub Jelinek * ldgram.y (vers_defns): Don't lose pattern list before diff --git a/ld/Makefile.am b/ld/Makefile.am index 876822c173..aefec32811 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -106,7 +106,6 @@ BFDLIB = ../bfd/libbfd.la LIBIBERTY = ../libiberty/libiberty.a ALL_EMULATIONS = \ - ea29k.o \ eaixppc.o \ eaixrs6.o \ ealpha.o \ @@ -145,7 +144,6 @@ ALL_EMULATIONS = \ ed30velf.o \ edelta68.o \ eelf32_dlx.o \ - eebmon29k.o \ eelf32_i960.o \ eelf32_i860.o \ eelf32_sparc.o \ @@ -335,7 +333,6 @@ ALL_EMULATIONS = \ eppcpe.o \ eppclynx.o \ eriscix.o \ - esa29200.o \ esh.o \ eshelf32.o \ eshlelf32.o \ @@ -474,9 +471,6 @@ GEN_DEPENDS = $(srcdir)/genscripts.sh stringify.sed @TDIRS@ -ea29k.c: $(srcdir)/emulparams/a29k.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/a29k.sc ${GEN_DEPENDS} - ${GENSCRIPTS} a29k "$(tdir_a29k)" eaix5ppc.c: $(srcdir)/emulparams/aix5ppc.sh \ $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS} ${GENSCRIPTS} aix5ppc "$(tdir_aixppc)" @@ -624,9 +618,6 @@ edelta68.c: $(srcdir)/emulparams/delta68.sh \ eelf32_dlx.c: $(srcdir)/emulparams/elf32_dlx.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/dlx.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32_dlx "$(tdir_elf32_dlx)" -eebmon29k.c: $(srcdir)/emulparams/ebmon29k.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/ebmon29k.sc ${GEN_DEPENDS} - ${GENSCRIPTS} ebmon29k "$(tdir_ebmon29k)" eelf32xstormy16.c: $(srcdir)/emulparams/elf32xstormy16.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \ $(srcdir)/scripttempl/xstormy16.sc ${GEN_DEPENDS} @@ -1391,9 +1382,6 @@ eppclynx.c: $(srcdir)/emulparams/ppclynx.sh \ eriscix.c: $(srcdir)/emulparams/riscix.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} ${GENSCRIPTS} riscix "$(tdir_riscix)" -esa29200.c: $(srcdir)/emulparams/sa29200.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sa29200.sc ${GEN_DEPENDS} - ${GENSCRIPTS} sa29200 "$(tdir_sa29200)" esh.c: $(srcdir)/emulparams/sh.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS} ${GENSCRIPTS} sh "$(tdir_sh)" diff --git a/ld/Makefile.in b/ld/Makefile.in index 12eb3e7b25..a64ba920ef 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -329,7 +329,6 @@ INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) -I$(to BFDLIB = ../bfd/libbfd.la LIBIBERTY = ../libiberty/libiberty.a ALL_EMULATIONS = \ - ea29k.o \ eaixppc.o \ eaixrs6.o \ ealpha.o \ @@ -368,7 +367,6 @@ ALL_EMULATIONS = \ ed30velf.o \ edelta68.o \ eelf32_dlx.o \ - eebmon29k.o \ eelf32_i960.o \ eelf32_i860.o \ eelf32_sparc.o \ @@ -558,7 +556,6 @@ ALL_EMULATIONS = \ eppcpe.o \ eppclynx.o \ eriscix.o \ - esa29200.o \ esh.o \ eshelf32.o \ eshlelf32.o \ @@ -1278,9 +1275,6 @@ stringify.sed: ${srcdir}/emultempl/$(STRINGIFY) @TDIRS@ -ea29k.c: $(srcdir)/emulparams/a29k.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/a29k.sc ${GEN_DEPENDS} - ${GENSCRIPTS} a29k "$(tdir_a29k)" eaix5ppc.c: $(srcdir)/emulparams/aix5ppc.sh \ $(srcdir)/emultempl/aix.em $(srcdir)/scripttempl/aix.sc ${GEN_DEPENDS} ${GENSCRIPTS} aix5ppc "$(tdir_aixppc)" @@ -1428,9 +1422,6 @@ edelta68.c: $(srcdir)/emulparams/delta68.sh \ eelf32_dlx.c: $(srcdir)/emulparams/elf32_dlx.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/dlx.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32_dlx "$(tdir_elf32_dlx)" -eebmon29k.c: $(srcdir)/emulparams/ebmon29k.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/ebmon29k.sc ${GEN_DEPENDS} - ${GENSCRIPTS} ebmon29k "$(tdir_ebmon29k)" eelf32xstormy16.c: $(srcdir)/emulparams/elf32xstormy16.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/needrelax.em \ $(srcdir)/scripttempl/xstormy16.sc ${GEN_DEPENDS} @@ -2195,9 +2186,6 @@ eppclynx.c: $(srcdir)/emulparams/ppclynx.sh \ eriscix.c: $(srcdir)/emulparams/riscix.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} ${GENSCRIPTS} riscix "$(tdir_riscix)" -esa29200.c: $(srcdir)/emulparams/sa29200.sh \ - $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sa29200.sc ${GEN_DEPENDS} - ${GENSCRIPTS} sa29200 "$(tdir_sa29200)" esh.c: $(srcdir)/emulparams/sh.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS} ${GENSCRIPTS} sh "$(tdir_sh)" diff --git a/ld/configure.tgt b/ld/configure.tgt index 017c2d6fc5..3f70bccf58 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -20,10 +20,6 @@ targ_extra_ofiles= # architecture variants should be kept together even if their names # break the alpha sorting. case "${targ}" in -a29k-*-udi) targ_emul=sa29200 ;; -a29k-*-ebmon) targ_emul=ebmon29k ;; -a29k-*-*) targ_emul=a29k - ;; alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu) targ_emul=elf64alpha_fbsd targ_extra_emuls="elf64alpha alpha" diff --git a/ld/ld.texinfo b/ld/ld.texinfo index cada21302f..ccb4b57543 100644 --- a/ld/ld.texinfo +++ b/ld/ld.texinfo @@ -18,7 +18,6 @@ @c Configure for the generation of man pages @set UsesEnvVars @set GENERIC -@set A29K @set ARC @set ARM @set D10V diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 6812aab66c..095180b8c8 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-08-18 Alan Modra + + * ld-scripts/crossref.exp: Remove a29k support. + * ld-srec/srec.exp: Likewise. + 2005-08-17 Jakub Jelinek * lib/ld-lib.exp (default_ld_compile): Append $cc arguments after diff --git a/ld/testsuite/ld-scripts/crossref.exp b/ld/testsuite/ld-scripts/crossref.exp index 97e1d36427..7c5fcbe65f 100644 --- a/ld/testsuite/ld-scripts/crossref.exp +++ b/ld/testsuite/ld-scripts/crossref.exp @@ -42,13 +42,6 @@ if { ![ld_compile $CC "$srcdir/$subdir/cross1.c" tmpdir/cross1.o] \ set flags [big_or_little_endian] -# The a29k compiled code calls V_SPILL and V_FILL. Since we don't -# need to run this code, but we don't have definitions for those -# functions, we just define them out. -if [istarget a29k*-*-*] { - set flags "$flags --defsym V_SPILL=0 --defsym V_FILL=0" -} - if [istarget sh64*-*-elf] { # This is what gcc passes to ld by default. set flags "-mshelf32" diff --git a/ld/testsuite/ld-srec/srec.exp b/ld/testsuite/ld-srec/srec.exp index 3b45a29c19..74e76e6a97 100644 --- a/ld/testsuite/ld-srec/srec.exp +++ b/ld/testsuite/ld-srec/srec.exp @@ -237,13 +237,6 @@ proc run_srec_test { test objs } { set flags "$flags -Ttext 0x1000" } - # The a29k compiled code calls V_SPILL and V_FILL. Since we don't - # need to run this code, but we don't have definitions for those - # functions, we just define them out. - if [istarget a29k*-*-*] { - set flags "$flags --defsym V_SPILL=0 --defsym V_FILL=0" - } - if [istarget sh64*-*-elf] { # This is what gcc passes to ld by default. set flags "-mshelf32" diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 951f0c39c1..577ee0169e 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,12 @@ +2005-08-18 Alan Modra + + * Makefile.am: Remove a29k support. + * configure.in: Likewise. + * disassemble.c: Likewise. + * Makefile.in: Regenerate. + * configure: Regenerate. + * po/POTFILES.in: Regenerate. + 2005-08-15 Daniel Jacobowitz * ppc-dis.c (powerpc_dialect): Handle e300. diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 8e9766526f..5352b0e3a1 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -47,7 +47,6 @@ HFILES = \ # C source files that correspond to .o's. CFILES = \ - a29k-dis.c \ alpha-dis.c \ alpha-opc.c \ arc-dis.c \ @@ -182,7 +181,6 @@ CFILES = \ z8kgen.c ALL_MACHINES = \ - a29k-dis.lo \ alpha-dis.lo \ alpha-opc.lo \ arc-dis.lo \ @@ -574,8 +572,6 @@ dep-am: DEP # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -a29k-dis.lo: a29k-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/symcat.h $(INCDIR)/opcode/a29k.h alpha-dis.lo: alpha-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/symcat.h $(INCDIR)/opcode/alpha.h alpha-opc.lo: alpha-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \ diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index 3c7c3f8b3e..6b968efc15 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -269,7 +269,6 @@ HFILES = \ # C source files that correspond to .o's. CFILES = \ - a29k-dis.c \ alpha-dis.c \ alpha-opc.c \ arc-dis.c \ @@ -404,7 +403,6 @@ CFILES = \ z8kgen.c ALL_MACHINES = \ - a29k-dis.lo \ alpha-dis.lo \ alpha-opc.lo \ arc-dis.lo \ @@ -1116,8 +1114,6 @@ dep-am: DEP # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -a29k-dis.lo: a29k-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ - $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/symcat.h $(INCDIR)/opcode/a29k.h alpha-dis.lo: alpha-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/dis-asm.h $(BFD_H) $(INCDIR)/symcat.h $(INCDIR)/opcode/alpha.h alpha-opc.lo: alpha-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \ diff --git a/opcodes/configure b/opcodes/configure index 3a4fa9a722..2250953f5f 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -8693,13 +8693,10 @@ if test x${all_targets} = xfalse ; then ad=`echo $arch | sed -e s/bfd_//g -e s/_arch//g` archdefs="$archdefs -DARCH_$ad" case "$arch" in - bfd_a29k_arch) ta="$ta a29k-dis.lo" ;; - bfd_alliant_arch) ;; bfd_alpha_arch) ta="$ta alpha-dis.lo alpha-opc.lo" ;; bfd_arc_arch) ta="$ta arc-dis.lo arc-opc.lo arc-ext.lo" ;; bfd_arm_arch) ta="$ta arm-dis.lo" ;; bfd_avr_arch) ta="$ta avr-dis.lo" ;; - bfd_convex_arch) ;; bfd_cris_arch) ta="$ta cris-dis.lo cris-opc.lo" ;; bfd_crx_arch) ta="$ta crx-dis.lo crx-opc.lo" ;; bfd_d10v_arch) ta="$ta d10v-dis.lo d10v-opc.lo" ;; diff --git a/opcodes/configure.in b/opcodes/configure.in index 6e22f80363..a0e4624850 100644 --- a/opcodes/configure.in +++ b/opcodes/configure.in @@ -153,13 +153,10 @@ if test x${all_targets} = xfalse ; then ad=`echo $arch | sed -e s/bfd_//g -e s/_arch//g` archdefs="$archdefs -DARCH_$ad" case "$arch" in - bfd_a29k_arch) ta="$ta a29k-dis.lo" ;; - bfd_alliant_arch) ;; bfd_alpha_arch) ta="$ta alpha-dis.lo alpha-opc.lo" ;; bfd_arc_arch) ta="$ta arc-dis.lo arc-opc.lo arc-ext.lo" ;; bfd_arm_arch) ta="$ta arm-dis.lo" ;; bfd_avr_arch) ta="$ta avr-dis.lo" ;; - bfd_convex_arch) ;; bfd_cris_arch) ta="$ta cris-dis.lo cris-opc.lo" ;; bfd_crx_arch) ta="$ta crx-dis.lo crx-opc.lo" ;; bfd_d10v_arch) ta="$ta d10v-dis.lo d10v-opc.lo" ;; diff --git a/opcodes/disassemble.c b/opcodes/disassemble.c index cbecfcdf40..c0ff7b4c4c 100644 --- a/opcodes/disassemble.c +++ b/opcodes/disassemble.c @@ -20,7 +20,6 @@ #include "dis-asm.h" #ifdef ARCH_all -#define ARCH_a29k #define ARCH_alpha #define ARCH_arc #define ARCH_arm @@ -94,12 +93,6 @@ disassembler (abfd) { /* If you add a case to this table, also add it to the ARCH_all definition right above this function. */ -#ifdef ARCH_a29k - case bfd_arch_a29k: - /* As far as I know we only handle big-endian 29k objects. */ - disassemble = print_insn_big_a29k; - break; -#endif #ifdef ARCH_alpha case bfd_arch_alpha: disassemble = print_insn_alpha; diff --git a/opcodes/po/POTFILES.in b/opcodes/po/POTFILES.in index 8a3fc52538..278ae95f6c 100644 --- a/opcodes/po/POTFILES.in +++ b/opcodes/po/POTFILES.in @@ -1,4 +1,3 @@ -a29k-dis.c alpha-dis.c alpha-opc.c arc-dis.c -- 2.34.1