diff options
| author | Nick Clifton <nickc@redhat.com> | 2014-06-25 16:35:58 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2014-06-25 16:35:58 +0100 |
| commit | 9d069ac37fb121b2794681480f8691d5699de9f7 (patch) | |
| tree | c79286d00b2da6d403e8456e37c487d006328760 | |
| parent | 28bf260962673c554b926a013af27c77fe82870c (diff) | |
| download | binutils-9d069ac37fb121b2794681480f8691d5699de9f7.zip binutils-9d069ac37fb121b2794681480f8691d5699de9f7.tar.gz binutils-9d069ac37fb121b2794681480f8691d5699de9f7.tar.bz2 | |
Fixes to allow a toolchain configured with --enable-all to build on a 32-bit host.
* Makefile.am (ALL_EMULATION_SOURCES): Move ei386pep.c from
here...
(ALL_64_EMULATION_SOURCES): ... to here.
(ALL_EMUL_EXTRA_OFILES): Move pep-dll.o from here...
(ALL_64_EMUL_EXTRA_OFILES): New. ... to here.
* configure.in (EMUL_EXTRA_OFILES): Include
ALL_64_EMUL_EXTRA_OFILES when making a 64-bit enabled build.
* Makefile.in: Regenerate.
* configure: Regenerate.
| -rw-r--r-- | ld/ChangeLog | 12 | ||||
| -rw-r--r-- | ld/Makefile.am | 6 | ||||
| -rw-r--r-- | ld/Makefile.in | 6 | ||||
| -rwxr-xr-x | ld/configure | 3 | ||||
| -rw-r--r-- | ld/configure.in | 3 |
5 files changed, 24 insertions, 6 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index c3c2906..5a1fe27 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,15 @@ +2014-06-25 Nick Clifton <nickc@redhat.com> + + * Makefile.am (ALL_EMULATION_SOURCES): Move ei386pep.c from + here... + (ALL_64_EMULATION_SOURCES): ... to here. + (ALL_EMUL_EXTRA_OFILES): Move pep-dll.o from here... + (ALL_64_EMUL_EXTRA_OFILES): New. ... to here. + * configure.in (EMUL_EXTRA_OFILES): Include + ALL_64_EMUL_EXTRA_OFILES when making a 64-bit enabled build. + * Makefile.in: Regenerate. + * configure: Regenerate. + 2014-06-18 Andreas Tobler <andreast@fgznet.ch> * configure.tgt (arm*-*-freebsd*): Update targ_extra_emuls. diff --git a/ld/Makefile.am b/ld/Makefile.am index c537fa7..24560a0 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -318,7 +318,6 @@ ALL_EMULATION_SOURCES = \ ei386nw.c \ ei386pe.c \ ei386pe_posix.c \ - ei386pep.c \ elnk960.c \ em32relf.c \ em32relf_linux.c \ @@ -480,6 +479,7 @@ ALL_64_EMULATION_SOURCES = \ eelf_x86_64_nacl.c \ eelf_x86_64_sol2.c \ ehppa64linux.c \ + ei386pep.c \ emmo.c \ eshelf64.c \ eshelf64_nbsd.c \ @@ -490,7 +490,9 @@ ALL_64_EMULATIONS = $(ALL_64_EMULATION_SOURCES:.c=.@OBJEXT@) ALL_EMUL_EXTRA_OFILES = \ deffilep.@OBJEXT@ \ - pe-dll.@OBJEXT@ \ + pe-dll.@OBJEXT@ + +ALL_64_EMUL_EXTRA_OFILES = \ pep-dll.@OBJEXT@ CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \ diff --git a/ld/Makefile.in b/ld/Makefile.in index 370a5a5..377fbd8 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -625,7 +625,6 @@ ALL_EMULATION_SOURCES = \ ei386nw.c \ ei386pe.c \ ei386pe_posix.c \ - ei386pep.c \ elnk960.c \ em32relf.c \ em32relf_linux.c \ @@ -786,6 +785,7 @@ ALL_64_EMULATION_SOURCES = \ eelf_x86_64_nacl.c \ eelf_x86_64_sol2.c \ ehppa64linux.c \ + ei386pep.c \ emmo.c \ eshelf64.c \ eshelf64_nbsd.c \ @@ -795,7 +795,9 @@ ALL_64_EMULATION_SOURCES = \ ALL_64_EMULATIONS = $(ALL_64_EMULATION_SOURCES:.c=.@OBJEXT@) ALL_EMUL_EXTRA_OFILES = \ deffilep.@OBJEXT@ \ - pe-dll.@OBJEXT@ \ + pe-dll.@OBJEXT@ + +ALL_64_EMUL_EXTRA_OFILES = \ pep-dll.@OBJEXT@ CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \ diff --git a/ld/configure b/ld/configure index 6dd7bc6..4942c2d 100755 --- a/ld/configure +++ b/ld/configure @@ -16959,10 +16959,11 @@ TDIRS=tdirs if test x${all_targets} = xtrue; then if test x${want64} = xtrue; then EMULATION_OFILES='$(ALL_EMULATIONS) $(ALL_64_EMULATIONS)' + EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES) $(ALL_64_EMUL_EXTRA_OFILES)' else EMULATION_OFILES='$(ALL_EMULATIONS)' + EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES)' fi - EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES)' else EMULATION_OFILES=$all_emuls EMUL_EXTRA_OFILES=$all_emul_extras diff --git a/ld/configure.in b/ld/configure.in index d8607e2..1ac69a3 100644 --- a/ld/configure.in +++ b/ld/configure.in @@ -365,10 +365,11 @@ AC_SUBST_FILE(TDIRS) if test x${all_targets} = xtrue; then if test x${want64} = xtrue; then EMULATION_OFILES='$(ALL_EMULATIONS) $(ALL_64_EMULATIONS)' + EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES) $(ALL_64_EMUL_EXTRA_OFILES)' else EMULATION_OFILES='$(ALL_EMULATIONS)' + EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES)' fi - EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES)' else EMULATION_OFILES=$all_emuls EMUL_EXTRA_OFILES=$all_emul_extras |