Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make MKPIC=no builds work on i368, shark, vax, pmax, sgimips, sparc, 

maybe all mips and all arm as well.
This commit is contained in:
mrg 2008-10-31 20:24:51 +00:00
parent 0a00bf5641
commit 9b0170606d
14 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compat/libexec/ld.elf_so/Makefile
View File

@ -1,9 +1,12 @@
# $NetBSD: Makefile,v 1.1 2008/10/26 07:38:34 mrg Exp $ # $NetBSD: Makefile,v 1.2 2008/10/31 20:24:51 mrg Exp $
NOMAN= # defined NOMAN= # defined
.include <bsd.own.mk>
.include <bsd.obj.mk> .include <bsd.obj.mk>
.if ${MKPIC} != "no"
SHLINKINSTALLDIR= /usr/libexec SHLINKINSTALLDIR= /usr/libexec
LDFLAGS+= -m32 LDFLAGS+= -m32
@ -31,3 +34,5 @@ ARCHSUBDIR= i386
dependall: ${PROG} dependall: ${PROG}
.include "${.CURDIR}/Makefile" .include "${.CURDIR}/Makefile"
.endif

18
distrib/sets/lists/base/ad.arm
View File

@ -1,9 +1,9 @@
# $NetBSD: ad.arm,v 1.9 2004/08/12 16:07:07 lukem Exp $ # $NetBSD: ad.arm,v 1.10 2008/10/31 20:24:51 mrg Exp $
./sbin/ldconfig base-sysutil-root ./sbin/ldconfig base-sysutil-root pic
./usr/lib/libarm.so base-sys-shlib ./usr/lib/libarm.so base-sys-shlib pic
./usr/lib/libarm.so.0 base-sys-shlib ./usr/lib/libarm.so.0 base-sys-shlib pic
./usr/lib/libarm.so.0.0 base-sys-shlib ./usr/lib/libarm.so.0.0 base-sys-shlib pic
./usr/lib/libpmc.so base-sys-shlib ./usr/lib/libpmc.so base-sys-shlib pic
./usr/lib/libpmc.so.0 base-sys-shlib ./usr/lib/libpmc.so.0 base-sys-shlib pic
./usr/lib/libpmc.so.0.0 base-sys-shlib ./usr/lib/libpmc.so.0.0 base-sys-shlib pic
./usr/libexec/ld.so base-sys-shlib ./usr/libexec/ld.so base-sys-shlib pic

4
distrib/sets/lists/base/md.i386
View File

@ -1,4 +1,4 @@
# $NetBSD: md.i386,v 1.129 2008/10/31 03:34:49 mrg Exp $ # $NetBSD: md.i386,v 1.130 2008/10/31 20:24:51 mrg Exp $
./@MODULEDIR@/adosfs base-kernel-modules ./@MODULEDIR@/adosfs base-kernel-modules
./@MODULEDIR@/adosfs/adosfs.kmod base-kernel-modules ./@MODULEDIR@/adosfs/adosfs.kmod base-kernel-modules
./@MODULEDIR@/azalia base-kernel-modules ./@MODULEDIR@/azalia base-kernel-modules
@ -77,7 +77,7 @@
./lib/libm387.so base-sys-shlib dynamicroot,pic ./lib/libm387.so base-sys-shlib dynamicroot,pic
./lib/libm387.so.0 base-sys-shlib dynamicroot,pic ./lib/libm387.so.0 base-sys-shlib dynamicroot,pic
./lib/libm387.so.0.1 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/fdformat base-util-bin
./usr/bin/fontedit base-obsolete obsolete ./usr/bin/fontedit base-obsolete obsolete
./usr/bin/pmc base-util-bin ./usr/bin/pmc base-util-bin

6
distrib/sets/lists/base/md.shark
View File

@ -1,6 +1,6 @@
# $NetBSD: md.shark,v 1.6 2006/09/29 19:03:11 macallan Exp $ # $NetBSD: md.shark,v 1.7 2008/10/31 20:24:51 mrg Exp $
./dev/mouse-qms0 base-obsolete obsolete ./dev/mouse-qms0 base-obsolete obsolete
./dev/qms0 base-obsolete obsolete ./dev/qms0 base-obsolete obsolete
./sbin/ldconfig base-sysutil-root ./sbin/ldconfig base-sysutil-root pic
./usr/libexec/ld.so base-sys-shlib ./usr/libexec/ld.so base-sys-shlib pic
./usr/sbin/ofctl base-sysutil-bin ./usr/sbin/ofctl base-sysutil-bin

14
distrib/sets/lists/base/md.sparc
View File

@ -1,12 +1,12 @@
# $NetBSD: md.sparc,v 1.74 2008/08/25 07:58:37 lukem Exp $ # $NetBSD: md.sparc,v 1.75 2008/10/31 20:24:52 mrg Exp $
./lib/libsparc_v8.so.0 base-sys-shlib dynamicroot ./lib/libsparc_v8.so.0 base-sys-shlib dynamicroot,pic
./lib/libsparc_v8.so.0.0 base-sys-shlib dynamicroot ./lib/libsparc_v8.so.0.0 base-sys-shlib dynamicroot,pic
./sbin/edlabel base-sysutil-root ./sbin/edlabel base-sysutil-root
./sbin/ldconfig base-sysutil-root ./sbin/ldconfig base-sysutil-root pic
./usr/bin/fdformat base-util-bin ./usr/bin/fdformat base-util-bin
./usr/lib/libsparc_v8.so.0 base-sys-shlib ./usr/lib/libsparc_v8.so.0 base-sys-shlib pic
./usr/lib/libsparc_v8.so.0.0 base-sys-shlib ./usr/lib/libsparc_v8.so.0.0 base-sys-shlib pic
./usr/libexec/ld.so base-sys-shlib ./usr/libexec/ld.so base-sys-shlib pic
./usr/mdec/binstall base-sysutil-bin ./usr/mdec/binstall base-sysutil-bin
./usr/mdec/boot base-sysutil-bin ./usr/mdec/boot base-sysutil-bin
./usr/mdec/boot.388000 base-sysutil-bin ./usr/mdec/boot.388000 base-sysutil-bin

6
distrib/sets/lists/base/md.vax
View File

@ -1,8 +1,8 @@
# $NetBSD: md.vax,v 1.25 2004/01/11 10:24:58 lukem Exp $ # $NetBSD: md.vax,v 1.26 2008/10/31 20:24:52 mrg Exp $
./boot base-sys-root ./boot base-sys-root
./pcs750.bin base-sys-root ./pcs750.bin base-sys-root
./sbin/ldconfig base-sysutil-root ./sbin/ldconfig base-sysutil-root pic
./usr/libexec/ld.so base-sys-shlib ./usr/libexec/ld.so base-sys-shlib pic
./usr/mdec/boot base-sysutil-bin ./usr/mdec/boot base-sysutil-bin
./usr/mdec/boot.mop base-obsolete obsolete ./usr/mdec/boot.mop base-obsolete obsolete
./usr/mdec/hpboot base-sysutil-bin ./usr/mdec/hpboot base-sysutil-bin

4
distrib/sets/lists/comp/ad.arm
View File

@ -1,4 +1,4 @@
# $NetBSD: ad.arm,v 1.30 2008/08/22 13:42:19 lukem Exp $ # $NetBSD: ad.arm,v 1.31 2008/10/31 20:24:52 mrg Exp $
./usr/include/arm comp-c-include ./usr/include/arm comp-c-include
./usr/include/arm/ansi.h comp-c-include ./usr/include/arm/ansi.h comp-c-include
./usr/include/arm/aout_machdep.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.a comp-c-lib
./usr/lib/libpmc_p.a comp-c-proflib profile ./usr/lib/libpmc_p.a comp-c-proflib profile
./usr/lib/libpmc_pic.a comp-c-piclib ./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-larm.ln comp-c-lintlib lint
./usr/libdata/lint/llib-larm32.ln comp-obsolete obsolete ./usr/libdata/lint/llib-larm32.ln comp-obsolete obsolete
./usr/libdata/lint/llib-lpmc.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lpmc.ln comp-c-lintlib lint

4
distrib/sets/lists/comp/md.i386
View File

@ -1,4 +1,4 @@
# $NetBSD: md.i386,v 1.107 2008/10/31 03:34:49 mrg Exp $ # $NetBSD: md.i386,v 1.108 2008/10/31 20:24:52 mrg Exp $
./usr/include/emmintrin.h comp-c-include gcccmds ./usr/include/emmintrin.h comp-c-include gcccmds
./usr/include/i386 comp-c-include ./usr/include/i386 comp-c-include
./usr/include/i386/_G_config.h comp-obsolete obsolete ./usr/include/i386/_G_config.h comp-obsolete obsolete
@ -121,7 +121,7 @@
./usr/lib/libpmc.a comp-c-lib ./usr/lib/libpmc.a comp-c-lib
./usr/lib/libpmc_p.a comp-c-proflib profile ./usr/lib/libpmc_p.a comp-c-proflib profile
./usr/lib/libpmc_pic.a comp-c-piclib pic ./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/fdformat.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/pmc.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 ./usr/libdata/debug/usr/sbin/acpidump.debug comp-sysutil-debug debug

4
distrib/sets/lists/comp/md.pmax
View File

@ -1,4 +1,4 @@
# $NetBSD: md.pmax,v 1.58 2008/08/22 13:42:19 lukem Exp $ # $NetBSD: md.pmax,v 1.59 2008/10/31 20:24:52 mrg Exp $
./usr/include/ieeefp.h comp-c-include ./usr/include/ieeefp.h comp-c-include
./usr/include/pmax comp-c-include ./usr/include/pmax comp-c-include
./usr/include/pmax/_G_config.h comp-obsolete obsolete ./usr/include/pmax/_G_config.h comp-obsolete obsolete
@ -65,4 +65,4 @@
./usr/include/pmax/varargs.h comp-c-include ./usr/include/pmax/varargs.h comp-c-include
./usr/include/pmax/vmparam.h comp-c-include ./usr/include/pmax/vmparam.h comp-c-include
./usr/include/pmax/wchar_limits.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

4
distrib/sets/lists/comp/md.shark
View File

@ -1,4 +1,4 @@
# $NetBSD: md.shark,v 1.12 2008/08/22 13:42:19 lukem Exp $ # $NetBSD: md.shark,v 1.13 2008/10/31 20:24:52 mrg Exp $
./usr/include/shark comp-c-include ./usr/include/shark comp-c-include
./usr/include/shark/ansi.h comp-c-include ./usr/include/shark/ansi.h comp-c-include
./usr/include/shark/aout_machdep.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/vmparam.h comp-c-include
./usr/include/shark/wchar_limits.h comp-c-include ./usr/include/shark/wchar_limits.h comp-c-include
./usr/include/ieeefp.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 ./usr/libdata/debug/usr/sbin/ofctl.debug comp-sysutil-debug debug

4
distrib/sets/lists/comp/md.sparc
View File

@ -1,4 +1,4 @@
# $NetBSD: md.sparc,v 1.67 2008/08/22 13:42:19 lukem Exp $ # $NetBSD: md.sparc,v 1.68 2008/10/31 20:24:52 mrg Exp $
./usr/include/ieeefp.h comp-c-include ./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include ./usr/include/sparc comp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete ./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/wchar_limits.h comp-c-include
./usr/include/sparc64/z8530var.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/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/bin/fdformat.debug comp-util-debug debug
./usr/libdata/debug/usr/sbin/apm.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/apm.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/apmd.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/apmd.debug comp-sysutil-debug debug

4
distrib/sets/lists/comp/md.vax
View File

@ -1,4 +1,4 @@
# $NetBSD: md.vax,v 1.34 2008/08/22 13:42:19 lukem Exp $ # $NetBSD: md.vax,v 1.35 2008/10/31 20:24:52 mrg Exp $
./usr/include/ieeefp.h comp-obsolete obsolete ./usr/include/ieeefp.h comp-obsolete obsolete
./usr/include/vax comp-c-include ./usr/include/vax comp-c-include
./usr/include/vax/_G_config.h comp-obsolete obsolete ./usr/include/vax/_G_config.h comp-obsolete obsolete
@ -75,4 +75,4 @@
./usr/include/vax/wchar_limits.h comp-c-include ./usr/include/vax/wchar_limits.h comp-c-include
./usr/lib/c++rt0.o comp-obsolete obsolete ./usr/lib/c++rt0.o comp-obsolete obsolete
./usr/lib/scrt0.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

4
libexec/ld.aout_so/Makefile
View File

@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.45 2004/03/19 08:07:28 jmc Exp $ # $NetBSD: Makefile,v 1.46 2008/10/31 20:24:52 mrg Exp $
.include <bsd.own.mk> # for OBJECT_FMT definition .include <bsd.own.mk> # for OBJECT_FMT definition
.include <bsd.shlib.mk> # for SHLINKINSTALLDIR definition .include <bsd.shlib.mk> # for SHLINKINSTALLDIR definition
.if ${MKPIC} != "no"
.if (${OBJECT_FMT} == "a.out") .if (${OBJECT_FMT} == "a.out")
PROG= ld.so PROG= ld.so
SRCS= mdprologue.S rtld.c malloc.c shlib.c md.c vfprintf.c SRCS= mdprologue.S rtld.c malloc.c shlib.c md.c vfprintf.c
@ -55,6 +56,7 @@ all dependall: ${FILES}
ld.so: ld.so.${MACHINE_ARCH} ld.so: ld.so.${MACHINE_ARCH}
.endif
.endif .endif
MAN= ld.aout_so.1 MAN= ld.aout_so.1

5
sbin/ldconfig/Makefile
View File

@ -1,9 +1,10 @@
# $NetBSD: Makefile,v 1.21 2002/11/12 14:33:49 itohy Exp $ # $NetBSD: Makefile,v 1.22 2008/10/31 20:24:52 mrg Exp $
.include <bsd.own.mk> # For OBJECT_FMT .include <bsd.own.mk> # For OBJECT_FMT
.include <bsd.shlib.mk> .include <bsd.shlib.mk>
.if (${OBJECT_FMT} == "a.out" || \ .if ${MKPIC} != "no" && \
(${OBJECT_FMT} == "a.out" || \
(${OBJECT_FMT} == "ELF" && \ (${OBJECT_FMT} == "ELF" && \
(${MACHINE_ARCH} == "arm" || \ (${MACHINE_ARCH} == "arm" || \
${MACHINE_ARCH} == "i386" || \ ${MACHINE_ARCH} == "i386" || \