Pull up following revision(s) (requested by mrg in ticket #20): netbsd-5
authorsnj <snj@NetBSD.org>
Thu, 06 Nov 2008 23:51:26 +0000
branchnetbsd-5
changeset 257658 053555f77a5d
parent 257657 516d41e7ff3e
child 257659 52fa941c9d39
Pull up following revision(s) (requested by mrg in ticket #20): compat/libexec/ld.elf_so/Makefile: revision 1.2 distrib/sets/lists/base/md.shark: revision 1.7 distrib/sets/lists/base/md.vax: revision 1.26 distrib/sets/lists/base/md.i386: revision 1.130 distrib/sets/lists/base/ad.arm: revision 1.10 distrib/sets/lists/comp/md.shark: revision 1.13 distrib/sets/lists/comp/md.sparc: revision 1.68 distrib/sets/lists/comp/ad.arm: revision 1.31 distrib/sets/lists/comp/md.vax: revision 1.35 distrib/sets/lists/comp/md.i386: revision 1.108 distrib/sets/lists/base/md.sparc: revision 1.75 distrib/sets/lists/comp/md.pmax: revision 1.59 libexec/ld.aout_so/Makefile: revision 1.46 sbin/ldconfig/Makefile: revision 1.22 make MKPIC=no builds work on i368, shark, vax, pmax, sgimips, sparc, maybe all mips and all arm as well.
compat/libexec/ld.elf_so/Makefile
distrib/sets/lists/base/ad.arm
distrib/sets/lists/base/md.i386
distrib/sets/lists/base/md.shark
distrib/sets/lists/base/md.sparc
distrib/sets/lists/base/md.vax
distrib/sets/lists/comp/ad.arm
distrib/sets/lists/comp/md.i386
distrib/sets/lists/comp/md.pmax
distrib/sets/lists/comp/md.shark
distrib/sets/lists/comp/md.sparc
distrib/sets/lists/comp/md.vax
libexec/ld.aout_so/Makefile
sbin/ldconfig/Makefile
--- a/compat/libexec/ld.elf_so/Makefile	Thu Nov 06 23:45:07 2008 +0000
+++ b/compat/libexec/ld.elf_so/Makefile	Thu Nov 06 23:51:26 2008 +0000
@@ -1,9 +1,12 @@
-#	$NetBSD: Makefile,v 1.1 2008/10/26 07:38:34 mrg Exp $
+#	$NetBSD: Makefile,v 1.1.2.1 2008/11/06 23:51:26 snj Exp $
 
 NOMAN=	# defined
 
+.include <bsd.own.mk>
 .include <bsd.obj.mk>
 
+.if ${MKPIC} != "no"
+
 SHLINKINSTALLDIR=	/usr/libexec
 
 LDFLAGS+=		-m32
@@ -31,3 +34,5 @@
 dependall: ${PROG}
 
 .include "${.CURDIR}/Makefile"
+
+.endif
--- a/distrib/sets/lists/base/ad.arm	Thu Nov 06 23:45:07 2008 +0000
+++ b/distrib/sets/lists/base/ad.arm	Thu Nov 06 23:51:26 2008 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: ad.arm,v 1.9 2004/08/12 16:07:07 lukem Exp $
-./sbin/ldconfig					base-sysutil-root
-./usr/lib/libarm.so				base-sys-shlib
-./usr/lib/libarm.so.0				base-sys-shlib
-./usr/lib/libarm.so.0.0				base-sys-shlib
-./usr/lib/libpmc.so				base-sys-shlib
-./usr/lib/libpmc.so.0				base-sys-shlib
-./usr/lib/libpmc.so.0.0				base-sys-shlib
-./usr/libexec/ld.so				base-sys-shlib
+# $NetBSD: ad.arm,v 1.9.38.1 2008/11/06 23:51:26 snj Exp $
+./sbin/ldconfig					base-sysutil-root	pic
+./usr/lib/libarm.so				base-sys-shlib		pic
+./usr/lib/libarm.so.0				base-sys-shlib		pic
+./usr/lib/libarm.so.0.0				base-sys-shlib		pic
+./usr/lib/libpmc.so				base-sys-shlib		pic
+./usr/lib/libpmc.so.0				base-sys-shlib		pic
+./usr/lib/libpmc.so.0.0				base-sys-shlib		pic
+./usr/libexec/ld.so				base-sys-shlib		pic
--- a/distrib/sets/lists/base/md.i386	Thu Nov 06 23:45:07 2008 +0000
+++ b/distrib/sets/lists/base/md.i386	Thu Nov 06 23:51:26 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.128.2.1 2008/11/06 23:43:31 snj Exp $
+# $NetBSD: md.i386,v 1.128.2.2 2008/11/06 23:51:26 snj Exp $
 ./@MODULEDIR@/adosfs				base-kernel-modules
 ./@MODULEDIR@/adosfs/adosfs.kmod		base-kernel-modules
 ./@MODULEDIR@/azalia				base-kernel-modules
@@ -77,7 +77,7 @@
 ./lib/libm387.so				base-sys-shlib		dynamicroot,pic
 ./lib/libm387.so.0				base-sys-shlib		dynamicroot,pic
 ./lib/libm387.so.0.1				base-sys-shlib		dynamicroot,pic
-./sbin/ldconfig					base-sysutil-root
+./sbin/ldconfig					base-sysutil-root	pic
 ./usr/bin/fdformat				base-util-bin
 ./usr/bin/fontedit				base-obsolete		obsolete
 ./usr/bin/pmc					base-util-bin
--- a/distrib/sets/lists/base/md.shark	Thu Nov 06 23:45:07 2008 +0000
+++ b/distrib/sets/lists/base/md.shark	Thu Nov 06 23:51:26 2008 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: md.shark,v 1.6 2006/09/29 19:03:11 macallan Exp $
+# $NetBSD: md.shark,v 1.6.26.1 2008/11/06 23:51:26 snj Exp $
 ./dev/mouse-qms0				base-obsolete		obsolete
 ./dev/qms0					base-obsolete		obsolete
-./sbin/ldconfig					base-sysutil-root
-./usr/libexec/ld.so				base-sys-shlib
+./sbin/ldconfig					base-sysutil-root	pic
+./usr/libexec/ld.so				base-sys-shlib		pic
 ./usr/sbin/ofctl				base-sysutil-bin
--- a/distrib/sets/lists/base/md.sparc	Thu Nov 06 23:45:07 2008 +0000
+++ b/distrib/sets/lists/base/md.sparc	Thu Nov 06 23:51:26 2008 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: md.sparc,v 1.74 2008/08/25 07:58:37 lukem Exp $
-./lib/libsparc_v8.so.0				base-sys-shlib		dynamicroot
-./lib/libsparc_v8.so.0.0			base-sys-shlib		dynamicroot
+# $NetBSD: md.sparc,v 1.74.2.1 2008/11/06 23:51:26 snj Exp $
+./lib/libsparc_v8.so.0				base-sys-shlib		dynamicroot,pic
+./lib/libsparc_v8.so.0.0			base-sys-shlib		dynamicroot,pic
 ./sbin/edlabel					base-sysutil-root
-./sbin/ldconfig					base-sysutil-root
+./sbin/ldconfig					base-sysutil-root	pic
 ./usr/bin/fdformat				base-util-bin
-./usr/lib/libsparc_v8.so.0			base-sys-shlib
-./usr/lib/libsparc_v8.so.0.0			base-sys-shlib
-./usr/libexec/ld.so				base-sys-shlib
+./usr/lib/libsparc_v8.so.0			base-sys-shlib		pic
+./usr/lib/libsparc_v8.so.0.0			base-sys-shlib		pic
+./usr/libexec/ld.so				base-sys-shlib		pic
 ./usr/mdec/binstall				base-sysutil-bin
 ./usr/mdec/boot					base-sysutil-bin
 ./usr/mdec/boot.388000				base-sysutil-bin
--- a/distrib/sets/lists/base/md.vax	Thu Nov 06 23:45:07 2008 +0000
+++ b/distrib/sets/lists/base/md.vax	Thu Nov 06 23:51:26 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: md.vax,v 1.25 2004/01/11 10:24:58 lukem Exp $
+# $NetBSD: md.vax,v 1.25.44.1 2008/11/06 23:51:26 snj Exp $
 ./boot						base-sys-root
 ./pcs750.bin					base-sys-root
-./sbin/ldconfig					base-sysutil-root
-./usr/libexec/ld.so				base-sys-shlib
+./sbin/ldconfig					base-sysutil-root	pic
+./usr/libexec/ld.so				base-sys-shlib		pic
 ./usr/mdec/boot					base-sysutil-bin
 ./usr/mdec/boot.mop				base-obsolete		obsolete
 ./usr/mdec/hpboot				base-sysutil-bin
--- a/distrib/sets/lists/comp/ad.arm	Thu Nov 06 23:45:07 2008 +0000
+++ b/distrib/sets/lists/comp/ad.arm	Thu Nov 06 23:51:26 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.30 2008/08/22 13:42:19 lukem Exp $
+# $NetBSD: ad.arm,v 1.30.2.1 2008/11/06 23:51:26 snj Exp $
 ./usr/include/arm				comp-c-include
 ./usr/include/arm/ansi.h			comp-c-include
 ./usr/include/arm/aout_machdep.h		comp-c-include
@@ -88,7 +88,7 @@
 ./usr/lib/libpmc.a				comp-c-lib
 ./usr/lib/libpmc_p.a				comp-c-proflib		profile
 ./usr/lib/libpmc_pic.a				comp-c-piclib
-./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug
+./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug,pic
 ./usr/libdata/lint/llib-larm.ln			comp-c-lintlib		lint
 ./usr/libdata/lint/llib-larm32.ln		comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lpmc.ln			comp-c-lintlib		lint
--- a/distrib/sets/lists/comp/md.i386	Thu Nov 06 23:45:07 2008 +0000
+++ b/distrib/sets/lists/comp/md.i386	Thu Nov 06 23:51:26 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.106.4.1 2008/11/06 23:43:31 snj Exp $
+# $NetBSD: md.i386,v 1.106.4.2 2008/11/06 23:51:26 snj Exp $
 ./usr/include/emmintrin.h			comp-c-include		gcccmds
 ./usr/include/i386				comp-c-include
 ./usr/include/i386/_G_config.h			comp-obsolete		obsolete
@@ -121,7 +121,7 @@
 ./usr/lib/libpmc.a				comp-c-lib
 ./usr/lib/libpmc_p.a				comp-c-proflib		profile
 ./usr/lib/libpmc_pic.a				comp-c-piclib		pic
-./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug
+./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug,pic
 ./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/pmc.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/sbin/acpidump.debug	comp-sysutil-debug	debug
--- a/distrib/sets/lists/comp/md.pmax	Thu Nov 06 23:45:07 2008 +0000
+++ b/distrib/sets/lists/comp/md.pmax	Thu Nov 06 23:51:26 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.pmax,v 1.58 2008/08/22 13:42:19 lukem Exp $
+# $NetBSD: md.pmax,v 1.58.2.1 2008/11/06 23:51:26 snj Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/pmax				comp-c-include
 ./usr/include/pmax/_G_config.h			comp-obsolete		obsolete
@@ -65,4 +65,4 @@
 ./usr/include/pmax/varargs.h			comp-c-include
 ./usr/include/pmax/vmparam.h			comp-c-include
 ./usr/include/pmax/wchar_limits.h		comp-c-include
-./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug
+./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug,pic
--- a/distrib/sets/lists/comp/md.shark	Thu Nov 06 23:45:07 2008 +0000
+++ b/distrib/sets/lists/comp/md.shark	Thu Nov 06 23:51:26 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.shark,v 1.12 2008/08/22 13:42:19 lukem Exp $
+# $NetBSD: md.shark,v 1.12.2.1 2008/11/06 23:51:26 snj Exp $
 ./usr/include/shark				comp-c-include
 ./usr/include/shark/ansi.h			comp-c-include
 ./usr/include/shark/aout_machdep.h		comp-c-include
@@ -50,5 +50,5 @@
 ./usr/include/shark/vmparam.h			comp-c-include
 ./usr/include/shark/wchar_limits.h		comp-c-include
 ./usr/include/ieeefp.h				comp-c-include
-./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug
+./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug,pic
 ./usr/libdata/debug/usr/sbin/ofctl.debug	comp-sysutil-debug	debug
--- a/distrib/sets/lists/comp/md.sparc	Thu Nov 06 23:45:07 2008 +0000
+++ b/distrib/sets/lists/comp/md.sparc	Thu Nov 06 23:51:26 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.67 2008/08/22 13:42:19 lukem Exp $
+# $NetBSD: md.sparc,v 1.67.2.1 2008/11/06 23:51:26 snj Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sparc				comp-c-include
 ./usr/include/sparc/_G_config.h			comp-obsolete		obsolete
@@ -133,7 +133,7 @@
 ./usr/include/sparc64/wchar_limits.h		comp-c-include
 ./usr/include/sparc64/z8530var.h		comp-c-include
 ./usr/libdata/debug/sbin/edlabel.debug		comp-sysutil-debug	debug
-./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug
+./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug,pic
 ./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug	debug
 ./usr/libdata/debug/usr/sbin/apm.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/apmd.debug		comp-sysutil-debug	debug
--- a/distrib/sets/lists/comp/md.vax	Thu Nov 06 23:45:07 2008 +0000
+++ b/distrib/sets/lists/comp/md.vax	Thu Nov 06 23:51:26 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.vax,v 1.34 2008/08/22 13:42:19 lukem Exp $
+# $NetBSD: md.vax,v 1.34.2.1 2008/11/06 23:51:27 snj Exp $
 ./usr/include/ieeefp.h				comp-obsolete		obsolete
 ./usr/include/vax				comp-c-include
 ./usr/include/vax/_G_config.h			comp-obsolete		obsolete
@@ -75,4 +75,4 @@
 ./usr/include/vax/wchar_limits.h		comp-c-include
 ./usr/lib/c++rt0.o				comp-obsolete		obsolete
 ./usr/lib/scrt0.o				comp-obsolete		obsolete
-./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug
+./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug,pic
--- a/libexec/ld.aout_so/Makefile	Thu Nov 06 23:45:07 2008 +0000
+++ b/libexec/ld.aout_so/Makefile	Thu Nov 06 23:51:26 2008 +0000
@@ -1,7 +1,8 @@
-#	$NetBSD: Makefile,v 1.45 2004/03/19 08:07:28 jmc Exp $
+#	$NetBSD: Makefile,v 1.45.38.1 2008/11/06 23:51:27 snj Exp $
 
 .include <bsd.own.mk>			# for OBJECT_FMT definition
 .include <bsd.shlib.mk>			# for SHLINKINSTALLDIR definition
+.if ${MKPIC} != "no"
 .if (${OBJECT_FMT} == "a.out")
 PROG=	ld.so
 SRCS=	mdprologue.S rtld.c malloc.c shlib.c md.c vfprintf.c
@@ -56,6 +57,7 @@
 ld.so:	ld.so.${MACHINE_ARCH}
 
 .endif
+.endif
 
 MAN= ld.aout_so.1
 
--- a/sbin/ldconfig/Makefile	Thu Nov 06 23:45:07 2008 +0000
+++ b/sbin/ldconfig/Makefile	Thu Nov 06 23:51:26 2008 +0000
@@ -1,9 +1,10 @@
-#	$NetBSD: Makefile,v 1.21 2002/11/12 14:33:49 itohy Exp $
+#	$NetBSD: Makefile,v 1.21.40.1 2008/11/06 23:51:27 snj Exp $
 
 .include <bsd.own.mk>   # For OBJECT_FMT
 .include <bsd.shlib.mk>
 
-.if (${OBJECT_FMT} == "a.out" ||	\
+.if ${MKPIC} != "no" && \
+    (${OBJECT_FMT} == "a.out" ||	\
     (${OBJECT_FMT} == "ELF" &&		\
     (${MACHINE_ARCH} == "arm" ||	\
      ${MACHINE_ARCH} == "i386" ||	\