Remove obsolete compatibility links

 * /usr/bin/strip would be replaced by a link, even when compiling
    binutils.
 * Updated minix-spec.h to use the correct dynamic linker, and removed
    the previously used symlinks.
 * Removed the patch to the builtin PATH of ld.elf_so.

Change-Id: I4dc8a7fb77a11638f5105a4e15b6c9be5add750e

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index 950daf80c0e62b8789362db96aad66ec261f04be..0e5786fffc1eafeec406b67f5dd1cef2ce836ea6 100644 (file)
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -127,10 +127,6 @@
 ./home/bin/.exrc                       minix-sys
 ./home/bin/.profile                    minix-sys
 ./lib                                  minix-sys
-./lib/cpp                              minix-sys
-./libexec                              minix-sys
-./libexec/ld.elf_so                    minix-sys
-./libexec/ld-elf.so.1                  minix-sys
 ./mnt                                  minix-sys
 ./multiboot                            minix-sys
 ./multiboot/kernel                     minix-sys
@@ -246,7 +242,7 @@
 ./usr/bin/cal                          minix-sys
 ./usr/bin/calendar                     minix-sys
 ./usr/bin/cawf                         minix-sys
-./usr/bin/cc                           minix-sys
+./usr/bin/cc                           minix-sys       gcccmds
 ./usr/bin/cc1                          minix-sys       gcccmds
 ./usr/bin/cc1obj                       minix-sys       gcccmds
 ./usr/bin/cc1plus                      minix-sys       gcccmds
@@ -501,7 +497,7 @@
 ./usr/bin/srccrc                       minix-sys
 ./usr/bin/stat                         minix-sys
 ./usr/bin/strings                      minix-sys       binutils
-./usr/bin/strip                                minix-sys
+./usr/bin/strip                                minix-sys       binutils
 ./usr/bin/stty                         minix-sys
 ./usr/bin/su                           minix-sys
 ./usr/bin/sum                          minix-sys

diff --git a/etc/Makefile b/etc/Makefile
index 5c77291e0fd9458be0a378f68a2752a5aff41b9e..11f38be7cabe0d68352dee4af9eb103708abe1bd 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -299,11 +299,8 @@ CONFIGSYMLINKS+=   ${TZDIR}/${LOCALTIME}   /etc/localtime \
                        /usr/sbin/rmt           /etc/rmt
 .else
 CONFIGSYMLINKS+=       \
-                       /usr/lib/cpp            /lib/cpp \
                        /usr/log                /var/log \
                        /usr/tmp                /var/tmp \
-                       /usr/pkg/bin/clang      /usr/bin/cc \
-                       /usr/pkg/bin/strip      /usr/bin/strip \
                        /proc/mounts            /etc/mtab
 
 .endif # !defined(__MINIX)

diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base
index d41b00655caf8173d5a004736d6a5bddbf0e1f23..409430d74b52c10709f3372b340e828a146c1e4e 100644 (file)
--- a/etc/mtree/NetBSD.dist.base
+++ b/etc/mtree/NetBSD.dist.base
@@ -25,7 +25,6 @@
 ./etc/system.conf.d
 ./home
 ./lib
-./libexec
 ./mnt
 ./proc
 ./root

diff --git a/external/gpl3/gcc/files/minix-spec.h b/external/gpl3/gcc/files/minix-spec.h
index 767f7b9c946383b41b5a11bcc2d6b580c7224e25..9ab2f53a421517b8be07c8fb5669271bc095ef34 100644 (file)
--- a/external/gpl3/gcc/files/minix-spec.h
+++ b/external/gpl3/gcc/files/minix-spec.h
@@ -84,7 +84,7 @@
 #define MINIX_SUBTARGET_EXTRA_ASM_SPEC ""
 #define MINIX_SUBTARGET_ASM_FLOAT_SPEC ""
 
-#define MINIX_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
+#define MINIX_DYNAMIC_LINKER "/usr/libexec/ld.elf_so"
 
 /* Under MINIX, just like on NetBSD, the normal location of the various 
  *    *crt*.o files is the /usr/lib directory.  */

diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile
index 8a2a160774a24b440a159da1306412c7a96b09bc..eed1d1017a308e92878e856900dfafb20c8d2dea 100644 (file)
--- a/libexec/ld.elf_so/Makefile
+++ b/libexec/ld.elf_so/Makefile
@@ -7,11 +7,6 @@ USE_BITCODE=no
 
 WARNS?=4
 
-# Minix Clang binaries references /libexec/ld.elf_so
-SYMLINKS+=     ${SHLINKINSTALLDIR}/${PROG} /libexec/ld.elf_so
-# And the minix gcc currently references /libexec/ld-elf.so.1
-SYMLINKS+=     ${SHLINKINSTALLDIR}/${PROG} /libexec/ld-elf.so.1
-
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
 .include <${BSD_MK_COMPAT_FILE}>
@@ -74,7 +69,7 @@ CLIBOBJ!=     cd ${NETBSDSRCDIR}/lib/libc && ${PRINTOBJDIR}
 
 SRCS+=         rtld.c reloc.c symbol.c xmalloc.c xprintf.c debug.c \
                map_object.c load.c search.c headers.c paths.c expand.c \
-               tls.c symver.c diagassert.c map_object_fallback.c 
+               tls.c symver.c diagassert.c map_object_fallback.c
 
 .if ${USE_FORT} == "yes"
 .PATH.c: ${NETBSDSRCDIR}/lib/libc/misc

diff --git a/libexec/ld.elf_so/rtld.h b/libexec/ld.elf_so/rtld.h
index 77d2ef010740fb5878864c7ef48b24e5eef6ce3d..f1d5ba729048f4fe3f7599268d213be7f240fcb7 100644 (file)
--- a/libexec/ld.elf_so/rtld.h
+++ b/libexec/ld.elf_so/rtld.h
@@ -49,7 +49,7 @@
 #if defined(_RTLD_SOURCE)
 
 #ifndef        RTLD_DEFAULT_LIBRARY_PATH
-#define        RTLD_DEFAULT_LIBRARY_PATH       "/lib:/usr/lib:/libexec"
+#define        RTLD_DEFAULT_LIBRARY_PATH       "/usr/lib"
 #endif
 #define _PATH_LD_HINTS                 "/etc/ld.so.conf"