Install the linker scripts on amd64, which allows to link x86 32bit objects

using the native ld(1). This helps building pkgsrc/sysutils/xentools3-hvm
on amd64; is also allows to build the x86 boot blocks with the
native toolchain.
This commit is contained in:
bouyer 2007-12-02 18:10:20 +00:00
parent 479b0a0816
commit 382d13b49a
3 changed files with 44 additions and 20 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: md.amd64,v 1.26 2007/10/18 15:30:43 yamt Exp $
# $NetBSD: md.amd64,v 1.27 2007/12/02 18:10:20 bouyer Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@ -160,3 +160,34 @@
./usr/libdata/debug/usr/sbin/acpidump.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/amldb.debug comp-sysutil-debug debug
./usr/libdata/lint/llib-lx86_64.ln comp-c-lintlib lint
./usr/share/ldscripts/elf_i386.x comp-util-bin
./usr/share/ldscripts/elf_i386.xbn comp-util-bin
./usr/share/ldscripts/elf_i386.xc comp-util-bin
./usr/share/ldscripts/elf_i386.xd comp-util-bin
./usr/share/ldscripts/elf_i386.xdc comp-util-bin
./usr/share/ldscripts/elf_i386.xdw comp-util-bin
./usr/share/ldscripts/elf_i386.xn comp-util-bin
./usr/share/ldscripts/elf_i386.xr comp-util-bin
./usr/share/ldscripts/elf_i386.xs comp-util-bin
./usr/share/ldscripts/elf_i386.xsc comp-util-bin
./usr/share/ldscripts/elf_i386.xsw comp-util-bin
./usr/share/ldscripts/elf_i386.xu comp-util-bin
./usr/share/ldscripts/elf_i386.xw comp-util-bin
./usr/share/ldscripts/elf_x86_64.x comp-util-bin
./usr/share/ldscripts/elf_x86_64.xbn comp-util-bin
./usr/share/ldscripts/elf_x86_64.xc comp-util-bin
./usr/share/ldscripts/elf_x86_64.xd comp-util-bin
./usr/share/ldscripts/elf_x86_64.xdc comp-util-bin
./usr/share/ldscripts/elf_x86_64.xdw comp-util-bin
./usr/share/ldscripts/elf_x86_64.xn comp-util-bin
./usr/share/ldscripts/elf_x86_64.xr comp-util-bin
./usr/share/ldscripts/elf_x86_64.xs comp-util-bin
./usr/share/ldscripts/elf_x86_64.xsc comp-util-bin
./usr/share/ldscripts/elf_x86_64.xsw comp-util-bin
./usr/share/ldscripts/elf_x86_64.xu comp-util-bin
./usr/share/ldscripts/elf_x86_64.xw comp-util-bin
./usr/share/ldscripts/i386nbsd.x comp-util-bin
./usr/share/ldscripts/i386nbsd.xbn comp-util-bin
./usr/share/ldscripts/i386nbsd.xn comp-util-bin
./usr/share/ldscripts/i386nbsd.xr comp-util-bin
./usr/share/ldscripts/i386nbsd.xu comp-util-bin

View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.1091 2007/11/21 22:49:05 elad Exp $
# $NetBSD: mi,v 1.1092 2007/12/02 18:10:20 bouyer Exp $
./etc/mtree/set.comp comp-sys-root
./usr/bin/addr2line comp-debug-bin bfd
./usr/bin/ar comp-util-bin bfd
@ -3216,17 +3216,6 @@
./usr/share/ldscripts/elf64alpha.xr comp-obsolete obsolete
./usr/share/ldscripts/elf64alpha.xs comp-obsolete obsolete
./usr/share/ldscripts/elf64alpha.xu comp-obsolete obsolete
./usr/share/ldscripts/elf_i386.x comp-obsolete obsolete
./usr/share/ldscripts/elf_i386.xbn comp-obsolete obsolete
./usr/share/ldscripts/elf_i386.xn comp-obsolete obsolete
./usr/share/ldscripts/elf_i386.xr comp-obsolete obsolete
./usr/share/ldscripts/elf_i386.xs comp-obsolete obsolete
./usr/share/ldscripts/elf_i386.xu comp-obsolete obsolete
./usr/share/ldscripts/i386nbsd.x comp-obsolete obsolete
./usr/share/ldscripts/i386nbsd.xbn comp-obsolete obsolete
./usr/share/ldscripts/i386nbsd.xn comp-obsolete obsolete
./usr/share/ldscripts/i386nbsd.xr comp-obsolete obsolete
./usr/share/ldscripts/i386nbsd.xu comp-obsolete obsolete
./usr/share/ldscripts/m68kelf.x comp-obsolete obsolete
./usr/share/ldscripts/m68kelf.xbn comp-obsolete obsolete
./usr/share/ldscripts/m68kelf.xn comp-obsolete obsolete

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.24 2006/11/09 21:27:58 christos Exp $
# $NetBSD: Makefile,v 1.25 2007/12/02 18:10:21 bouyer Exp $
.include <bsd.own.mk>
@ -36,7 +36,9 @@ DPADD+= ${IBERTYOBJ}/libiberty.a
TEXINFO= ${G_TEXINFOS}
INFOFLAGS= -I${DIST}/ld -I${DIST}/bfd/doc
#FILESDIR= /usr/share/ldscripts
.if ${MACHINE_ARCH} == "x86_64"
FILESDIR= /usr/share/ldscripts
.endif
.PATH: ${DIST}/ld ${DIST}/ld/emulparams \
${DIST}/ld/emultempl ${DIST}/ld/scripttempl ldscripts
@ -78,13 +80,15 @@ e${f}.c: ${DIST}/ld/genscripts.sh ${.CURDIR}/Makefile stringify.sed
${G_target_alias} ${G_target_alias} ${G_target_alias} \
${G_EMUL} ${LIBDIR} no ${f} "${G_target_alias}"
#FILES+= ${f}.x ${f}.xbn ${f}.xn ${f}.xr ${f}.xu
.if ${MACHINE_ARCH} == "x86_64"
FILES+= ${f}.x ${f}.xbn ${f}.xn ${f}.xr ${f}.xu
# XXX hack to find out if .xs exists - slow!
#HAS_XS!= grep '^GENERATE_SHLIB_SCRIPT' ${DIST}/ld/emulparams/${f}.sh || echo
#.if !empty(HAS_XS)
#FILES+= ${f}.xs
#.endif
HAS_XS!= grep '^GENERATE_SHLIB_SCRIPT' ${DIST}/ld/emulparams/${f}.sh || echo
.if !empty(HAS_XS)
FILES+= ${f}.xc ${f}.xd ${f}.xdc ${f}.xdw ${f}.xs ${f}.xsc ${f}.xsw ${f}.xw
.endif
.endif
.endfor
.include <bsd.prog.mk>