From: deraadt Date: Thu, 1 Jun 2017 10:43:33 +0000 (+0000) Subject: crtbegin and crtend files need to be in comp, to support relink of X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=17f4e327f9225fd0c5a28b12a02ac520bb23d579;p=openbsd crtbegin and crtend files need to be in comp, to support relink of libraries other than crt0 noticed by mikeb, solution from kettenis --- diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha index e829d7f76eb..d44c531b2a3 100644 --- a/distrib/sets/lists/base/md.alpha +++ b/distrib/sets/lists/base/md.alpha @@ -61,6 +61,10 @@ ./sbin/kbd ./sbin/mount_ntfs ./sbin/wsconsctl +./usr/lib/crtbegin.o +./usr/lib/crtbeginS.o +./usr/lib/crtend.o +./usr/lib/crtendS.o ./usr/lib/gcc-lib/alpha-unknown-openbsd6.1 ./usr/lib/gcc-lib/alpha-unknown-openbsd6.1/4.2.1 ./usr/lib/gcc-lib/alpha-unknown-openbsd6.1/4.2.1/collect2 diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64 index eb76d17657f..bac5131969c 100644 --- a/distrib/sets/lists/base/md.amd64 +++ b/distrib/sets/lists/base/md.amd64 @@ -67,6 +67,10 @@ ./sbin/mount_ntfs ./sbin/wsconsctl ./usr/bin/pctr +./usr/lib/crtbegin.o +./usr/lib/crtbeginS.o +./usr/lib/crtend.o +./usr/lib/crtendS.o ./usr/lib/gcc-lib/amd64-unknown-openbsd6.1 ./usr/lib/gcc-lib/amd64-unknown-openbsd6.1/4.2.1 ./usr/lib/gcc-lib/amd64-unknown-openbsd6.1/4.2.1/collect2 diff --git a/distrib/sets/lists/base/md.arm64 b/distrib/sets/lists/base/md.arm64 index b1d3e409a89..037f95b6763 100644 --- a/distrib/sets/lists/base/md.arm64 +++ b/distrib/sets/lists/base/md.arm64 @@ -29,6 +29,10 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/lib/crtbegin.o +./usr/lib/crtbeginS.o +./usr/lib/crtend.o +./usr/lib/crtendS.o ./usr/lib/libc++.so.0.0 ./usr/lib/libc++abi.so.0.0 ./usr/libdata/perl5/aarch64-openbsd diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7 index 6675826c823..e01f8fa0d2d 100644 --- a/distrib/sets/lists/base/md.armv7 +++ b/distrib/sets/lists/base/md.armv7 @@ -29,6 +29,10 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/lib/crtbegin.o +./usr/lib/crtbeginS.o +./usr/lib/crtend.o +./usr/lib/crtendS.o ./usr/lib/gcc-lib/arm-unknown-openbsd6.1 ./usr/lib/gcc-lib/arm-unknown-openbsd6.1/4.2.1 ./usr/lib/gcc-lib/arm-unknown-openbsd6.1/4.2.1/collect2 diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa index 1eca716284d..9b880588d17 100644 --- a/distrib/sets/lists/base/md.hppa +++ b/distrib/sets/lists/base/md.hppa @@ -63,6 +63,10 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/lib/crtbegin.o +./usr/lib/crtbeginS.o +./usr/lib/crtend.o +./usr/lib/crtendS.o ./usr/lib/gcc-lib/hppa-unknown-openbsd6.1 ./usr/lib/gcc-lib/hppa-unknown-openbsd6.1/4.2.1 ./usr/lib/gcc-lib/hppa-unknown-openbsd6.1/4.2.1/collect2 diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386 index 93cd6494001..d7de4396061 100644 --- a/distrib/sets/lists/base/md.i386 +++ b/distrib/sets/lists/base/md.i386 @@ -69,6 +69,10 @@ ./sbin/mount_ntfs ./sbin/wsconsctl ./usr/bin/pctr +./usr/lib/crtbegin.o +./usr/lib/crtbeginS.o +./usr/lib/crtend.o +./usr/lib/crtendS.o ./usr/lib/gcc-lib/i386-unknown-openbsd6.1 ./usr/lib/gcc-lib/i386-unknown-openbsd6.1/4.2.1 ./usr/lib/gcc-lib/i386-unknown-openbsd6.1/4.2.1/collect2 diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk index 0302d84e7e9..9e3666ef409 100644 --- a/distrib/sets/lists/base/md.landisk +++ b/distrib/sets/lists/base/md.landisk @@ -29,6 +29,10 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/lib/crtbegin.o +./usr/lib/crtbeginS.o +./usr/lib/crtend.o +./usr/lib/crtendS.o ./usr/lib/gcc-lib/sh-unknown-openbsd6.1 ./usr/lib/gcc-lib/sh-unknown-openbsd6.1/4.2.1 ./usr/lib/gcc-lib/sh-unknown-openbsd6.1/4.2.1/collect2 diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson index 4ca22a59411..db98dc6e47e 100644 --- a/distrib/sets/lists/base/md.loongson +++ b/distrib/sets/lists/base/md.loongson @@ -34,6 +34,10 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/lib/crtbegin.o +./usr/lib/crtbeginS.o +./usr/lib/crtend.o +./usr/lib/crtendS.o ./usr/lib/gcc-lib/mips64el-unknown-openbsd6.1 ./usr/lib/gcc-lib/mips64el-unknown-openbsd6.1/4.2.1 ./usr/lib/gcc-lib/mips64el-unknown-openbsd6.1/4.2.1/collect2 diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k index 4f91d88864b..214f88ff246 100644 --- a/distrib/sets/lists/base/md.luna88k +++ b/distrib/sets/lists/base/md.luna88k @@ -1,6 +1,10 @@ ./etc/examples/wsconsctl.conf ./sbin/kbd ./sbin/wsconsctl +./usr/lib/crtbegin.o +./usr/lib/crtbeginS.o +./usr/lib/crtend.o +./usr/lib/crtendS.o ./usr/lib/gcc-lib/m88k-unknown-openbsd6.1 ./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/fPIC/libgcc.a ./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/fpic/libgcc.a diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc index 2e16a4aa6fd..99dd28bd650 100644 --- a/distrib/sets/lists/base/md.macppc +++ b/distrib/sets/lists/base/md.macppc @@ -64,6 +64,10 @@ ./sbin/kbd ./sbin/pdisk ./sbin/wsconsctl +./usr/lib/crtbegin.o +./usr/lib/crtbeginS.o +./usr/lib/crtend.o +./usr/lib/crtendS.o ./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1 ./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1 ./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/collect2 diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon index 04674cc27e6..7daa5291415 100644 --- a/distrib/sets/lists/base/md.octeon +++ b/distrib/sets/lists/base/md.octeon @@ -32,6 +32,10 @@ ./etc/firmware/zd1211 ./etc/firmware/zd1211-license ./etc/firmware/zd1211b +./usr/lib/crtbegin.o +./usr/lib/crtbeginS.o +./usr/lib/crtend.o +./usr/lib/crtendS.o ./usr/lib/gcc-lib/mips64-unknown-openbsd6.1 ./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1 ./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/collect2 diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi index 5323ca5f29e..fe6b647bd0a 100644 --- a/distrib/sets/lists/base/md.sgi +++ b/distrib/sets/lists/base/md.sgi @@ -63,6 +63,10 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/lib/crtbegin.o +./usr/lib/crtbeginS.o +./usr/lib/crtend.o +./usr/lib/crtendS.o ./usr/lib/gcc-lib/mips64-unknown-openbsd6.1 ./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1 ./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/collect2 diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc index 432c11e669c..8733f7aed53 100644 --- a/distrib/sets/lists/base/md.socppc +++ b/distrib/sets/lists/base/md.socppc @@ -57,6 +57,10 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/lib/crtbegin.o +./usr/lib/crtbeginS.o +./usr/lib/crtend.o +./usr/lib/crtendS.o ./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1 ./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1 ./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/collect2 diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64 index 9f6e8ca540b..7fa2089b9fb 100644 --- a/distrib/sets/lists/base/md.sparc64 +++ b/distrib/sets/lists/base/md.sparc64 @@ -65,6 +65,10 @@ ./etc/firmware/zd1211b ./sbin/kbd ./sbin/wsconsctl +./usr/lib/crtbegin.o +./usr/lib/crtbeginS.o +./usr/lib/crtend.o +./usr/lib/crtendS.o ./usr/lib/gcc-lib/sparc64-unknown-openbsd6.1 ./usr/lib/gcc-lib/sparc64-unknown-openbsd6.1/4.2.1 ./usr/lib/gcc-lib/sparc64-unknown-openbsd6.1/4.2.1/collect2 diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha index d0064fd002c..3bb92e2707c 100644 --- a/distrib/sets/lists/comp/md.alpha +++ b/distrib/sets/lists/comp/md.alpha @@ -59,10 +59,6 @@ ./usr/include/alpha/vmparam.h ./usr/include/ieeefp.h ./usr/include/unwind.h -./usr/lib/crtbegin.o -./usr/lib/crtbeginS.o -./usr/lib/crtend.o -./usr/lib/crtendS.o ./usr/lib/libalpha.a ./usr/lib/libalpha_p.a ./usr/libdata/ldscripts diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64 index 86267d669a1..64ff034886f 100644 --- a/distrib/sets/lists/comp/md.amd64 +++ b/distrib/sets/lists/comp/md.amd64 @@ -88,10 +88,6 @@ ./usr/include/pmmintrin.h ./usr/include/unwind.h ./usr/include/xmmintrin.h -./usr/lib/crtbegin.o -./usr/lib/crtbeginS.o -./usr/lib/crtend.o -./usr/lib/crtendS.o ./usr/lib/libamd64.a ./usr/lib/libamd64_p.a ./usr/libdata/ldscripts diff --git a/distrib/sets/lists/comp/md.arm64 b/distrib/sets/lists/comp/md.arm64 index f6eef258bfc..d410635f066 100644 --- a/distrib/sets/lists/comp/md.arm64 +++ b/distrib/sets/lists/comp/md.arm64 @@ -58,10 +58,6 @@ ./usr/include/arm64/vfp.h ./usr/include/arm64/vmparam.h ./usr/include/ieeefp.h -./usr/lib/crtbegin.o -./usr/lib/crtbeginS.o -./usr/lib/crtend.o -./usr/lib/crtendS.o ./usr/libdata/ldscripts ./usr/share/info/bfd.info ./usr/share/man/man1/c++.1 diff --git a/distrib/sets/lists/comp/md.armv7 b/distrib/sets/lists/comp/md.armv7 index fe2a2a7bd24..328b3ad590f 100644 --- a/distrib/sets/lists/comp/md.armv7 +++ b/distrib/sets/lists/comp/md.armv7 @@ -105,10 +105,6 @@ ./usr/include/ieeefp.h ./usr/include/mmintrin.h ./usr/include/unwind.h -./usr/lib/crtbegin.o -./usr/lib/crtbeginS.o -./usr/lib/crtend.o -./usr/lib/crtendS.o ./usr/lib/libarm.a ./usr/lib/libarm_p.a ./usr/libdata/ldscripts diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa index cddc2c9fd5e..e1748e8c078 100644 --- a/distrib/sets/lists/comp/md.hppa +++ b/distrib/sets/lists/comp/md.hppa @@ -59,10 +59,6 @@ ./usr/include/hppa/vmparam.h ./usr/include/ieeefp.h ./usr/include/unwind.h -./usr/lib/crtbegin.o -./usr/lib/crtbeginS.o -./usr/lib/crtend.o -./usr/lib/crtendS.o ./usr/libdata/ldscripts ./usr/libdata/ldscripts/hppaobsd.x ./usr/libdata/ldscripts/hppaobsd.xbn diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386 index 5eae7adbea5..4a7ce4ba16c 100644 --- a/distrib/sets/lists/comp/md.i386 +++ b/distrib/sets/lists/comp/md.i386 @@ -90,10 +90,6 @@ ./usr/include/pmmintrin.h ./usr/include/unwind.h ./usr/include/xmmintrin.h -./usr/lib/crtbegin.o -./usr/lib/crtbeginS.o -./usr/lib/crtend.o -./usr/lib/crtendS.o ./usr/lib/libi386.a ./usr/lib/libi386_p.a ./usr/libdata/ldscripts diff --git a/distrib/sets/lists/comp/md.landisk b/distrib/sets/lists/comp/md.landisk index 9e400a62302..2bfc945b15d 100644 --- a/distrib/sets/lists/comp/md.landisk +++ b/distrib/sets/lists/comp/md.landisk @@ -106,10 +106,6 @@ ./usr/include/sh/varargs.h ./usr/include/sh/vmparam.h ./usr/include/unwind.h -./usr/lib/crtbegin.o -./usr/lib/crtbeginS.o -./usr/lib/crtend.o -./usr/lib/crtendS.o ./usr/libdata/ldscripts ./usr/libdata/ldscripts/shelf_obsd.x ./usr/libdata/ldscripts/shelf_obsd.xbn diff --git a/distrib/sets/lists/comp/md.loongson b/distrib/sets/lists/comp/md.loongson index ae70a53b5fc..48b3b39a4ee 100644 --- a/distrib/sets/lists/comp/md.loongson +++ b/distrib/sets/lists/comp/md.loongson @@ -110,10 +110,6 @@ ./usr/include/mips64/varargs.h ./usr/include/mips64/vmparam.h ./usr/include/unwind.h -./usr/lib/crtbegin.o -./usr/lib/crtbeginS.o -./usr/lib/crtend.o -./usr/lib/crtendS.o ./usr/libdata/ldscripts ./usr/libdata/ldscripts/elf32btsmip.x ./usr/libdata/ldscripts/elf32btsmip.xbn diff --git a/distrib/sets/lists/comp/md.luna88k b/distrib/sets/lists/comp/md.luna88k index 036fa242c31..c90c6abbdfb 100644 --- a/distrib/sets/lists/comp/md.luna88k +++ b/distrib/sets/lists/comp/md.luna88k @@ -103,10 +103,6 @@ ./usr/include/m88k/varargs.h ./usr/include/m88k/vmparam.h ./usr/include/unwind.h -./usr/lib/crtbegin.o -./usr/lib/crtbeginS.o -./usr/lib/crtend.o -./usr/lib/crtendS.o ./usr/libdata/ldscripts ./usr/libdata/ldscripts/elf32m88k_obsd.x ./usr/libdata/ldscripts/elf32m88k_obsd.xbn diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc index 17dac2c2be8..1eda7c53e16 100644 --- a/distrib/sets/lists/comp/md.macppc +++ b/distrib/sets/lists/comp/md.macppc @@ -103,10 +103,6 @@ ./usr/include/ppc-asm.h ./usr/include/spe.h ./usr/include/unwind.h -./usr/lib/crtbegin.o -./usr/lib/crtbeginS.o -./usr/lib/crtend.o -./usr/lib/crtendS.o ./usr/libdata/ldscripts ./usr/libdata/ldscripts/elf32ppc_obsd.x ./usr/libdata/ldscripts/elf32ppc_obsd.xbn diff --git a/distrib/sets/lists/comp/md.octeon b/distrib/sets/lists/comp/md.octeon index 039e8f8899e..ebc11c74842 100644 --- a/distrib/sets/lists/comp/md.octeon +++ b/distrib/sets/lists/comp/md.octeon @@ -108,10 +108,6 @@ ./usr/include/octeon/varargs.h ./usr/include/octeon/vmparam.h ./usr/include/unwind.h -./usr/lib/crtbegin.o -./usr/lib/crtbeginS.o -./usr/lib/crtend.o -./usr/lib/crtendS.o ./usr/libdata/ldscripts ./usr/libdata/ldscripts/elf32btsmip.x ./usr/libdata/ldscripts/elf32btsmip.xbn diff --git a/distrib/sets/lists/comp/md.sgi b/distrib/sets/lists/comp/md.sgi index dec946a816b..7a18f20ec3b 100644 --- a/distrib/sets/lists/comp/md.sgi +++ b/distrib/sets/lists/comp/md.sgi @@ -106,10 +106,6 @@ ./usr/include/sgi/vmparam.h ./usr/include/sgi/z8530var.h ./usr/include/unwind.h -./usr/lib/crtbegin.o -./usr/lib/crtbeginS.o -./usr/lib/crtend.o -./usr/lib/crtendS.o ./usr/libdata/ldscripts ./usr/libdata/ldscripts/elf32btsmip.x ./usr/libdata/ldscripts/elf32btsmip.xbn diff --git a/distrib/sets/lists/comp/md.socppc b/distrib/sets/lists/comp/md.socppc index 34355034bb2..e6ce9dc7f66 100644 --- a/distrib/sets/lists/comp/md.socppc +++ b/distrib/sets/lists/comp/md.socppc @@ -97,10 +97,6 @@ ./usr/include/socppc/vmparam.h ./usr/include/spe.h ./usr/include/unwind.h -./usr/lib/crtbegin.o -./usr/lib/crtbeginS.o -./usr/lib/crtend.o -./usr/lib/crtendS.o ./usr/libdata/ldscripts ./usr/libdata/ldscripts/elf32ppc_obsd.x ./usr/libdata/ldscripts/elf32ppc_obsd.xbn diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64 index 330c0ad6682..59a6bdcb874 100644 --- a/distrib/sets/lists/comp/md.sparc64 +++ b/distrib/sets/lists/comp/md.sparc64 @@ -65,10 +65,6 @@ ./usr/include/sparc64/vmparam.h ./usr/include/sparc64/z8530var.h ./usr/include/unwind.h -./usr/lib/crtbegin.o -./usr/lib/crtbeginS.o -./usr/lib/crtend.o -./usr/lib/crtendS.o ./usr/libdata/ldscripts ./usr/libdata/ldscripts/elf64_sparc_obsd.x ./usr/libdata/ldscripts/elf64_sparc_obsd.xbn