emultempl/alphaelf.em (alpha_after_parse): Add extra, NULL, parameter to

  invocation of lang_section_start.
emultempl/aix.em (_handle_option): Likewise.

Makefile.am (eelf64alpha.c, eelf64alpha_fbsd.c,	eelf64alpha_nbsd.c): Add
  dependency upon emultempl/alphaelf.em.
Makefile.in: Regenerate.

5 files changed, 53 insertions, 361 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 31b457a..c88752f 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2004-10-27  Nick Clifton  <nickc@redhat.com>
+
+	* emultempl/alphaelf.em (alpha_after_parse): Add extra, NULL,
+	parameter to invocation of lang_section_start.
+	* emultempl/aix.em (_handle_option): Likewise.
+	
+	* Makefile.am (eelf64alpha.c, eelf64alpha_fbsd.c,
+	eelf64alpha_nbsd.c): Add dependency upon emultempl/alphaelf.em.
+	* Makefile.in: Regenerate.
+
 2004-10-26  Mark Mitchell  <mark@codesourcery.com>
 
 	* emulparams/armelf.sh (OTHER_READONLY_SECTIONS): Do not emit
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 5add7ff..b7a167f 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -764,15 +764,18 @@ eelf32iq10.c: $(srcdir)/emulparams/elf32iq10.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/iq2000.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32iq10 "$(tdir_iq10)"
 eelf64alpha.c: $(srcdir)/emulparams/elf64alpha.sh \
-  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/alphaelf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64alpha "$(tdir_elf64alpha)"
 eelf64alpha_fbsd.c: $(srcdir)/emulparams/elf64alpha_fbsd.sh \
   $(srcdir)/emulparams/elf64alpha.sh \
-  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/alphaelf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64alpha_fbsd "$(tdir_elf64alpha_fbsd)"
 eelf64alpha_nbsd.c: $(srcdir)/emulparams/elf64alpha_nbsd.sh \
   $(srcdir)/emulparams/elf64alpha.sh \
-  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/alphaelf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64alpha_nbsd "$(tdir_elf64alpha_nbsd)"
 eelf64hppa.c: $(srcdir)/emulparams/elf64hppa.sh \
   $(srcdir)/emulparams/hppa64linux.sh \
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 9997034..d332c4d 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -167,8 +167,7 @@ MANCONF = -Dman
 
 TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl
 
-POD2MAN = pod2man --center="GNU Development Tools" \
-	--release="binutils-$(VERSION)" --section=1
+POD2MAN = pod2man --center="GNU Development Tools" 	--release="binutils-$(VERSION)" --section=1
 
 
 #stuff for self hosting (can be overridden in config file).
@@ -177,49 +176,19 @@ HOSTING_LIBS = @HOSTING_LIBS@
 HOSTING_EMU = -m $(EMUL)
 
 # Setup the testing framework, if you have one
-EXPECT = `if [ -f $$r/../expect/expect ] ; \
-	then echo $$r/../expect/expect ; \
-	else echo expect ; fi`
+EXPECT = `if [ -f $$r/../expect/expect ] ; 	then echo $$r/../expect/expect ; 	else echo expect ; fi`
 
 
-RUNTEST = `if [ -f $${srcroot}/../dejagnu/runtest ] ; \
-	then echo $${srcroot}/../dejagnu/runtest ; \
-	else echo runtest ; fi`
+RUNTEST = `if [ -f $${srcroot}/../dejagnu/runtest ] ; 	then echo $${srcroot}/../dejagnu/runtest ; 	else echo runtest ; fi`
 
 
 RUNTESTFLAGS = 
 
-CC_FOR_TARGET = ` \
-  if [ -f $$r/../gcc/xgcc ] ; then \
-    if [ -f $$r/../newlib/Makefile ] ; then \
-      echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; \
-    else \
-      echo $$r/../gcc/xgcc -B$$r/../gcc/; \
-    fi; \
-  else \
-    if [ "@host@" = "@target@" ] ; then \
-      echo $(CC); \
-    else \
-      echo gcc | sed '$(transform)'; \
-    fi; \
-  fi`
+CC_FOR_TARGET = `   if [ -f $$r/../gcc/xgcc ] ; then     if [ -f $$r/../newlib/Makefile ] ; then       echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc;     else       echo $$r/../gcc/xgcc -B$$r/../gcc/;     fi;   else     if [ "@host@" = "@target@" ] ; then       echo $(CC);     else       echo gcc | sed '$(transform)';     fi;   fi`
 
 
 CXX = gcc
-CXX_FOR_TARGET = ` \
-  if [ -f $$r/../gcc/xgcc ] ; then \
-    if [ -f $$r/../newlib/Makefile ] ; then \
-      echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; \
-    else \
-      echo $$r/../gcc/xgcc -B$$r/../gcc/; \
-    fi; \
-  else \
-    if [ "@host@" = "@target@" ] ; then \
-      echo $(CXX); \
-    else \
-      echo gcc | sed '$(transform)'; \
-    fi; \
-  fi`
+CXX_FOR_TARGET = `   if [ -f $$r/../gcc/xgcc ] ; then     if [ -f $$r/../newlib/Makefile ] ; then       echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc;     else       echo $$r/../gcc/xgcc -B$$r/../gcc/;     fi;   else     if [ "@host@" = "@target@" ] ; then       echo $(CXX);     else       echo gcc | sed '$(transform)';     fi;   fi`
 
 
 noinst_PROGRAMS = ld-new
@@ -232,317 +201,25 @@ 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 \
-	earcelf.o \
-	earm_epoc_pe.o \
-	earmaoutb.o \
-	earmaoutl.o \
-	earmcoff.o \
-	earmelf.o \
-	earmelfb.o \
-	earmelf_fbsd.o \
-	earmelf_linux.o \
-	earmelfb_linux.o \
-	earmelf_nbsd.o \
-	earmelfb_nbsd.o \
-	earmelf_oabi.o \
-	earmnto.o \
-	earmnbsd.o \
-	earmpe.o \
-	earmsymbian.o \
-	eavr2.o \
-	eavr1.o \
-	eavr3.o \
-	eavr4.o \
-	eavr5.o \
-	ecoff_i860.o \
-	ecoff_sparc.o \
-	ecrisaout.o \
-	ecriself.o \
-	ecrislinux.o \
-	ed10velf.o \
-	ed30v_e.o \
-	ed30v_o.o \
-	ed30velf.o \
-	edelta68.o \
-	eelf32_dlx.o \
-	eebmon29k.o \
-	eelf32_i960.o \
-	eelf32_i860.o \
-	eelf32_sparc.o \
-	eelf32b4300.o \
-	eelf32cr16c.o \
-	eelf32bmip.o \
-	eelf32bmipn32.o \
-	eelf32btsmip.o \
-	eelf32crx.o \
-	eelf32btsmipn32.o \
-	eelf32ltsmip.o \
-	eelf32ltsmipn32.o \
-	eelf32ebmip.o \
-	eelf32elmip.o \
-	eelf32fr30.o \
-	eelf32frv.o \
-	eelf32i370.o \
-	eelf32ip2k.o \
-	eelf32iq2000.o \
-	eelf32iq10.o \
-	eelf32l4300.o \
-	eelf32lmip.o \
-	eelf32lppc.o \
-	eelf32lppcnto.o \
-	eelf32lppcsim.o \
-	eelf32mcore.o \
-	eelf32mipswindiss.o \
-	eelf32openrisc.o \
-	eelf32ppc.o \
-	eelf32ppc_fbsd.o \
-	eelf32ppclinux.o \
-	eelf32ppcnto.o \
-	eelf32ppcsim.o \
-	eelf32ppcwindiss.o \
-	eelf32vax.o \
-	eelf32xstormy16.o \
-	eelf32xtensa.o \
-	eelf_i386.o \
-	eelf_i386_be.o \
-	eelf_i386_chaos.o \
-	eelf_i386_fbsd.o \
-	eelf_i386_ldso.o \
-	eelf_s390.o \
-	egld960.o \
-	egld960coff.o \
-	eh8300.o \
-	eh8300h.o \
-	eh8300s.o \
-	eh8300elf.o \
-	eh8300hn.o \
-	eh8300sn.o \
-	eh8300sx.o \
-	eh8300helf.o \
-	eh8300self.o \
-	eh8300hnelf.o \
-	eh8300snelf.o \
-	eh8300sxelf.o \
-	eh8300sxn.o \
-	eh8300sxnelf.o \
-	eh8500.o \
-	eh8500b.o \
-	eh8500c.o \
-	eh8500m.o \
-	eh8500s.o \
-	ehp300bsd.o \
-	ehp3hpux.o \
-	ehppaelf.o \
-	ehppalinux.o \
-	ehppanbsd.o \
-	ehppaobsd.o \
-	ei386aout.o \
-	ei386beos.o \
-	ei386bsd.o \
-	ei386coff.o \
-	ei386go32.o \
-	ei386linux.o \
-	ei386lynx.o \
-	ei386mach.o \
-	ei386moss.o \
-	ei386msdos.o \
-	ei386nbsd.o \
-	ei386nto.o \
-	ei386nw.o \
-	ei386pe.o \
-	ei386pe_posix.o \
-	elnk960.o \
-	em32relf.o \
-	em32rlelf.o \
-	em32relf_linux.o \
-	em32rlelf_linux.o \
-	em68hc11elf.o \
-	em68hc11elfb.o \
-	em68hc12elf.o \
-	em68hc12elfb.o \
-	em68k4knbsd.o \
-	em68kaout.o \
-	em68kaux.o \
-	em68kcoff.o \
-	em68kelf.o \
-	em68kelfnbsd.o \
-	em68klinux.o \
-	em68klynx.o \
-	em68knbsd.o \
-	em68kpsos.o \
-	em88kbcs.o \
-	emcorepe.o \
-	emipsbig.o \
-	emipsbsd.o \
-	emipsidt.o \
-	emipsidtl.o \
-	emipslit.o \
-	emipslnews.o \
-	emipspe.o \
-	emsp430x110.o \
-	emsp430x112.o \
-	emsp430x1101.o \
-	emsp430x1111.o \
-	emsp430x1121.o \
-	emsp430x1122.o \
-	emsp430x1132.o \
-	emsp430x122.o \
-	emsp430x123.o \
-	emsp430x1222.o \
-	emsp430x1232.o \
-	emsp430x133.o \
-	emsp430x135.o \
-	emsp430x1331.o \
-	emsp430x1351.o \
-	emsp430x147.o \
-	emsp430x148.o \
-	emsp430x149.o \
-	emsp430x155.o \
-	emsp430x156.o \
-	emsp430x157.o \
-	emsp430x167.o \
-	emsp430x168.o \
-	emsp430x169.o \
-	emsp430x1610.o \
-	emsp430x1611.o \
-	emsp430x1612.o \
-	emsp430x311.o \
-	emsp430x312.o \
-	emsp430x313.o \
-	emsp430x314.o \
-	emsp430x315.o \
-	emsp430x323.o \
-	emsp430x325.o \
-	emsp430x336.o \
-	emsp430x337.o \
-	emsp430x412.o \
-	emsp430x413.o \
-	emsp430x415.o \
-	emsp430x417.o \
-	emsp430xE423.o \
-	emsp430xE425.o \
-	emsp430xE427.o \
-	emsp430xW423.o \
-	emsp430xW425.o \
-	emsp430xW427.o \
-	emsp430xG437.o \
-	emsp430xG438.o \
-	emsp430xG439.o \
-	emsp430x435.o \
-	emsp430x436.o \
-	emsp430x437.o \
-	emsp430x447.o \
-	emsp430x448.o \
-	emsp430x449.o \
-	enews.o \
-	ens32knbsd.o \
-	eor32.o \
-	eor32elf.o \
-	epc532macha.o \
-	epdp11.o \
-	epjelf.o \
-	epjlelf.o \
-	eppcmacos.o \
-	eppcnw.o \
-	eppcpe.o \
-	eppclynx.o \
-	eriscix.o \
-	esa29200.o \
-	esh.o \
-	eshelf32.o \
-	eshlelf32.o \
-	eshelf32_linux.o \
-	eshlelf32_linux.o \
-	eshelf32_nbsd.o \
-	eshlelf32_nbsd.o \
-	eshelf.o \
-	eshelf_linux.o \
-	eshlelf_linux.o \
-	eshelf_nbsd.o \
-	eshlelf_nbsd.o \
-	eshelf_nto.o \
-	eshlelf_nto.o \
-	eshl.o \
-	eshlelf.o \
-	eshlsymbian.o \
-	eshpe.o \
-	esparcaout.o \
-	esparclinux.o \
-	esparclynx.o \
-	esparcnbsd.o \
-	est2000.o \
-	esun3.o \
-	esun4.o \
-	etic30aout.o \
-	etic30coff.o \
-	etic3xcoff.o \
-	etic3xcoff_onchip.o \
-	etic4xcoff.o \
-	etic54xcoff.o \
-	etic80coff.o \
-	evanilla.o \
-	evax.o \
-	evaxnbsd.o \
-	evsta.o \
-	ew65.o \
-	ez8001.o \
-	  eelf32frvfd.o \
-	ez8002.o
-
-
-ALL_64_EMULATIONS = \
-	eelf64_aix.o \
-	eelf64_ia64.o \
-	eelf64_ia64_fbsd.o \
-	eshelf64.o \
-	eshlelf64.o \
-	eshelf64_nbsd.o \
-	eshlelf64_nbsd.o \
-	eelf_x86_64.o \
-	eelf_x86_64_fbsd.o \
-	eelf64_s390.o \
-	eelf64_sparc.o \
-	eelf64_sparc_fbsd.o \
-	eelf64alpha.o \
-	eelf64alpha_fbsd.o \
-	eelf64alpha_nbsd.o \
-	eelf64bmip.o \
-	eelf64btsmip.o \
-	eelf64ltsmip.o \
-	eelf64hppa.o \
-	eelf64mmix.o \
-	emmo.o \
-	eelf64ppc.o \
-	eelf64lppc.o \
-	ehppa64linux.o
-
-
-ALL_EMUL_EXTRA_OFILES = \
-	deffilep.o \
-	pe-dll.o
-
-
-CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \
-	ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c \
-	mri.c ldcref.c pe-dll.c
-
-
-HFILES = ld.h ldctor.h ldemul.h ldexp.h ldfile.h \
-	ldlang.h ldlex.h ldmain.h ldmisc.h ldver.h \
-	ldwrite.h mri.h deffile.h pe-dll.h
+ALL_EMULATIONS =  	ea29k.o 	eaixppc.o 	eaixrs6.o 	ealpha.o 	earcelf.o 	earm_epoc_pe.o 	earmaoutb.o 	earmaoutl.o 	earmcoff.o 	earmelf.o 	earmelfb.o 	earmelf_fbsd.o 	earmelf_linux.o 	earmelfb_linux.o 	earmelf_nbsd.o 	earmelfb_nbsd.o 	earmelf_oabi.o 	earmnto.o 	earmnbsd.o 	earmpe.o 	earmsymbian.o 	eavr2.o 	eavr1.o 	eavr3.o 	eavr4.o 	eavr5.o 	ecoff_i860.o 	ecoff_sparc.o 	ecrisaout.o 	ecriself.o 	ecrislinux.o 	ed10velf.o 	ed30v_e.o 	ed30v_o.o 	ed30velf.o 	edelta68.o 	eelf32_dlx.o 	eebmon29k.o 	eelf32_i960.o 	eelf32_i860.o 	eelf32_sparc.o 	eelf32b4300.o 	eelf32cr16c.o 	eelf32bmip.o 	eelf32bmipn32.o 	eelf32btsmip.o 	eelf32crx.o 	eelf32btsmipn32.o 	eelf32ltsmip.o 	eelf32ltsmipn32.o 	eelf32ebmip.o 	eelf32elmip.o 	eelf32fr30.o 	eelf32frv.o 	eelf32i370.o 	eelf32ip2k.o 	eelf32iq2000.o 	eelf32iq10.o 	eelf32l4300.o 	eelf32lmip.o 	eelf32lppc.o 	eelf32lppcnto.o 	eelf32lppcsim.o 	eelf32mcore.o 	eelf32mipswindiss.o 	eelf32openrisc.o 	eelf32ppc.o 	eelf32ppc_fbsd.o 	eelf32ppclinux.o 	eelf32ppcnto.o 	eelf32ppcsim.o 	eelf32ppcwindiss.o 	eelf32vax.o 	eelf32xstormy16.o 	eelf32xtensa.o 	eelf_i386.o 	eelf_i386_be.o 	eelf_i386_chaos.o 	eelf_i386_fbsd.o 	eelf_i386_ldso.o 	eelf_s390.o 	egld960.o 	egld960coff.o 	eh8300.o 	eh8300h.o 	eh8300s.o 	eh8300elf.o 	eh8300hn.o 	eh8300sn.o 	eh8300sx.o 	eh8300helf.o 	eh8300self.o 	eh8300hnelf.o 	eh8300snelf.o 	eh8300sxelf.o 	eh8300sxn.o 	eh8300sxnelf.o 	eh8500.o 	eh8500b.o 	eh8500c.o 	eh8500m.o 	eh8500s.o 	ehp300bsd.o 	ehp3hpux.o 	ehppaelf.o 	ehppalinux.o 	ehppanbsd.o 	ehppaobsd.o 	ei386aout.o 	ei386beos.o 	ei386bsd.o 	ei386coff.o 	ei386go32.o 	ei386linux.o 	ei386lynx.o 	ei386mach.o 	ei386moss.o 	ei386msdos.o 	ei386nbsd.o 	ei386nto.o 	ei386nw.o 	ei386pe.o 	ei386pe_posix.o 	elnk960.o 	em32relf.o 	em32rlelf.o 	em32relf_linux.o 	em32rlelf_linux.o 	em68hc11elf.o 	em68hc11elfb.o 	em68hc12elf.o 	em68hc12elfb.o 	em68k4knbsd.o 	em68kaout.o 	em68kaux.o 	em68kcoff.o 	em68kelf.o 	em68kelfnbsd.o 	em68klinux.o 	em68klynx.o 	em68knbsd.o 	em68kpsos.o 	em88kbcs.o 	emcorepe.o 	emipsbig.o 	emipsbsd.o 	emipsidt.o 	emipsidtl.o 	emipslit.o 	emipslnews.o 	emipspe.o 	emsp430x110.o 	emsp430x112.o 	emsp430x1101.o 	emsp430x1111.o 	emsp430x1121.o 	emsp430x1122.o 	emsp430x1132.o 	emsp430x122.o 	emsp430x123.o 	emsp430x1222.o 	emsp430x1232.o 	emsp430x133.o 	emsp430x135.o 	emsp430x1331.o 	emsp430x1351.o 	emsp430x147.o 	emsp430x148.o 	emsp430x149.o 	emsp430x155.o 	emsp430x156.o 	emsp430x157.o 	emsp430x167.o 	emsp430x168.o 	emsp430x169.o 	emsp430x1610.o 	emsp430x1611.o 	emsp430x1612.o 	emsp430x311.o 	emsp430x312.o 	emsp430x313.o 	emsp430x314.o 	emsp430x315.o 	emsp430x323.o 	emsp430x325.o 	emsp430x336.o 	emsp430x337.o 	emsp430x412.o 	emsp430x413.o 	emsp430x415.o 	emsp430x417.o 	emsp430xE423.o 	emsp430xE425.o 	emsp430xE427.o 	emsp430xW423.o 	emsp430xW425.o 	emsp430xW427.o 	emsp430xG437.o 	emsp430xG438.o 	emsp430xG439.o 	emsp430x435.o 	emsp430x436.o 	emsp430x437.o 	emsp430x447.o 	emsp430x448.o 	emsp430x449.o 	enews.o 	ens32knbsd.o 	eor32.o 	eor32elf.o 	epc532macha.o 	epdp11.o 	epjelf.o 	epjlelf.o 	eppcmacos.o 	eppcnw.o 	eppcpe.o 	eppclynx.o 	eriscix.o 	esa29200.o 	esh.o 	eshelf32.o 	eshlelf32.o 	eshelf32_linux.o 	eshlelf32_linux.o 	eshelf32_nbsd.o 	eshlelf32_nbsd.o 	eshelf.o 	eshelf_linux.o 	eshlelf_linux.o 	eshelf_nbsd.o 	eshlelf_nbsd.o 	eshelf_nto.o 	eshlelf_nto.o 	eshl.o 	eshlelf.o 	eshlsymbian.o 	eshpe.o 	esparcaout.o 	esparclinux.o 	esparclynx.o 	esparcnbsd.o 	est2000.o 	esun3.o 	esun4.o 	etic30aout.o 	etic30coff.o 	etic3xcoff.o 	etic3xcoff_onchip.o 	etic4xcoff.o 	etic54xcoff.o 	etic80coff.o 	evanilla.o 	evax.o 	evaxnbsd.o 	evsta.o 	ew65.o 	ez8001.o 	  eelf32frvfd.o 	ez8002.o
+
+
+ALL_64_EMULATIONS =  	eelf64_aix.o 	eelf64_ia64.o 	eelf64_ia64_fbsd.o 	eshelf64.o 	eshlelf64.o 	eshelf64_nbsd.o 	eshlelf64_nbsd.o 	eelf_x86_64.o 	eelf_x86_64_fbsd.o 	eelf64_s390.o 	eelf64_sparc.o 	eelf64_sparc_fbsd.o 	eelf64alpha.o 	eelf64alpha_fbsd.o 	eelf64alpha_nbsd.o 	eelf64bmip.o 	eelf64btsmip.o 	eelf64ltsmip.o 	eelf64hppa.o 	eelf64mmix.o 	emmo.o 	eelf64ppc.o 	eelf64lppc.o 	ehppa64linux.o
+
+
+ALL_EMUL_EXTRA_OFILES =  	deffilep.o 	pe-dll.o
+
+
+CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c 	ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c 	mri.c ldcref.c pe-dll.c
+
+
+HFILES = ld.h ldctor.h ldemul.h ldexp.h ldfile.h 	ldlang.h ldlex.h ldmain.h ldmisc.h ldver.h 	ldwrite.h mri.h deffile.h pe-dll.h
 
 
 GENERATED_CFILES = ldgram.c ldlex.c deffilep.c
 GENERATED_HFILES = ldgram.h ldemul-list.h deffilep.h
 
-OFILES = ldgram.o ldlex.o lexsup.o ldlang.o mri.o ldctor.o ldmain.o \
-	ldwrite.o ldexp.o  ldemul.o ldver.o ldmisc.o \
-	ldfile.o ldcref.o ${EMULATION_OFILES} ${EMUL_EXTRA_OFILES}
+OFILES = ldgram.o ldlex.o lexsup.o ldlang.o mri.o ldctor.o ldmain.o 	ldwrite.o ldexp.o  ldemul.o ldver.o ldmisc.o 	ldfile.o ldcref.o ${EMULATION_OFILES} ${EMUL_EXTRA_OFILES}
 
 
 STAGESTUFF = *.o ldscripts/* e*.c
@@ -561,8 +238,7 @@ GEN_DEPENDS = $(srcdir)/genscripts.sh stringify.sed
 # We need this for automake to use YLWRAP.
 EXTRA_ld_new_SOURCES = deffilep.y
 
-ld_new_SOURCES = ldgram.y ldlex.l lexsup.c ldlang.c mri.c ldctor.c ldmain.c \
-	ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c
+ld_new_SOURCES = ldgram.y ldlex.l lexsup.c ldlang.c mri.c ldctor.c ldmain.c 	ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c
 
 ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(INTLDEPS)
 ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(INTLLIBS)
@@ -575,8 +251,7 @@ MAINTAINERCLEANFILES = ldver.texi
 # We want to reconfigure if configure.host or configure.tgt changes.
 CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host $(srcdir)/configure.tgt
 
-MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \
-	ldemul-list.h crtbegin.o crtend.o ld.log ld.sum
+MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) 	ldemul-list.h crtbegin.o crtend.o ld.log ld.sum
 
 CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
 
@@ -626,7 +301,7 @@ deffilep.c ldgram.c ldlex.c
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(ld_new_SOURCES) $(EXTRA_ld_new_SOURCES)
 OBJECTS = $(ld_new_OBJECTS)
@@ -1108,7 +783,7 @@ distclean-generic:
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
-	-test -z "ldlex.cdeffilep.hdeffilep.cldgram.hldgram.c$(MAINTAINERCLEANFILES)" || rm -f ldlex.c deffilep.h deffilep.c ldgram.h ldgram.c $(MAINTAINERCLEANFILES)
+	-test -z "ldlexldeffilephdeffilepcldgramhldgramc$(MAINTAINERCLEANFILES)" || rm -f ldlexl deffileph deffilepc ldgramh ldgramc $(MAINTAINERCLEANFILES)
 mostlyclean-am:  mostlyclean-hdr mostlyclean-noinstPROGRAMS \
 		mostlyclean-compile mostlyclean-libtool \
 		mostlyclean-aminfo mostlyclean-tags mostlyclean-generic \
@@ -1276,7 +951,7 @@ earmpe.c: $(srcdir)/emulparams/armpe.sh \
 	${GENSCRIPTS} armpe "$(tdir_armpe)"
 earmsymbian.c: $(srcdir)/emulparams/armsymbian.sh \
   $(srcdir)/emulparams/armelf.sh $(srcdir)/emultempl/elf32.em \
-  $(srcdir)/emultempl/armelf.em $(srcdir)/scripttempl/armbpabi.sc \
+  $(srcdir)/emultempl/armelf.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
 	${GENSCRIPTS} armsymbian "$(tdir_armelf)"
 eavr2.c: $(srcdir)/emulparams/avr2.sh \
@@ -1501,15 +1176,18 @@ eelf32iq10.c: $(srcdir)/emulparams/elf32iq10.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/iq2000.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32iq10 "$(tdir_iq10)"
 eelf64alpha.c: $(srcdir)/emulparams/elf64alpha.sh \
-  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/alphaelf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64alpha "$(tdir_elf64alpha)"
 eelf64alpha_fbsd.c: $(srcdir)/emulparams/elf64alpha_fbsd.sh \
   $(srcdir)/emulparams/elf64alpha.sh \
-  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/alphaelf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64alpha_fbsd "$(tdir_elf64alpha_fbsd)"
 eelf64alpha_nbsd.c: $(srcdir)/emulparams/elf64alpha_nbsd.sh \
   $(srcdir)/emulparams/elf64alpha.sh \
-  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+  $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/alphaelf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64alpha_nbsd "$(tdir_elf64alpha_nbsd)"
 eelf64hppa.c: $(srcdir)/emulparams/elf64hppa.sh \
   $(srcdir)/emulparams/hppa64linux.sh \
diff --git a/ld/emultempl/aix.em b/ld/emultempl/aix.em
index 513cd50..72c865d 100644
--- a/ld/emultempl/aix.em
+++ b/ld/emultempl/aix.em
@@ -303,7 +303,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
       if (*end != '\0')
 	einfo ("%P: warning: ignoring invalid -D number %s\n", optarg);
       else if (val != -1)
-	lang_section_start (".data", exp_intop (val));
+	lang_section_start (".data", exp_intop (val), NULL);
       break;
 
     case 'H':
@@ -328,7 +328,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
       val = bfd_scan_vma (optarg, &end, 0);
       if (*end != '\0')
 	return FALSE;
-      lang_section_start (".text", exp_intop (val));
+      lang_section_start (".text", exp_intop (val), NULL);
       break;
 
     case OPTION_IGNORE:
@@ -463,7 +463,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
 	  t = exp_binop ('&',
 			 exp_binop ('+', t, exp_intop (31)),
 			 exp_intop (~(bfd_vma) 31));
-	  lang_section_start (".data", t);
+	  lang_section_start (".data", t, NULL);
 	}
       break;
 
@@ -484,7 +484,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
 	  t = exp_binop ('&',
 			 exp_binop ('+', t, exp_intop (31)),
 			 exp_intop (~(bfd_vma) 31));
-	  lang_section_start (".text", t);
+	  lang_section_start (".text", t, NULL);
 	}
       break;
 
diff --git a/ld/emultempl/alphaelf.em b/ld/emultempl/alphaelf.em
index 7e64323..28e8552 100644
--- a/ld/emultempl/alphaelf.em
+++ b/ld/emultempl/alphaelf.em
@@ -39,7 +39,8 @@ alpha_after_parse (void)
     lang_section_start (".interp",
 			exp_binop ('+',
 				   exp_intop (ALPHA_TEXT_START_32BIT),
-				   exp_nameop (SIZEOF_HEADERS, NULL)));
+				   exp_nameop (SIZEOF_HEADERS, NULL)),
+			NULL);
 }
 
 static void