sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove obsolete compatibility links

Browse source 
* /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
This commit is contained in:
Lionel Sambuc 2013-10-04 15:41:18 +02:00
parent 11bab4dff7
commit ff68abe6b3
6 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
distrib/sets/lists/minix/mi
View file

@ -127,10 +127,6 @@
./home/bin/.exrc minix-sys ./home/bin/.exrc minix-sys
./home/bin/.profile minix-sys ./home/bin/.profile minix-sys
./lib 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 ./mnt minix-sys
./multiboot minix-sys ./multiboot minix-sys
./multiboot/kernel minix-sys ./multiboot/kernel minix-sys
@ -246,7 +242,7 @@
./usr/bin/cal minix-sys ./usr/bin/cal minix-sys
./usr/bin/calendar minix-sys ./usr/bin/calendar minix-sys
./usr/bin/cawf 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/cc1 minix-sys gcccmds
./usr/bin/cc1obj minix-sys gcccmds ./usr/bin/cc1obj minix-sys gcccmds
./usr/bin/cc1plus minix-sys gcccmds ./usr/bin/cc1plus minix-sys gcccmds
@ -501,7 +497,7 @@
./usr/bin/srccrc minix-sys ./usr/bin/srccrc minix-sys
./usr/bin/stat minix-sys ./usr/bin/stat minix-sys
./usr/bin/strings minix-sys binutils ./usr/bin/strings minix-sys binutils
./usr/bin/strip minix-sys ./usr/bin/strip minix-sys binutils
./usr/bin/stty minix-sys ./usr/bin/stty minix-sys
./usr/bin/su minix-sys ./usr/bin/su minix-sys
./usr/bin/sum minix-sys ./usr/bin/sum minix-sys

3
etc/Makefile
View file

@ -299,11 +299,8 @@ CONFIGSYMLINKS+= ${TZDIR}/${LOCALTIME} /etc/localtime \
/usr/sbin/rmt /etc/rmt /usr/sbin/rmt /etc/rmt
.else .else
CONFIGSYMLINKS+= \ CONFIGSYMLINKS+= \
/usr/lib/cpp /lib/cpp \
/usr/log /var/log \ /usr/log /var/log \
/usr/tmp /var/tmp \ /usr/tmp /var/tmp \
/usr/pkg/bin/clang /usr/bin/cc \
/usr/pkg/bin/strip /usr/bin/strip \
/proc/mounts /etc/mtab /proc/mounts /etc/mtab
.endif # !defined(__MINIX) .endif # !defined(__MINIX)

1
etc/mtree/NetBSD.dist.base
View file

@ -25,7 +25,6 @@
./etc/system.conf.d ./etc/system.conf.d
./home ./home
./lib ./lib
./libexec
./mnt ./mnt
./proc ./proc
./root ./root

2
external/gpl3/gcc/files/minix-spec.h vendored
View file

@ -84,7 +84,7 @@
#define MINIX_SUBTARGET_EXTRA_ASM_SPEC "" #define MINIX_SUBTARGET_EXTRA_ASM_SPEC ""
#define MINIX_SUBTARGET_ASM_FLOAT_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 /* Under MINIX, just like on NetBSD, the normal location of the various
* *crt*.o files is the /usr/lib directory. */ * *crt*.o files is the /usr/lib directory. */

7
libexec/ld.elf_so/Makefile
View file

@ -7,11 +7,6 @@ USE_BITCODE=no
WARNS?=4 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 # This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE) .if defined(BSD_MK_COMPAT_FILE)
.include <${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 \ 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 \ 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" .if ${USE_FORT} == "yes"
.PATH.c: ${NETBSDSRCDIR}/lib/libc/misc .PATH.c: ${NETBSDSRCDIR}/lib/libc/misc

2
libexec/ld.elf_so/rtld.h
View file

@ -49,7 +49,7 @@
#if defined(_RTLD_SOURCE) #if defined(_RTLD_SOURCE)
#ifndef RTLD_DEFAULT_LIBRARY_PATH #ifndef RTLD_DEFAULT_LIBRARY_PATH
#define RTLD_DEFAULT_LIBRARY_PATH "/lib:/usr/lib:/libexec" #define RTLD_DEFAULT_LIBRARY_PATH "/usr/lib"
#endif #endif
#define _PATH_LD_HINTS "/etc/ld.so.conf" #define _PATH_LD_HINTS "/etc/ld.so.conf"