* configure.in: For a native configuration, set COREFILE and

	COREFLAG based on the canonical host name.
	* configure: Rebuild.
	* Makefile.in: Rebuild dependencies.
	(ALL_CFLAGS): Add @COREFLAG@.
	(OFILES): Replace $(HDEPFILES) with @COREFILE@.
	* coff-rs6000.c: Check AIX_CORE rather than HOST_AIX for core file
	support routines.  Check LYNX_CORE rather than HOST_LYNX.
	* lynx-core.c: Check LYNX_CORE rather than HOST_LYNX.
	* i386lynx.c: Likewise.
	* m68klynx.c: Likewise.
	* sparclynx.c: Likewise.
	* rs6000-core.c: Check AIX_CORE rather than HOST_AIX.
	* *-core.c: Comment changes.
	* config/decstation.mh (HDEPFILES): Remove.
	(HDEFINES): Remove -DTRAD_CORE.
	* config/irix3.mh (RANLIB): Remove.
	* config/irix4.mh (HDEPFILES, RANLIB): Remove.
	(HDEFINES): Remove -DIRIX_CORE.
	* config/riscos.mh (RANLIB, HDEPFILES): Remove.
	(HDEFINES): Remove -DTRAD_CORE.
	* config/ncr3000.mh (AR_FLAGS, RANLIB): Remove.
	* config/ultra3.mh (RANLIB): Remove.
	* config/aix4.mh, config/alphaosf.mh, config/amix.mh: Remove.
	* config/apollo.mh, config/delta68.mh, config/delta88.mh: Remove.
	* config/dpx2.mh, config/esix.mh, config/harris.mh: Remove.
	* config/hp300.mh, config/hp300bsd.mh, config/hppabsd.mh: Remove.
	* config/hppahpux.mh, config/hppaosf.mh: Remove.
	* config/i386aix.mh, config/i386bsd.mh: Remove.
	* config/i386linux.mh, config/i386mach3.mh: Remove.
	* config/i386sco.mh, config/i386v.mh, config/i386v4.mh: Remove.
	* config/irix5.mh, config/m88kmach3.mh, config/mipsbsd.mh: Remove.
	* config/mipsmach3.mh, config/news-mips.mh: Remove.
	* config/news.mh, config/pc532mach.mh, config/riscix.mh: Remove.
	* config/rs600.mh, config/rs6000lynx.mh: Remove.
	* config/solaris2.mh, config/stratus.mh: Remove.
	* config/symmetry.mh, config/sysv4.mh, config/tahoe.mh: Remove.
	* config/vaxbsd.mh, config/vaxult.mh, config/vaxult2.mh: Remove.

5 files changed, 239 insertions, 48 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index cc836b8..d89ecb5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,44 @@
+Fri Sep  1 18:06:28 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: For a native configuration, set COREFILE and
+	COREFLAG based on the canonical host name.
+	* configure: Rebuild.
+	* Makefile.in: Rebuild dependencies.
+	(ALL_CFLAGS): Add @COREFLAG@.
+	(OFILES): Replace $(HDEPFILES) with @COREFILE@.
+	* coff-rs6000.c: Check AIX_CORE rather than HOST_AIX for core file
+	support routines.  Check LYNX_CORE rather than HOST_LYNX.
+	* lynx-core.c: Check LYNX_CORE rather than HOST_LYNX.
+	* i386lynx.c: Likewise.
+	* m68klynx.c: Likewise.
+	* sparclynx.c: Likewise.
+	* rs6000-core.c: Check AIX_CORE rather than HOST_AIX.
+	* *-core.c: Comment changes.
+	* config/decstation.mh (HDEPFILES): Remove.
+	(HDEFINES): Remove -DTRAD_CORE.
+	* config/irix3.mh (RANLIB): Remove.
+	* config/irix4.mh (HDEPFILES, RANLIB): Remove.
+	(HDEFINES): Remove -DIRIX_CORE.
+	* config/riscos.mh (RANLIB, HDEPFILES): Remove.
+	(HDEFINES): Remove -DTRAD_CORE.
+	* config/ncr3000.mh (AR_FLAGS, RANLIB): Remove.
+	* config/ultra3.mh (RANLIB): Remove.
+	* config/aix4.mh, config/alphaosf.mh, config/amix.mh: Remove.
+	* config/apollo.mh, config/delta68.mh, config/delta88.mh: Remove.
+	* config/dpx2.mh, config/esix.mh, config/harris.mh: Remove.
+	* config/hp300.mh, config/hp300bsd.mh, config/hppabsd.mh: Remove.
+	* config/hppahpux.mh, config/hppaosf.mh: Remove.
+	* config/i386aix.mh, config/i386bsd.mh: Remove.
+	* config/i386linux.mh, config/i386mach3.mh: Remove.
+	* config/i386sco.mh, config/i386v.mh, config/i386v4.mh: Remove.
+	* config/irix5.mh, config/m88kmach3.mh, config/mipsbsd.mh: Remove.
+	* config/mipsmach3.mh, config/news-mips.mh: Remove.
+	* config/news.mh, config/pc532mach.mh, config/riscix.mh: Remove.
+	* config/rs600.mh, config/rs6000lynx.mh: Remove.
+	* config/solaris2.mh, config/stratus.mh: Remove.
+	* config/symmetry.mh, config/sysv4.mh, config/tahoe.mh: Remove.
+	* config/vaxbsd.mh, config/vaxult.mh, config/vaxult2.mh: Remove.
+
 Fri Sep  1 15:18:50 1995  Kazumoto Kojima  <kkojima@info.kanagawa-u.ac.jp>
 
 	* elflink.h (elf_bfd_final_link): Don't change a DT_INIT or
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index b8cb891..cf2c617 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -254,7 +254,7 @@ FLAGS_TO_PASS = \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
 	"BISON=$(BISON)"
 
-ALL_CFLAGS=$(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES)
+ALL_CFLAGS=$(CFLAGS) $(HDEFINES) @COREFLAG@ $(TDEFINES) $(CSEARCH) $(CSWITCHES)
 .c.o:
 	$(CC) -c $(ALL_CFLAGS) $<
 
@@ -320,9 +320,9 @@ diststuff: info headers
 # BFD_LIBS	Generic routines, always needed.
 # BFD_BACKENDS	Routines the configured targets need.
 # BFD_MACHINES	Architecture-specific routines the configured targets need.
-# HDEPFILES	Routines the host needs, regardless of target.
+# COREFILE	Core file routines for a native configuration
 # TDEPFILES	Routines the target needs, regardless of host.
-OFILES = $(BFD_LIBS) $(BFD_BACKENDS) $(BFD_MACHINES) $(HDEPFILES) $(TDEPFILES)
+OFILES = $(BFD_LIBS) $(BFD_BACKENDS) $(BFD_MACHINES) @COREFILE@ $(TDEPFILES)
 
 ofiles : Makefile
 	rm -f ofiles
@@ -836,15 +836,15 @@ pe-i386.o: pe-i386.c coff-i386.c $(INCDIR)/coff/i386.h \
   $(INCDIR)/bfdlink.h coffcode.h coffswap.h
 pei-i386.o: pei-i386.c coff-i386.c $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h coffswap.h peicode.h
+  $(INCDIR)/bfdlink.h coffcode.h peicode.h
 versados.o: versados.c $(INCDIR)/libiberty.h
 coff-arm.o: coff-arm.c $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h \
   libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
 pe-arm.o: pe-arm.c coff-arm.c $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h coffswap.h 
+  $(INCDIR)/bfdlink.h coffcode.h coffswap.h
 pei-arm.o: pei-arm.c coff-arm.c $(INCDIR)/coff/arm.h \
   $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h coffswap.h peicode.h
+  $(INCDIR)/bfdlink.h coffcode.h peicode.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/bfd/configure b/bfd/configure
index a1fb8a1..19c1b2b 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -406,7 +406,7 @@ fi
 # Check whether --enable-64-bit-bfd or --disable-64-bit-bfd was given.
 enableval="$enable_64_bit_bfd"
 if test -n "$enableval"; then
-  case "{$enableval}" in
+  case "${enableval}" in
   yes)  want64=true  ;;
   no)   want64=false ;;
   *)    { echo "configure: error: bad value ${enableval} for 64-bit-bfd option" 1>&2; exit 1; } ;;
@@ -604,6 +604,76 @@ else
 fi
 
 
+# If we are configured native, pick a core file support file.
+COREFILE=
+COREFLAG=
+if test "${target}" = "${host}"; then
+  case "${host}" in
+  alpha-*-*)		COREFILE=osf-core.o ;;
+  arm-*-riscix)		COREFILE=trad-core.o ;;
+  hppa*-*-hpux*)	COREFILE=hpux-core.o ;;
+  hppa*-*-hiux*)	COREFILE=hpux-core.o ;;
+  hppa*-*-bsd*)		COREFILE="hpux-core.o hppabsd-core.o"
+			COREFLAG="-DHPUX_CORE -DHPPABSD_CORE" ;;
+  i34586-sequent-bsd*) COREFILE=trad-core.o ;;
+  i34586-sequent-sysv4*) ;;
+  i34586-sequent-sysv*) COREFILE=trad-core.o ;;
+  i34586-*-bsd*)	COREFILE=trad-core.o ;;
+  i34586-*-freebsd*)	COREFILE=trad-core.o ;;
+  i34586-*-netbsd*)	COREFILE=trad-core.o ;;
+  i34586-esix-sysv3*)	COREFILE=trad-core.o ;;
+  i34586-*-sco*)	COREFILE=trad-core.o ;;
+  i34586-*-mach3*)	COREFILE=trad-core.o ;;
+  i34586-*-linux*)	COREFILE=trad-core.o ;;
+  i34586-*-isc*)	COREFILE=trad-core.o ;;
+  i34586-*-aix*)	COREFILE=aix386-core.o ;;
+  mips-dec-bsd*)	COREFILE=trad-core.o ;;
+  mips-dec-mach3*)	COREFILE=trad-core.o ;;
+  mips-dec-*)		COREFILE=trad-core.o ;;
+  mips-sgi-irix4*)	COREFILE=irix-core.o ;;
+  mips-sgi-irix5*)	COREFILE=irix-core.o ;;
+  mips-*-mach3*)	COREFILE=trad-core.o ;;
+  mips-*-sysv4*)	;;
+  mips-*-sysv*)		COREFILE=trad-core.o ;;
+  mips-*-riscos*)	COREFILE=trad-core.o ;;
+  mips-sony-bsd*)	COREFILE=trad-core.o ;;
+  m68*-bull*-sysv*)	COREFILE=trad-core.o ;;
+  m68*-hp-hpux*)	COREFILE=hpux-core.o ;;
+  m68*-hp-bsd*)		COREFILE=trad-core.o ;;
+  m68*-motorola-sysv*)	COREFILE=ptrace-core.o ;;
+  m68*-sony-*)		COREFILE=trad-core.o ;;
+  m88*-*-sysv4*)	;;
+  m88*-motorola-sysv*)	COREFILE=trad-core.o ;;
+  m88*-*-mach3*)	COREFILE=trad-core.o ;;
+  ns32k-pc532-mach)	COREFILE=trad-core.o ;;
+  rs6000-*-lynx*)	COREFILE=lynx-core.o ;;
+  rs6000-*-aix4*)	COREFILE=rs6000-core.o
+			COREFLAG=-DALTERNATE_AIX_CORE_FORMAT ;;
+  rs6000-*-*)		COREFILE=rs6000-core.o ;;
+  powerpc-*-aix4*)	COREFILE=rs6000-core.o
+			COREFLAG=-DALTERNATE_AIX_CORE_FORMAT ;;
+  powerpc-*-aix*)	COREFILE=rs6000-core.o ;;
+  tahoe-*-*)		COREFILE=trad-core.o ;;
+  vax-*-ultrix2*)	COREFILE=trad-core.o ;;
+  vax-*-ultrix*)	COREFILE=trad-core.o ;;
+  vax-*-*)		COREFILE=trad-core.o ;;
+  esac
+
+  case "$COREFILE" in
+  aix386-core.o)	COREFLAG=-DAIX386_CORE ;;
+  hppabsd-core.o)	COREFLAG=-DHPPABSD_CORE ;;
+  hpux-core.o)		COREFLAG=-DHPUX_CORE ;;
+  irix-core.o)		COREFLAG=-DIRIX_CORE ;;
+  lynx-core.o)		COREFLAG=-DLYNX_CORE ;;
+  osf-core.o)		COREFLAG=-DOSF_CORE ;;
+  ptrace-core.o)	COREFLAG=-DPTRACE_CORE ;;
+  rs6000-core.o)	COREFLAG="$COREFLAG -DAIX_CORE" ;;
+  trad-core.o)		COREFLAG=-DTRAD_CORE ;;
+  esac
+fi
+
+
+
 # target stuff:
 
 # Canonicalize the secondary target names.
@@ -697,6 +767,8 @@ SELECT_ARCHITECTURES="$f"
 # Target backend .o files.
 tb=
 
+elf="elf.o elflink.o"
+
 for vec in $SELECT_VECS
 do
     case "$vec" in
@@ -704,8 +776,10 @@ do
     # with the two vector lists in targets.c.
     a29kcoff_big_vec)		tb="$tb coff-a29k.o cofflink.o" ;;
     a_out_adobe_vec)		tb="$tb aout-adobe.o aout32.o stab-syms.o" ;;
-    armpe_vec)			tb="$tb pe-arm.o cofflink.o " ;;
-    armpei_vec)			tb="$tb pei-arm.o cofflink.o " ;;
+    armpe_little_vec)		tb="$tb pe-arm.o cofflink.o " ;;
+    armpe_big_vec)		tb="$tb pe-arm.o cofflink.o " ;;
+    armpei_little_vec)		tb="$tb pei-arm.o cofflink.o " ;;
+    armpei_big_vec)		tb="$tb pei-arm.o cofflink.o " ;;
     aout0_big_vec)		tb="$tb aout0.o aout32.o stab-syms.o" ;;
     aout_arm_big_vec)		tb="$tb aout-arm.o aout32.o stab-syms.o" ;;
     aout_arm_little_vec)	tb="$tb aout-arm.o aout32.o stab-syms.o" ;;
@@ -715,26 +789,26 @@ do
     b_out_vec_big_host)		tb="$tb bout.o aout32.o stab-syms.o" ;;
     b_out_vec_little_host)	tb="$tb bout.o aout32.o stab-syms.o" ;;
 # start-sanitize-arc
-    bfd_elf32_littlearc_vec)	tb="$tb elf32-arc.o elf32.o elf.o" ;;
-    bfd_elf32_bigarc_vec)	tb="$tb elf32-arc.o elf32.o elf.o" ;;
+    bfd_elf32_littlearc_vec)	tb="$tb elf32-arc.o elf32.o $elf" ;;
+    bfd_elf32_bigarc_vec)	tb="$tb elf32-arc.o elf32.o $elf" ;;
 # end-sanitize-arc
-    bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.o elf32.o elf.o" ;;
-    bfd_elf32_bigmips_vec) 	tb="$tb elf32-mips.o elf32.o elf.o ecofflink.o" ;;
-    bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.o elf32.o elf.o" ;;
-    bfd_elf32_i386_vec)		tb="$tb elf32-i386.o elf32.o elf.o" ;;
-    bfd_elf32_i860_vec)		tb="$tb elf32-i860.o elf32.o elf.o" ;;
-    bfd_elf32_little_generic_vec) tb="$tb elf32-gen.o elf32.o elf.o" ;;
-    bfd_elf32_littlemips_vec) 	tb="$tb elf32-mips.o elf32.o elf.o ecofflink.o" ;;
-    bfd_elf32_m68k_vec)		tb="$tb elf32-m68k.o elf32.o elf.o" ;;
-    bfd_elf32_m88k_vec)		tb="$tb elf32-m88k.o elf32.o elf.o" ;;
-    bfd_elf32_powerpc_vec)	tb="$tb elf32-ppc.o elf32.o elf.o" ;;
-    bfd_elf32_powerpcle_vec)	tb="$tb elf32-ppc.o elf32.o elf.o" ;;
-    bfd_elf32_sparc_vec)	tb="$tb elf32-sparc.o elf32.o elf.o" ;;
-    bfd_elf64_big_generic_vec) 	tb="$tb elf64-gen.o elf64.o elf.o"
+    bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.o elf32.o $elf" ;;
+    bfd_elf32_bigmips_vec) 	tb="$tb elf32-mips.o elf32.o $elf ecofflink.o" ;;
+    bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.o elf32.o $elf" ;;
+    bfd_elf32_i386_vec)		tb="$tb elf32-i386.o elf32.o $elf" ;;
+    bfd_elf32_i860_vec)		tb="$tb elf32-i860.o elf32.o $elf" ;;
+    bfd_elf32_little_generic_vec) tb="$tb elf32-gen.o elf32.o $elf" ;;
+    bfd_elf32_littlemips_vec) 	tb="$tb elf32-mips.o elf32.o $elf ecofflink.o" ;;
+    bfd_elf32_m68k_vec)		tb="$tb elf32-m68k.o elf32.o $elf" ;;
+    bfd_elf32_m88k_vec)		tb="$tb elf32-m88k.o elf32.o $elf" ;;
+    bfd_elf32_powerpc_vec)	tb="$tb elf32-ppc.o elf32.o $elf" ;;
+    bfd_elf32_powerpcle_vec)	tb="$tb elf32-ppc.o elf32.o $elf" ;;
+    bfd_elf32_sparc_vec)	tb="$tb elf32-sparc.o elf32.o $elf" ;;
+    bfd_elf64_big_generic_vec) 	tb="$tb elf64-gen.o elf64.o $elf"
 				target64=true ;;
-    bfd_elf64_little_generic_vec) tb="$tb elf64-gen.o elf64.o elf.o"
+    bfd_elf64_little_generic_vec) tb="$tb elf64-gen.o elf64.o $elf"
 				target64=true ;;
-    bfd_elf64_sparc_vec)	tb="$tb elf64-sparc.o elf64.o elf.o"
+    bfd_elf64_sparc_vec)	tb="$tb elf64-sparc.o elf64.o $elf"
 				target64=true ;;
     cisco_core_vec)		tb="$tb cisco-core.o" ;;
     demo_64_vec)		tb="$tb demo64.o aout64.o stab-syms.o"
@@ -997,6 +1071,8 @@ s%@build_os@%$build_os%g
 s%@RANLIB@%$RANLIB%g
 /@host_makefile_frag@/r $host_makefile_frag
 s%@host_makefile_frag@%%g
+s%@COREFILE@%$COREFILE%g
+s%@COREFLAG@%$COREFLAG%g
 /@target_makefile_frag@/r $target_makefile_frag
 s%@target_makefile_frag@%%g
 s%@frags@%$frags%g
diff --git a/bfd/configure.in b/bfd/configure.in
index fbf0ae4..4f44d9b 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -3,7 +3,7 @@ AC_INIT(libbfd.c)
 
 AC_ARG_ENABLE(64-bit-bfd,
 [  --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)],
-[case "{$enableval}" in
+[case "${enableval}" in
   yes)  want64=true  ;;
   no)   want64=false ;;
   *)    AC_MSG_ERROR(bad value ${enableval} for 64-bit-bfd option) ;;
@@ -50,6 +50,76 @@ else
 fi
 AC_SUBST_FILE(host_makefile_frag)
 
+# If we are configured native, pick a core file support file.
+COREFILE=
+COREFLAG=
+if test "${target}" = "${host}"; then
+  case "${host}" in
+  alpha-*-*)		COREFILE=osf-core.o ;;
+  arm-*-riscix)		COREFILE=trad-core.o ;;
+  hppa*-*-hpux*)	COREFILE=hpux-core.o ;;
+  hppa*-*-hiux*)	COREFILE=hpux-core.o ;;
+  hppa*-*-bsd*)		COREFILE="hpux-core.o hppabsd-core.o"
+			COREFLAG="-DHPUX_CORE -DHPPABSD_CORE" ;;
+  i[345]86-sequent-bsd*) COREFILE=trad-core.o ;;
+  i[345]86-sequent-sysv4*) ;;
+  i[345]86-sequent-sysv*) COREFILE=trad-core.o ;;
+  i[345]86-*-bsd*)	COREFILE=trad-core.o ;;
+  i[345]86-*-freebsd*)	COREFILE=trad-core.o ;;
+  i[345]86-*-netbsd*)	COREFILE=trad-core.o ;;
+  i[345]86-esix-sysv3*)	COREFILE=trad-core.o ;;
+  i[345]86-*-sco*)	COREFILE=trad-core.o ;;
+  i[345]86-*-mach3*)	COREFILE=trad-core.o ;;
+  i[345]86-*-linux*)	COREFILE=trad-core.o ;;
+  i[345]86-*-isc*)	COREFILE=trad-core.o ;;
+  i[345]86-*-aix*)	COREFILE=aix386-core.o ;;
+  mips-dec-bsd*)	COREFILE=trad-core.o ;;
+  mips-dec-mach3*)	COREFILE=trad-core.o ;;
+  mips-dec-*)		COREFILE=trad-core.o ;;
+  mips-sgi-irix4*)	COREFILE=irix-core.o ;;
+  mips-sgi-irix5*)	COREFILE=irix-core.o ;;
+  mips-*-mach3*)	COREFILE=trad-core.o ;;
+  mips-*-sysv4*)	;;
+  mips-*-sysv*)		COREFILE=trad-core.o ;;
+  mips-*-riscos*)	COREFILE=trad-core.o ;;
+  mips-sony-bsd*)	COREFILE=trad-core.o ;;
+  m68*-bull*-sysv*)	COREFILE=trad-core.o ;;
+  m68*-hp-hpux*)	COREFILE=hpux-core.o ;;
+  m68*-hp-bsd*)		COREFILE=trad-core.o ;;
+  m68*-motorola-sysv*)	COREFILE=ptrace-core.o ;;
+  m68*-sony-*)		COREFILE=trad-core.o ;;
+  m88*-*-sysv4*)	;;
+  m88*-motorola-sysv*)	COREFILE=trad-core.o ;;
+  m88*-*-mach3*)	COREFILE=trad-core.o ;;
+  ns32k-pc532-mach)	COREFILE=trad-core.o ;;
+  rs6000-*-lynx*)	COREFILE=lynx-core.o ;;
+  rs6000-*-aix4*)	COREFILE=rs6000-core.o
+			COREFLAG=-DALTERNATE_AIX_CORE_FORMAT ;;
+  rs6000-*-*)		COREFILE=rs6000-core.o ;;
+  powerpc-*-aix4*)	COREFILE=rs6000-core.o
+			COREFLAG=-DALTERNATE_AIX_CORE_FORMAT ;;
+  powerpc-*-aix*)	COREFILE=rs6000-core.o ;;
+  tahoe-*-*)		COREFILE=trad-core.o ;;
+  vax-*-ultrix2*)	COREFILE=trad-core.o ;;
+  vax-*-ultrix*)	COREFILE=trad-core.o ;;
+  vax-*-*)		COREFILE=trad-core.o ;;
+  esac
+
+  case "$COREFILE" in
+  aix386-core.o)	COREFLAG=-DAIX386_CORE ;;
+  hppabsd-core.o)	COREFLAG=-DHPPABSD_CORE ;;
+  hpux-core.o)		COREFLAG=-DHPUX_CORE ;;
+  irix-core.o)		COREFLAG=-DIRIX_CORE ;;
+  lynx-core.o)		COREFLAG=-DLYNX_CORE ;;
+  osf-core.o)		COREFLAG=-DOSF_CORE ;;
+  ptrace-core.o)	COREFLAG=-DPTRACE_CORE ;;
+  rs6000-core.o)	COREFLAG="$COREFLAG -DAIX_CORE" ;;
+  trad-core.o)		COREFLAG=-DTRAD_CORE ;;
+  esac
+fi
+AC_SUBST(COREFILE)
+AC_SUBST(COREFLAG)
+
 # target stuff:
 
 # Canonicalize the secondary target names.
@@ -145,6 +215,8 @@ changequote([,])dnl
 # Target backend .o files.
 tb=
 
+elf="elf.o elflink.o"
+
 for vec in $SELECT_VECS
 do
     case "$vec" in
@@ -152,8 +224,10 @@ do
     # with the two vector lists in targets.c.
     a29kcoff_big_vec)		tb="$tb coff-a29k.o cofflink.o" ;;
     a_out_adobe_vec)		tb="$tb aout-adobe.o aout32.o stab-syms.o" ;;
-    armpe_vec)			tb="$tb pe-arm.o cofflink.o " ;;
-    armpei_vec)			tb="$tb pei-arm.o cofflink.o " ;;
+    armpe_little_vec)		tb="$tb pe-arm.o cofflink.o " ;;
+    armpe_big_vec)		tb="$tb pe-arm.o cofflink.o " ;;
+    armpei_little_vec)		tb="$tb pei-arm.o cofflink.o " ;;
+    armpei_big_vec)		tb="$tb pei-arm.o cofflink.o " ;;
     aout0_big_vec)		tb="$tb aout0.o aout32.o stab-syms.o" ;;
     aout_arm_big_vec)		tb="$tb aout-arm.o aout32.o stab-syms.o" ;;
     aout_arm_little_vec)	tb="$tb aout-arm.o aout32.o stab-syms.o" ;;
@@ -163,26 +237,26 @@ do
     b_out_vec_big_host)		tb="$tb bout.o aout32.o stab-syms.o" ;;
     b_out_vec_little_host)	tb="$tb bout.o aout32.o stab-syms.o" ;;
 # start-sanitize-arc
-    bfd_elf32_littlearc_vec)	tb="$tb elf32-arc.o elf32.o elf.o" ;;
-    bfd_elf32_bigarc_vec)	tb="$tb elf32-arc.o elf32.o elf.o" ;;
+    bfd_elf32_littlearc_vec)	tb="$tb elf32-arc.o elf32.o $elf" ;;
+    bfd_elf32_bigarc_vec)	tb="$tb elf32-arc.o elf32.o $elf" ;;
 # end-sanitize-arc
-    bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.o elf32.o elf.o" ;;
-    bfd_elf32_bigmips_vec) 	tb="$tb elf32-mips.o elf32.o elf.o ecofflink.o" ;;
-    bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.o elf32.o elf.o" ;;
-    bfd_elf32_i386_vec)		tb="$tb elf32-i386.o elf32.o elf.o" ;;
-    bfd_elf32_i860_vec)		tb="$tb elf32-i860.o elf32.o elf.o" ;;
-    bfd_elf32_little_generic_vec) tb="$tb elf32-gen.o elf32.o elf.o" ;;
-    bfd_elf32_littlemips_vec) 	tb="$tb elf32-mips.o elf32.o elf.o ecofflink.o" ;;
-    bfd_elf32_m68k_vec)		tb="$tb elf32-m68k.o elf32.o elf.o" ;;
-    bfd_elf32_m88k_vec)		tb="$tb elf32-m88k.o elf32.o elf.o" ;;
-    bfd_elf32_powerpc_vec)	tb="$tb elf32-ppc.o elf32.o elf.o" ;;
-    bfd_elf32_powerpcle_vec)	tb="$tb elf32-ppc.o elf32.o elf.o" ;;
-    bfd_elf32_sparc_vec)	tb="$tb elf32-sparc.o elf32.o elf.o" ;;
-    bfd_elf64_big_generic_vec) 	tb="$tb elf64-gen.o elf64.o elf.o"
+    bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.o elf32.o $elf" ;;
+    bfd_elf32_bigmips_vec) 	tb="$tb elf32-mips.o elf32.o $elf ecofflink.o" ;;
+    bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.o elf32.o $elf" ;;
+    bfd_elf32_i386_vec)		tb="$tb elf32-i386.o elf32.o $elf" ;;
+    bfd_elf32_i860_vec)		tb="$tb elf32-i860.o elf32.o $elf" ;;
+    bfd_elf32_little_generic_vec) tb="$tb elf32-gen.o elf32.o $elf" ;;
+    bfd_elf32_littlemips_vec) 	tb="$tb elf32-mips.o elf32.o $elf ecofflink.o" ;;
+    bfd_elf32_m68k_vec)		tb="$tb elf32-m68k.o elf32.o $elf" ;;
+    bfd_elf32_m88k_vec)		tb="$tb elf32-m88k.o elf32.o $elf" ;;
+    bfd_elf32_powerpc_vec)	tb="$tb elf32-ppc.o elf32.o $elf" ;;
+    bfd_elf32_powerpcle_vec)	tb="$tb elf32-ppc.o elf32.o $elf" ;;
+    bfd_elf32_sparc_vec)	tb="$tb elf32-sparc.o elf32.o $elf" ;;
+    bfd_elf64_big_generic_vec) 	tb="$tb elf64-gen.o elf64.o $elf"
 				target64=true ;;
-    bfd_elf64_little_generic_vec) tb="$tb elf64-gen.o elf64.o elf.o"
+    bfd_elf64_little_generic_vec) tb="$tb elf64-gen.o elf64.o $elf"
 				target64=true ;;
-    bfd_elf64_sparc_vec)	tb="$tb elf64-sparc.o elf64.o elf.o"
+    bfd_elf64_sparc_vec)	tb="$tb elf64-sparc.o elf64.o $elf"
 				target64=true ;;
     cisco_core_vec)		tb="$tb cisco-core.o" ;;
     demo_64_vec)		tb="$tb demo64.o aout64.o stab-syms.o"
diff --git a/bfd/m68klynx.c b/bfd/m68klynx.c
index 15309c2..33e1fcc 100644
--- a/bfd/m68klynx.c
+++ b/bfd/m68klynx.c
@@ -37,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define TARGET_IS_BIG_ENDIAN_P
 
-#ifdef HOST_LYNX
+#ifdef LYNX_CORE
 
 char *lynx_core_file_failing_command();
 int lynx_core_file_failing_signal();
@@ -49,6 +49,6 @@ const bfd_target *lynx_core_file_p();
 #define	MY_core_file_matches_executable_p lynx_core_file_matches_executable_p
 #define	MY_core_file_p lynx_core_file_p
 
-#endif /* HOST_LYNX */
+#endif /* LYNX_CORE */
 
 #include "aout-target.h"