diff options
Diffstat (limited to 'usr/src/cmd/sgs/rtld')
| -rw-r--r-- | usr/src/cmd/sgs/rtld/Makefile.com | 8 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/rtld/amd64/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/rtld/common/a.out.c | 1 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/rtld/common/rtld.sparc32.msg | 1 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/rtld/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/rtld/sparc/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/sgs/rtld/sparcv9/Makefile | 2 |
7 files changed, 12 insertions, 6 deletions
diff --git a/usr/src/cmd/sgs/rtld/Makefile.com b/usr/src/cmd/sgs/rtld/Makefile.com index 6a767de04b..853fd5066b 100644 --- a/usr/src/cmd/sgs/rtld/Makefile.com +++ b/usr/src/cmd/sgs/rtld/Makefile.com @@ -72,6 +72,14 @@ ETCDYNLIB= $(RTLD:%=$(ETCLIBDIR)/%) ROOTDYNLIB= $(RTLD:%=$(ROOTFS_LIBDIR)/%) ROOTDYNLIB64= $(RTLD:%=$(ROOTFS_LIBDIR64)/%) +COMPATLINKS= etc/lib/ld.so.1 \ + usr/lib/ld.so.1 +COMPATLINKS64= usr/lib/$(MACH64)/ld.so.1 + +$(ROOT)/etc/lib/ld.so.1 := COMPATLINKTARGET= ../../lib/ld.so.1 +$(ROOT)/usr/lib/ld.so.1 := COMPATLINKTARGET= ../../lib/ld.so.1 +$(ROOT)/usr/lib/$(MACH64)/ld.so.1 := \ + COMPATLINKTARGET= ../../../lib/$(MACH64)/ld.so.1 FILEMODE = 755 diff --git a/usr/src/cmd/sgs/rtld/amd64/Makefile b/usr/src/cmd/sgs/rtld/amd64/Makefile index f01898ec08..d73dbaaa6b 100644 --- a/usr/src/cmd/sgs/rtld/amd64/Makefile +++ b/usr/src/cmd/sgs/rtld/amd64/Makefile @@ -84,7 +84,7 @@ CONVLIBDIR = $(CONVLIBDIR64) all: $(RTLD) -install: all $(ROOTDYNLIB64) +install: all $(ROOTDYNLIB64) $(ROOTCOMPATLINKS64) adbmacros: adb .WAIT $(ADBSCRIPTS) diff --git a/usr/src/cmd/sgs/rtld/common/a.out.c b/usr/src/cmd/sgs/rtld/common/a.out.c index c7abfcab12..6ea37918ad 100644 --- a/usr/src/cmd/sgs/rtld/common/a.out.c +++ b/usr/src/cmd/sgs/rtld/common/a.out.c @@ -50,7 +50,6 @@ * Default and secure dependency search paths. */ static Spath_defn _aout_def_dirs[] = { - { MSG_ORIG(MSG_PTH_USR4LIB), MSG_PTH_USR4LIB_SIZE }, { MSG_ORIG(MSG_PTH_USRLIB), MSG_PTH_USRLIB_SIZE }, { MSG_ORIG(MSG_PTH_USRLCLIB), MSG_PTH_USRLCLIB_SIZE }, { 0, 0 } diff --git a/usr/src/cmd/sgs/rtld/common/rtld.sparc32.msg b/usr/src/cmd/sgs/rtld/common/rtld.sparc32.msg index 8f19af9390..99b623803d 100644 --- a/usr/src/cmd/sgs/rtld/common/rtld.sparc32.msg +++ b/usr/src/cmd/sgs/rtld/common/rtld.sparc32.msg @@ -48,7 +48,6 @@ @ MSG_FIL_LIB "lib" @ MSG_PTH_USRLCLIB "/usr/local/lib" -@ MSG_PTH_USR4LIB "/usr/4lib" @ MSG_SYM_LAV8PLTENTER "la_sparcv8_pltenter" diff --git a/usr/src/cmd/sgs/rtld/i386/Makefile b/usr/src/cmd/sgs/rtld/i386/Makefile index 224faac481..0d7ff2cc8e 100644 --- a/usr/src/cmd/sgs/rtld/i386/Makefile +++ b/usr/src/cmd/sgs/rtld/i386/Makefile @@ -75,7 +75,7 @@ SGSMSGTARG += $(SGSMSGINTEL) $(SGSMSGINTEL32) $(SGSMSG32) all: $(RTLD) -install: all $(ROOTDYNLIB) +install: all $(ROOTDYNLIB) $(ROOTCOMPATLINKS) adbmacros: adb .WAIT $(ADBSCRIPTS) diff --git a/usr/src/cmd/sgs/rtld/sparc/Makefile b/usr/src/cmd/sgs/rtld/sparc/Makefile index d63f57b13a..2785c30fcf 100644 --- a/usr/src/cmd/sgs/rtld/sparc/Makefile +++ b/usr/src/cmd/sgs/rtld/sparc/Makefile @@ -81,7 +81,7 @@ SGSMSGTARG += $(SGSMSGSPARC) $(SGSMSGSPARC32) $(SGSMSG32) all: $(RTLD) -install: all $(ROOTDYNLIB) +install: all $(ROOTDYNLIB) $(ROOTCOMPATLINKS) adbmacros: adb .WAIT $(ADBSCRIPTS) diff --git a/usr/src/cmd/sgs/rtld/sparcv9/Makefile b/usr/src/cmd/sgs/rtld/sparcv9/Makefile index 87593bc6d2..fb1c3da820 100644 --- a/usr/src/cmd/sgs/rtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/rtld/sparcv9/Makefile @@ -90,7 +90,7 @@ CONVLIBDIR = $(CONVLIBDIR64) all: $(RTLD) -install: all $(ROOTDYNLIB64) +install: all $(ROOTDYNLIB64) $(ROOTCOMPATLINKS64) adbmacros: adb .WAIT $(ADBSCRIPTS) |