From 130308bf6de173c5e39cc4fcec1489c99f77f789 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 7 Jan 1994 01:21:37 +0000 Subject: [PATCH] * targets.c (target_vector): Added nlm32_alpha_vec inside #ifdef BFD64. * Makefile.in (BFD32_BACKENDS): Remove nlm32-alpha.o. (BFD64_BACKENDS): Add nlm32-alpha.o. It depends on 64 bit support, even though it is for an Alpha in 32 bit mode. * configure.in (nlm32_alpha_vec): Set target64 to true. * nlm32-gen.c, nlm64-gen.c: Removed. All nlm targets are different, so there is no point to providing a generic one. * libnlm.h: Don't bother to check for nlm_backend(bfd) being NULL in the backend accessor macros; that should no longer be possible. * targets.c (target_vector): Removed nlm32_big_generic_vec, nlm64_big_generic_vec, nlm64_little_generic_vec. * configure.in (nlm32_big_generic_vec, nlm32_little_generic_vec, nlm64_big_generic_vec, nlm64_little_generic_vec): Removed. * Makefile.in: Rebuilt dependencies, and (BFD32_BACKENDS): Removed nlm32-gen.o. (BFD64_BACKENDS): Removed nlm64-gen.o. (CFILES): Removed nlm32-gen.c and nlm64-gen.c. --- bfd/Makefile.in | 126 ++++++++++++++++++++++-------------------------- 1 file changed, 58 insertions(+), 68 deletions(-) diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 23a874a09b5..7609b86767a 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -85,7 +85,7 @@ BFD_H = bfd.h BFD_LIBS = \ archive.o archures.o bfd.o cache.o coffgen.o core.o ctor.o \ format.o init.o libbfd.o opncls.o reloc.o \ - seclet.o section.o syms.o targets.o \ + section.o syms.o targets.o hash.o linker.o \ ecoff.o ecofflink.o elf.o srec.o # This list is alphabetized to make it easier to keep in sync @@ -153,10 +153,8 @@ BFD32_BACKENDS = \ mipsbsd.o \ newsos3.o \ nlm.o \ - nlm32-gen.o \ nlm32-i386.o \ nlm32-sparc.o \ - nlm32-alpha.o \ nlm32.o \ oasys.o \ reloc16.o \ @@ -173,7 +171,7 @@ BFD64_BACKENDS = \ demo64.o \ elf64-gen.o \ elf64.o \ - nlm64-gen.o \ + nlm32-alpha.o \ nlm64.o OPTIONAL_BACKENDS = \ @@ -220,7 +218,7 @@ CFILES = libbfd.c opncls.c bfd.c archive.c targets.c cache.c \ ecoff.c ecofflink.c coff-m68k.c coff-u68k.c coff-apollo.c \ coff-a29k.c coff-rs6000.c coff-sparc.c coffgen.c format.c \ section.c core.c syms.c stab-syms.c reloc.c init.c ctor.c \ - seclet.c coff-m88k.c coff-mips.c coff-sh.c trad-core.c newsos3.c \ + coff-m88k.c coff-mips.c coff-sh.c trad-core.c newsos3.c \ i386aout.c i386linux.c netbsd386.c i386mach3.c bout.c aout-adobe.c coff-we32k.c \ i386bsd.c cpu-h8300.c cpu-i960.c cpu-sparc.c cpu-m68k.c \ cpu-m88k.c cpu-vax.c cpu-mips.c cpu-a29k.c cpu-i386.c \ @@ -229,19 +227,18 @@ CFILES = libbfd.c opncls.c bfd.c archive.c targets.c cache.c \ elf.c elf32.c elf32-sparc.c elf32-i386.c elf32-i860.c elf32-m68k.c \ elf32-hppa.c elf32-m88k.c elf32-mips.c elf32-gen.c \ elf64.c elf64-gen.c \ - nlm.c nlm32.c nlm32-gen.c nlm32-i386.c nlm32-sparc.c nlm32-alpha.c \ - nlm64.c nlm64-gen.c \ - coff-alpha.c cpu-alpha.c \ + nlm.c nlm32.c nlm32-i386.c nlm32-sparc.c nlm32-alpha.c \ + nlm64.c coff-alpha.c cpu-alpha.c \ hp300bsd.c hp300hpux.c \ i386lynx.c cf-i386lynx.c m68klynx.c cf-m68klynx.c \ sparclynx.c cf-sparclynx.c aix386-core.c hpux-core.c \ - irix-core.c lynx-core.c osf-core.c + irix-core.c lynx-core.c osf-core.c hash.c linker.c HFILES = aout-target.h aoutf1.h aoutx.h coffcode.h \ coffswap.h ecoffswap.h elf32-hppa.h elf32-target.h elf64-target.h \ elfcode.h hppa_stubs.h libaout.h libbfd.h \ libcoff.h libecoff.h libelf.h libhppa.h libieee.h libnlm.h \ - liboasys.h nlm-target.h nlmcode.h seclet.h som.h + liboasys.h nlm-target.h nlmcode.h som.h genlink.h STAGESTUFF = $(TARGETLIB) $(OFILES) @@ -503,19 +500,22 @@ bfd.ps: libbfd.o : libbfd.c opncls.o : opncls.c -bfd.o : bfd.c $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h \ - libcoff.h libecoff.h $(INCDIR)/coff/ecoff.h libelf.h \ - $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h +bfd.o : bfd.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \ + $(INCDIR)/coff/sym.h libcoff.h libecoff.h $(INCDIR)/coff/ecoff.h \ + libelf.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h archive.o : archive.c $(INCDIR)/aout/ar.h $(INCDIR)/aout/ranlib.h targets.o : targets.c cache.o : cache.c archures.o : archures.c coff-i386.o : coff-i386.c $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h \ - libcoff.h coffcode.h seclet.h coffswap.h -aout64.o : aout64.c aoutx.h libaout.h $(INCDIR)/aout/aout64.h \ - $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h -aout32.o : aout32.c aoutx.h libaout.h $(INCDIR)/aout/aout64.h \ - $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h + libcoff.h coffcode.h coffswap.h +aout64.o : aout64.c aoutx.h $(INCDIR)/bfdlink.h libaout.h \ + $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ + $(INCDIR)/aout/ar.h +aout32.o : aout32.c aoutx.h $(INCDIR)/bfdlink.h libaout.h \ + $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ + $(INCDIR)/aout/ar.h sunos.o : sunos.c aoutf1.h $(INCDIR)/aout/sun4.h libaout.h \ $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ $(INCDIR)/aout/ar.h aout-target.h @@ -523,53 +523,47 @@ demo64.o : demo64.c aoutf1.h $(INCDIR)/aout/sun4.h \ libaout.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h coff-i960.o : coff-i960.c $(INCDIR)/coff/i960.h $(INCDIR)/coff/internal.h \ - libcoff.h coffcode.h seclet.h coffswap.h + libcoff.h coffcode.h coffswap.h srec.o : srec.c tekhex.o : tekhex.c oasys.o : oasys.c $(INCDIR)/oasys.h liboasys.h ieee.o : ieee.c $(INCDIR)/ieee.h libieee.h -ecoff.o : ecoff.c seclet.h $(INCDIR)/aout/ar.h $(INCDIR)/aout/ranlib.h \ - libaout.h $(INCDIR)/aout/aout64.h $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \ - libcoff.h libecoff.h +ecoff.o : ecoff.c $(INCDIR)/bfdlink.h $(INCDIR)/aout/ar.h \ + $(INCDIR)/aout/ranlib.h libaout.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h \ + $(INCDIR)/coff/ecoff.h libcoff.h libecoff.h ecofflink.o : ecofflink.c $(INCDIR)/coff/internal.h \ $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h coff-m68k.o : coff-m68k.c $(INCDIR)/coff/m68k.h $(INCDIR)/coff/internal.h \ - libcoff.h coffcode.h seclet.h coffswap.h + libcoff.h coffcode.h coffswap.h coff-u68k.o : coff-u68k.c coff-m68k.c $(INCDIR)/coff/m68k.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h seclet.h \ - coffswap.h + $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h coff-apollo.o : coff-apollo.c $(INCDIR)/coff/apollo.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h seclet.h \ - coffswap.h + $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h coff-a29k.o : coff-a29k.c $(INCDIR)/coff/a29k.h $(INCDIR)/coff/internal.h \ - libcoff.h coffcode.h seclet.h coffswap.h + libcoff.h coffcode.h coffswap.h coff-rs6000.o : coff-rs6000.c $(INCDIR)/coff/internal.h \ - $(INCDIR)/coff/rs6000.h libcoff.h coffcode.h seclet.h \ - coffswap.h + $(INCDIR)/coff/rs6000.h libcoff.h coffcode.h coffswap.h coff-sparc.o : coff-sparc.c $(INCDIR)/coff/sparc.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h seclet.h \ - coffswap.h -coffgen.o : coffgen.c $(INCDIR)/coff/internal.h seclet.h \ - libcoff.h + $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h +coffgen.o : coffgen.c $(INCDIR)/coff/internal.h libcoff.h format.o : format.c section.o : section.c core.o : core.c syms.o : syms.c $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def stab-syms.o : stab-syms.c libaout.h $(INCDIR)/aout/aout64.h \ $(INCDIR)/aout/stab.def -reloc.o : reloc.c seclet.h +reloc.o : reloc.c $(INCDIR)/bfdlink.h init.o : init.c ctor.o : ctor.c -seclet.o : seclet.c seclet.h $(INCDIR)/coff/internal.h coff-m88k.o : coff-m88k.c $(INCDIR)/coff/m88k.h $(INCDIR)/coff/internal.h \ - libcoff.h coffcode.h seclet.h coffswap.h -coff-mips.o : coff-mips.c seclet.h $(INCDIR)/coff/internal.h \ + libcoff.h coffcode.h coffswap.h +coff-mips.o : coff-mips.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \ $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \ $(INCDIR)/coff/mips.h libcoff.h libecoff.h coffswap.h \ ecoffswap.h -coff-sh.o : coff-sh.c $(INCDIR)/coff/sh.h $(INCDIR)/coff/internal.h \ - libcoff.h seclet.h coffcode.h coffswap.h +coff-sh.o : coff-sh.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/sh.h \ + $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h trad-core.o : trad-core.c libaout.h newsos3.o : newsos3.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \ @@ -584,13 +578,12 @@ netbsd386.o : netbsd386.c libaout.h aout-target.h $(INCDIR)/aout/aout64.h \ i386mach3.o : i386mach3.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \ aout-target.h -bout.o : bout.c seclet.h $(INCDIR)/bout.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def libaout.h +bout.o : bout.c $(INCDIR)/bfdlink.h $(INCDIR)/bout.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def libaout.h aout-adobe.o : aout-adobe.c $(INCDIR)/aout/adobe.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def libaout.h coff-we32k.o : coff-we32k.c $(INCDIR)/coff/we32k.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h seclet.h \ - coffswap.h + $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h i386bsd.o : i386bsd.c libaout.h aout-target.h $(INCDIR)/aout/aout64.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h cpu-h8300.o : cpu-h8300.c @@ -603,13 +596,12 @@ cpu-mips.o : cpu-mips.c cpu-a29k.o : cpu-a29k.c cpu-i386.o : cpu-i386.c cpu-rs6000.o : cpu-rs6000.c -coff-h8300.o : coff-h8300.c $(INCDIR)/coff/h8300.h \ - $(INCDIR)/coff/internal.h seclet.h libcoff.h coffcode.h \ - coffswap.h +coff-h8300.o : coff-h8300.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/h8300.h \ + $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h som.o : som.c cpu-hppa.o : cpu-hppa.c cpu-we32k.o : cpu-we32k.c -reloc16.o : reloc16.c seclet.h $(INCDIR)/coff/internal.h \ +reloc16.o : reloc16.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \ libcoff.h mipsbsd.o : mipsbsd.c libaout.h aout-target.h $(INCDIR)/aout/aout64.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h @@ -626,14 +618,16 @@ elf32-i860.o : elf32-i860.c libelf.h $(INCDIR)/elf/common.h \ $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h elf32-target.h elf32-m68k.o : elf32-m68k.c libelf.h $(INCDIR)/elf/common.h \ $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h elf32-target.h -elf32-hppa.o : elf32-hppa.c libelf.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h elf32-hppa.h \ - libhppa.h $(INCDIR)/aout/aout64.h hppa_stubs.h elf32-target.h +elf32-hppa.o : elf32-hppa.c $(INCDIR)/bfdlink.h libelf.h \ + $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ + elf32-hppa.h libhppa.h $(INCDIR)/aout/aout64.h hppa_stubs.h \ + elf32-target.h elf32-m88k.o : elf32-m88k.c libelf.h $(INCDIR)/elf/common.h \ $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h elf32-target.h -elf32-mips.o : elf32-mips.c seclet.h libelf.h $(INCDIR)/elf/common.h \ - $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h \ - $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/internal.h \ +elf32-mips.o : elf32-mips.c $(INCDIR)/bfdlink.h genlink.h \ + libelf.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ + $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h $(INCDIR)/coff/sym.h \ + $(INCDIR)/coff/symconst.h $(INCDIR)/coff/internal.h \ $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/mips.h ecoffswap.h \ elf32-target.h elf32-gen.o : elf32-gen.c libelf.h $(INCDIR)/elf/common.h \ @@ -646,8 +640,6 @@ nlm.o : nlm.c libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \ $(INCDIR)/nlm/external.h nlm32.o : nlm32.c nlmcode.h libnlm.h $(INCDIR)/nlm/common.h \ $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h -nlm32-gen.o : nlm32-gen.c libnlm.h $(INCDIR)/nlm/common.h \ - $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h nlm-target.h nlm32-i386.o : nlm32-i386.c $(INCDIR)/nlm/i386-ext.h \ libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \ $(INCDIR)/nlm/external.h nlmswap.h nlm-target.h @@ -659,9 +651,7 @@ nlm32-alpha.o : nlm32-alpha.c $(INCDIR)/nlm/alpha-ext.h \ $(INCDIR)/nlm/external.h nlmswap.h nlm-target.h nlm64.o : nlm64.c nlmcode.h libnlm.h $(INCDIR)/nlm/common.h \ $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h -nlm64-gen.o : nlm64-gen.c libnlm.h $(INCDIR)/nlm/common.h \ - $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h nlm-target.h -coff-alpha.o : coff-alpha.c seclet.h $(INCDIR)/coff/internal.h \ +coff-alpha.o : coff-alpha.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \ $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \ $(INCDIR)/coff/alpha.h libcoff.h libecoff.h coffswap.h \ ecoffswap.h @@ -669,31 +659,31 @@ cpu-alpha.o : cpu-alpha.c hp300bsd.o : hp300bsd.c libaout.h aout-target.h $(INCDIR)/aout/aout64.h \ $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h hp300hpux.o : hp300hpux.c $(INCDIR)/aout/hp300hpux.h \ - aoutx.h libaout.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \ - $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h + aoutx.h $(INCDIR)/bfdlink.h libaout.h $(INCDIR)/aout/aout64.h \ + $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \ + aout-target.h i386lynx.o : i386lynx.c libaout.h $(INCDIR)/aout/aout64.h \ aout-target.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ $(INCDIR)/aout/ar.h cf-i386lynx.o : cf-i386lynx.c coff-i386.c $(INCDIR)/coff/i386.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h seclet.h \ - coffswap.h + $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h m68klynx.o : m68klynx.c libaout.h $(INCDIR)/aout/aout64.h \ aout-target.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ $(INCDIR)/aout/ar.h cf-m68klynx.o : cf-m68klynx.c coff-m68k.c $(INCDIR)/coff/m68k.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h seclet.h \ - coffswap.h + $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h sparclynx.o : sparclynx.c $(INCDIR)/aout/sun4.h libaout.h \ $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \ $(INCDIR)/aout/ar.h aout-target.h cf-sparclynx.o : cf-sparclynx.c coff-sparc.c $(INCDIR)/coff/sparc.h \ - $(INCDIR)/coff/internal.h libcoff.h coffcode.h seclet.h \ - coffswap.h + $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h aix386-core.o : aix386-core.c $(INCDIR)/coff/i386.h \ $(INCDIR)/coff/internal.h libcoff.h hpux-core.o : hpux-core.c irix-core.o : irix-core.c lynx-core.o : lynx-core.c osf-core.o : osf-core.c +hash.o : hash.c +linker.o : linker.c $(INCDIR)/bfdlink.h genlink.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY -- 2.30.2