Re: building 32bit binaries

[Manuel Bouyer <bouyer%antioche.eu.org@localhost>]

On Sun, Nov 25, 2007 at 01:01:36AM +0100, Pierre Pronchery wrote:
> Manuel Bouyer wrote:
> > The attached patch does install the ldscripts on amd64. Any objection ?
> 
> (I think you forgot to attach it)

Ops, sorry. Here it is, thanks for the notice

-- 
Manuel Bouyer <bouyer%antioche.eu.org@localhost>
     NetBSD: 26 ans d'experience feront toujours la difference
--

Index: distrib/sets/lists/comp/md.amd64
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/comp/md.amd64,v
retrieving revision 1.26
diff -u -r1.26 md.amd64
--- distrib/sets/lists/comp/md.amd64    18 Oct 2007 15:30:43 -0000      1.26
+++ distrib/sets/lists/comp/md.amd64    24 Nov 2007 23:14:01 -0000
@@ -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
Index: distrib/sets/lists/comp/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/comp/mi,v
retrieving revision 1.1091
diff -u -r1.1091 mi
--- distrib/sets/lists/comp/mi  21 Nov 2007 22:49:05 -0000      1.1091
+++ distrib/sets/lists/comp/mi  24 Nov 2007 23:14:02 -0000
@@ -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
Index: gnu/usr.bin/binutils/ld/Makefile
===================================================================
RCS file: /cvsroot/src/gnu/usr.bin/binutils/ld/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- gnu/usr.bin/binutils/ld/Makefile    9 Nov 2006 21:27:58 -0000       1.24
+++ gnu/usr.bin/binutils/ld/Makefile    24 Nov 2007 23:14:06 -0000
@@ -36,7 +36,9 @@
 
 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 @@
                ${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>