From ff68abe6b3940918fbc2a1a36ddce4fc8d54cff3 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel@minix3.org>
Date: Fri, 4 Oct 2013 15:41:18 +0200
Subject: [PATCH] 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
---
 distrib/sets/lists/minix/mi          | 8 ++------
 etc/Makefile                         | 3 ---
 etc/mtree/NetBSD.dist.base           | 1 -
 external/gpl3/gcc/files/minix-spec.h | 2 +-
 libexec/ld.elf_so/Makefile           | 7 +------
 libexec/ld.elf_so/rtld.h             | 2 +-
 6 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index 950daf80c..0e5786fff 100644
--- 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 5c77291e0..11f38be7c 100644
--- 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 d41b00655..409430d74 100644
--- 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 767f7b9c9..9ab2f53a4 100644
--- 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 8a2a16077..eed1d1017 100644
--- 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 77d2ef010..f1d5ba729 100644
--- 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"