From: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
Date: Sat, 3 Jan 2009 22:00:08 +0000 (+0100)
Subject: Add i386 support for the amd64 ld.
X-Git-Url: https://gitweb.dragonflybsd.org/~corecode/dragonfly.git/commitdiff_plain/f7f85ed14538c3022860e972d19b261bf1292cdb

Add i386 support for the amd64 ld.
---

diff --git a/gnu/usr.bin/binutils217/ld/Makefile b/gnu/usr.bin/binutils217/ld/Makefile
index 05e4e639be..301292f874 100644
--- a/gnu/usr.bin/binutils217/ld/Makefile
+++ b/gnu/usr.bin/binutils217/ld/Makefile
@@ -1,5 +1,7 @@
 # $DragonFly: src/gnu/usr.bin/binutils217/ld/Makefile,v 1.1 2007/04/13 12:24:32 corecode Exp $
 
+ELF_SCR_EXT=	x xbn xn xr xs xu xc xsc
+
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/ld
diff --git a/gnu/usr.bin/binutils217/ld/Makefile.amd64 b/gnu/usr.bin/binutils217/ld/Makefile.amd64
index 46a643ec36..98f8b170a0 100644
--- a/gnu/usr.bin/binutils217/ld/Makefile.amd64
+++ b/gnu/usr.bin/binutils217/ld/Makefile.amd64
@@ -8,10 +8,9 @@ CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
 _amd64_path=	${USRDATA_PREFIX}/usr/lib
 EMS+=		${NATIVE_EMULATION}
-LDSCRIPTS+=	${NATIVE_EMULATION}.x ${NATIVE_EMULATION}.xbn \
-		${NATIVE_EMULATION}.xn ${NATIVE_EMULATION}.xr \
-		${NATIVE_EMULATION}.xs ${NATIVE_EMULATION}.xu \
-		${NATIVE_EMULATION}.xc ${NATIVE_EMULATION}.xsc
+.for ext in ${ELF_SCR_EXT}
+LDSCRIPTS+=	${NATIVE_EMULATION}.${ext}
+.endfor
 SRCS+=	e${NATIVE_EMULATION}.c
 CLEANFILES+=	e${NATIVE_EMULATION}.c
 
@@ -30,3 +29,20 @@ e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \
 		no \
 		${NATIVE_EMULATION:Q} \
 		${TARGET_TUPLE:Q}
+
+X86_EMULATION=	elf_i386
+# XXX adjust path
+_i386_path=	${USRDATA_PREFIX}/usr/lib/i386
+EMS+=		${X86_EMULATION}
+.for ext in ${ELF_SCR_EXT}
+LDSCRIPTS+=	${X86_EMULATION}.${ext}
+.endfor
+
+SRCS+=		e${X86_EMULATION}.c
+CLEANFILES+=	e${X86_EMULATION}.c
+e${X86_EMULATION}.c: emulparams/${X86_EMULATION}.sh emultempl/elf32.em \
+    scripttempl/elf.sc genscripts.sh stringify.sed
+	sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR:Q}/ld ${_i386_path:Q} \
+	    "" "" \
+	    ${HOST} ${TARGET_TUPLE:Q} ${TARGET_TUPLE:Q} \
+	    ${X86_EMULATION:Q} "" no ${X86_EMULATION:Q} ${TARGET_TUPLE:Q}
diff --git a/gnu/usr.bin/binutils217/ld/Makefile.i386 b/gnu/usr.bin/binutils217/ld/Makefile.i386
index 0ea57956ae..a1a63273b0 100644
--- a/gnu/usr.bin/binutils217/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils217/ld/Makefile.i386
@@ -12,8 +12,9 @@ _i386_path=	${USRDATA_PREFIX}/usr/lib
 _i386_path=	/usr/cross/i386-dragonfly/usr/lib
 .endif
 EMS+=		${NATIVE_EMULATION}
-LDSCRIPTS+=	${NATIVE_EMULATION}.x ${NATIVE_EMULATION}.xbn ${NATIVE_EMULATION}.xn ${NATIVE_EMULATION}.xr \
-		${NATIVE_EMULATION}.xs ${NATIVE_EMULATION}.xu ${NATIVE_EMULATION}.xc ${NATIVE_EMULATION}.xsc
+.for ext in ${ELF_SCR_EXT}
+LDSCRIPTS+=	${NATIVE_EMULATION}.${ext}
+.endfor
 SRCS+=	e${NATIVE_EMULATION}.c
 CLEANFILES+=	e${NATIVE_EMULATION}.c