mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-27 03:51:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to allow a toolchain configured with --enable-all to build on a 32-bit host.

Browse Source 
* 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.
This commit is contained in:
Nick Clifton 2014-06-25 16:35:58 +01:00
parent 28bf260962
commit 9d069ac37f
5 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ld/ChangeLog
View File

@ -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.

6
ld/Makefile.am
View File

@ -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 \

6
ld/Makefile.in
View File

@ -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 \

3
ld/configure vendored
View File

@ -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

3
ld/configure.in
View File

@ -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