diff options
Diffstat (limited to 'usr/src/cmd/sgs')
47 files changed, 84 insertions, 100 deletions
diff --git a/usr/src/cmd/sgs/Makefile.targ b/usr/src/cmd/sgs/Makefile.targ index b8d85bef18..37064baa75 100644 --- a/usr/src/cmd/sgs/Makefile.targ +++ b/usr/src/cmd/sgs/Makefile.targ @@ -39,16 +39,4 @@ $(VAR_SGSBIN)/%: % $(VAR_SGSBIN64)/%: % $(INS.file) -$(ROOTFS_LIBDIR)/$(LIBLINKS): $(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS) - $(INS.liblink) - -$(ROOTFS_LIBDIR64)/$(LIBLINKS): $(ROOTFS_LIBDIR64)/$(LIBLINKS)$(VERS) - $(INS.liblink64) - -$(ROOTFS_LIBDIR)/$(LIBLINKSCCC): $(ROOTFS_LIBDIR)/$(LIBLINKSCCC)$(VERS) - $(INS.liblinkccc) - -$(ROOTFS_LIBDIR64)/$(LIBLINKSCCC): $(ROOTFS_LIBDIR64)/$(LIBLINKSCCC)$(VERS) - $(INS.liblinkccc64) - FRC: diff --git a/usr/src/cmd/sgs/Makefile.var b/usr/src/cmd/sgs/Makefile.var index c2984dc553..fa8f897c10 100644 --- a/usr/src/cmd/sgs/Makefile.var +++ b/usr/src/cmd/sgs/Makefile.var @@ -132,11 +132,6 @@ VAR_LIBLD_64_ROOTFS_LIBDIR= $(ROOT)/lib/$(MACH64) VAR_TOOLS_CPPFLAGS= $(VAR_AVLINCDIR) # -# liblddbg -# -VAR_LIBLDDBG_64_ROOTFS_LIBDIR= $(ROOT)/lib/$(MACH64) - -# # rtld # VAR_RTLD_CPICLIB= -L ../../../../lib/libc/$(MACH) diff --git a/usr/src/cmd/sgs/crle/common/crle.msg b/usr/src/cmd/sgs/crle/common/crle.msg index 12eb812309..6c9c0e999a 100644 --- a/usr/src/cmd/sgs/crle/common/crle.msg +++ b/usr/src/cmd/sgs/crle/common/crle.msg @@ -159,7 +159,7 @@ /usr/lib/secure/64 (system default)\n" @ MSG_DEF_AOUTDLP " Default Library Path (AOUT):\t\ - /usr/4lib:/usr/lib:/usr/local/lib \ + /usr/lib:/usr/local/lib \ (system default)\n" @ MSG_DEF_AOUTNEWTD " Trusted Directories (AOUT):\t\ /lib/secure:/usr/lib/secure (system default)\n" @@ -193,7 +193,7 @@ @ MSG_DMP_HEAD "\nConfiguration file [version %d]: %s %s\n" @ MSG_DMP_PLATFORM " Platform:\t%s %s %s\n" -@ MSG_DMP_APP " Specific application: %s (original: %s)\n" +@ MSG_DMP_APP " Specific application: %s (original: %s)\n" @ MSG_DMP_DLIBPTH " Default Library Path (%s):\t%s\n" @ MSG_DMP_TLIBPTH " Trusted Directories (%s):\t%s\n" @ MSG_DMP_RESV "\nMemory Reservation:\t%llx - %llx (%llx bytes)\n" @@ -291,7 +291,7 @@ @ MSG_PTH_OLDTD_64 "/usr/lib/secure/64" @ MSG_PTH_UPTD_64 "/lib/secure/64" -@ MSG_PTH_AOUTDLP "/usr/4lib:/usr/lib:/usr/local/lib" +@ MSG_PTH_AOUTDLP "/usr/lib:/usr/local/lib" @ MSG_DIR_ROOT "/" @ MSG_DIR_DOT "." diff --git a/usr/src/cmd/sgs/lex/Makefile.com b/usr/src/cmd/sgs/lex/Makefile.com index 9a24765ceb..c8100b1e3f 100644 --- a/usr/src/cmd/sgs/lex/Makefile.com +++ b/usr/src/cmd/sgs/lex/Makefile.com @@ -44,6 +44,13 @@ FORMS= nceucform ncform nrform include ../../../../lib/Makefile.lib +COMPATLINKS= usr/ccs/lib/libl.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/libl.so + +$(ROOT)/usr/ccs/lib/libl.so := COMPATLINKTARGET=../../lib/libl.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/libl.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/libl.so.1 + SRCDIR = ../common CSTD= $(CSTD_GNU99) diff --git a/usr/src/cmd/sgs/lex/Makefile.targ b/usr/src/cmd/sgs/lex/Makefile.targ index 7755dd804b..de50a8ae21 100644 --- a/usr/src/cmd/sgs/lex/Makefile.targ +++ b/usr/src/cmd/sgs/lex/Makefile.targ @@ -79,5 +79,8 @@ objs/%.o pics/%.o: ../common/%.c $(DYNLINKLIBDIR)/%: %$(VERS) $(INS.liblink) +$(ROOTCOMPATLINKS) $(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + clean: $(RM) $(POBJS) $(OBJS) $(PICS) $(CLEANFILES) diff --git a/usr/src/cmd/sgs/lex/amd64/Makefile b/usr/src/cmd/sgs/lex/amd64/Makefile index 88c06842ea..a70552a0ba 100644 --- a/usr/src/cmd/sgs/lex/amd64/Makefile +++ b/usr/src/cmd/sgs/lex/amd64/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # This Makefile is only to produce 64-bit lex shared library libl.so.1 # and not for building 64-bit lex itself. @@ -36,7 +34,7 @@ include ../../../../lib/Makefile.lib.64 all_lib: $(LIBS) -install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) +install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/lex/i386/Makefile b/usr/src/cmd/sgs/lex/i386/Makefile index 7c4ed059ec..a4627ee882 100644 --- a/usr/src/cmd/sgs/lex/i386/Makefile +++ b/usr/src/cmd/sgs/lex/i386/Makefile @@ -38,7 +38,7 @@ all_lib: $(LIBS) install: all $(ROOTPROG) $(ROOTFORMS) $(ROOTCCSBINLINK) -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/lex/sparc/Makefile b/usr/src/cmd/sgs/lex/sparc/Makefile index ca3f074cc4..e5a9194df2 100644 --- a/usr/src/cmd/sgs/lex/sparc/Makefile +++ b/usr/src/cmd/sgs/lex/sparc/Makefile @@ -38,7 +38,7 @@ all_lib: $(LIBS) install: all $(ROOTPROG) $(ROOTFORMS) $(ROOTCCSBINLINK) -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/lex/sparcv9/Makefile b/usr/src/cmd/sgs/lex/sparcv9/Makefile index 5edc1ac22b..c6279e175c 100644 --- a/usr/src/cmd/sgs/lex/sparcv9/Makefile +++ b/usr/src/cmd/sgs/lex/sparcv9/Makefile @@ -20,13 +20,9 @@ # CDDL HEADER END # # -# ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1997 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/sgs/lex/sparcv9/Makefile -# # This Makefile is only to produce 64-bit lex shared library libl.so.1 # and not for building 64-bit lex itself. @@ -38,7 +34,7 @@ include ../../../../lib/Makefile.lib.64 all_lib: $(LIBS) -install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) +install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/libdl/Makefile.com b/usr/src/cmd/sgs/libdl/Makefile.com index edc149f8ec..507cb277c0 100644 --- a/usr/src/cmd/sgs/libdl/Makefile.com +++ b/usr/src/cmd/sgs/libdl/Makefile.com @@ -27,3 +27,6 @@ LIBRARY = libdl.a VERS = .1 include $(SRC)/lib/Makefile.rootfs + +COMPATLINKS += etc/lib/libdl.so.1 +$(ROOT)/etc/lib/libdl.so.1 := COMPATLINKTARGET=../../lib/libdl.so.1 diff --git a/usr/src/cmd/sgs/libdl/amd64/Makefile b/usr/src/cmd/sgs/libdl/amd64/Makefile index 90e6d5bf3a..7aa63ffa3c 100644 --- a/usr/src/cmd/sgs/libdl/amd64/Makefile +++ b/usr/src/cmd/sgs/libdl/amd64/Makefile @@ -29,6 +29,7 @@ include $(SRC)/lib/Makefile.lib.64 DYNFLAGS += -F /usr/lib/$(MACH64)/ld.so.1 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/cmd/sgs/libdl/i386/Makefile b/usr/src/cmd/sgs/libdl/i386/Makefile index ea152db4b2..3ca48e64ff 100644 --- a/usr/src/cmd/sgs/libdl/i386/Makefile +++ b/usr/src/cmd/sgs/libdl/i386/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com DYNFLAGS += -F /usr/lib/ld.so.1 -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/cmd/sgs/libdl/sparc/Makefile b/usr/src/cmd/sgs/libdl/sparc/Makefile index ea152db4b2..3ca48e64ff 100644 --- a/usr/src/cmd/sgs/libdl/sparc/Makefile +++ b/usr/src/cmd/sgs/libdl/sparc/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com DYNFLAGS += -F /usr/lib/ld.so.1 -install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) +install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/cmd/sgs/libdl/sparcv9/Makefile b/usr/src/cmd/sgs/libdl/sparcv9/Makefile index 90e6d5bf3a..7aa63ffa3c 100644 --- a/usr/src/cmd/sgs/libdl/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libdl/sparcv9/Makefile @@ -29,6 +29,7 @@ include $(SRC)/lib/Makefile.lib.64 DYNFLAGS += -F /usr/lib/$(MACH64)/ld.so.1 -install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) +install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \ + $(ROOTCOMPATLINKS64) include $(SRC)/lib/Makefile.filter.targ diff --git a/usr/src/cmd/sgs/libelf/Makefile.com b/usr/src/cmd/sgs/libelf/Makefile.com index 7791333dc6..2ff06a2508 100644 --- a/usr/src/cmd/sgs/libelf/Makefile.com +++ b/usr/src/cmd/sgs/libelf/Makefile.com @@ -51,6 +51,7 @@ MISCOBJS64= nlist.o OBJECTS= $(BLTOBJS) $(MACHOBJS) $(COMOBJS) $(CLASSOBJS) $(MISCOBJS) include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs SRCDIR= $(SRC)/cmd/sgs/libelf @@ -92,13 +93,6 @@ BLTSRCS= $(BLTOBJS:%.o=%.c) LIBSRCS= $(COMOBJS:%.o=$(SRCDIR)/common/%.c) $(MISCOBJS:%.o=$(SRCDIR)/misc/%.c) \ $(MACHOBJS:%.o=%.c) $(BLTSRCS) -ROOTFS_DYNLIB= $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) - -ROOTFS_DYNLIB64= $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) - -$(ROOTFS_DYNLIB) := FILEMODE= 755 -$(ROOTFS_DYNLIB64) := FILEMODE= 755 - LIBS = $(DYNLIB) CLEANFILES += $(BLTSRCS) $(BLTFILES) diff --git a/usr/src/cmd/sgs/libelf/amd64/Makefile b/usr/src/cmd/sgs/libelf/amd64/Makefile index 94251398d8..c27090b00c 100644 --- a/usr/src/cmd/sgs/libelf/amd64/Makefile +++ b/usr/src/cmd/sgs/libelf/amd64/Makefile @@ -34,6 +34,6 @@ MISCOBJS= $(MISCOBJS64) .KEEP_STATE: -install: all .WAIT $(ROOTFS_LIBS64) $(ROOTFS_LINKS64) +install: all .WAIT $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ.64 diff --git a/usr/src/cmd/sgs/libelf/i386/Makefile b/usr/src/cmd/sgs/libelf/i386/Makefile index a14fcadcdb..53cb83ad4d 100644 --- a/usr/src/cmd/sgs/libelf/i386/Makefile +++ b/usr/src/cmd/sgs/libelf/i386/Makefile @@ -29,7 +29,7 @@ SGSMSGTARG += $(SGSMSG32) .KEEP_STATE: -install: all .WAIT $(ROOTFS_LIBS) $(ROOTFS_LINKS) \ - .WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) +install: all .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + .WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/libelf/sparc/Makefile b/usr/src/cmd/sgs/libelf/sparc/Makefile index f5e39a6940..9779e5fb83 100644 --- a/usr/src/cmd/sgs/libelf/sparc/Makefile +++ b/usr/src/cmd/sgs/libelf/sparc/Makefile @@ -29,7 +29,7 @@ SGSMSGTARG += $(SGSMSG32) .KEEP_STATE: -install: all .WAIT $(ROOTFS_LIBS) $(ROOTFS_LINKS) \ - .WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) +install: all .WAIT $(ROOTLIBS) $(ROOTLINKS) \ + .WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/libelf/sparcv9/Makefile b/usr/src/cmd/sgs/libelf/sparcv9/Makefile index 94251398d8..c27090b00c 100644 --- a/usr/src/cmd/sgs/libelf/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libelf/sparcv9/Makefile @@ -34,6 +34,6 @@ MISCOBJS= $(MISCOBJS64) .KEEP_STATE: -install: all .WAIT $(ROOTFS_LIBS64) $(ROOTFS_LINKS64) +install: all .WAIT $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ.64 diff --git a/usr/src/cmd/sgs/liblddbg/Makefile.com b/usr/src/cmd/sgs/liblddbg/Makefile.com index c4b9f9d6db..16e864f0ec 100644 --- a/usr/src/cmd/sgs/liblddbg/Makefile.com +++ b/usr/src/cmd/sgs/liblddbg/Makefile.com @@ -53,8 +53,14 @@ OBJECTS = $(BLTOBJ) $(COMOBJS) $(COMOBJS32) $(COMOBJS64) $(SGSCOMMONOBJ) include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs include $(SRC)/cmd/sgs/Makefile.com +LIBS = $(DYNLIB) + +COMPATLINKS = usr/lib/$(DYNLIB) +COMPATLINKS64 = usr/lib/$(MACH64)/$(DYNLIB) + SRCDIR = $(SGSHOME)/liblddbg MAPFILEDIR = $(SRCDIR)/common @@ -85,4 +91,3 @@ LIBSRCS = $(COMOBJS:%.o=$(SRCDIR)/common/%.c) \ CLEANFILES += $(BLTFILES) CLOBBERFILES += $(DYNLIB) $(LIBLINKS) -ROOTFS_DYNLIB = $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) diff --git a/usr/src/cmd/sgs/liblddbg/amd64/Makefile b/usr/src/cmd/sgs/liblddbg/amd64/Makefile index 1d0ab295e0..9783a0d400 100644 --- a/usr/src/cmd/sgs/liblddbg/amd64/Makefile +++ b/usr/src/cmd/sgs/liblddbg/amd64/Makefile @@ -26,11 +26,6 @@ include ../Makefile.com -ROOTFS_LIBDIR64 = \ - $(VAR_LIBLDDBG_64_ROOTFS_LIBDIR) -ROOTFS_DYNLIB64 = \ - $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) - CONVLIBDIR = $(CONVLIBDIR64) .KEEP_STATE: @@ -40,7 +35,7 @@ $(ROOTFS_DYNLIB64) := FILEMODE= 755 all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB64) +package: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/liblddbg/i386/Makefile b/usr/src/cmd/sgs/liblddbg/i386/Makefile index d27ae308e3..4345c2ca64 100644 --- a/usr/src/cmd/sgs/liblddbg/i386/Makefile +++ b/usr/src/cmd/sgs/liblddbg/i386/Makefile @@ -23,8 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -33,6 +31,6 @@ include ../Makefile.com all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB) +package: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/liblddbg/sparc/Makefile b/usr/src/cmd/sgs/liblddbg/sparc/Makefile index d27ae308e3..4345c2ca64 100644 --- a/usr/src/cmd/sgs/liblddbg/sparc/Makefile +++ b/usr/src/cmd/sgs/liblddbg/sparc/Makefile @@ -23,8 +23,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -33,6 +31,6 @@ include ../Makefile.com all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB) +package: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile b/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile index b57167b378..8bc19f5ce4 100644 --- a/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile +++ b/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile @@ -26,21 +26,14 @@ include ../Makefile.com -ROOTFS_LIBDIR64 = \ - $(VAR_LIBLDDBG_64_ROOTFS_LIBDIR) -ROOTFS_DYNLIB64 = \ - $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) - CONVLIBDIR = $(CONVLIBDIR64) .KEEP_STATE: -$(ROOTFS_DYNLIB64) := FILEMODE= 755 - all: $(DYNLIB) $(LIBLINKS) install \ -package: all $(ROOTFS_DYNLIB64) +package: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../Makefile.sub.64 diff --git a/usr/src/cmd/sgs/librtld/Makefile.com b/usr/src/cmd/sgs/librtld/Makefile.com index e15980f956..54ed7d31c3 100644 --- a/usr/src/cmd/sgs/librtld/Makefile.com +++ b/usr/src/cmd/sgs/librtld/Makefile.com @@ -38,8 +38,14 @@ OBJECTS= $(BLTOBJ) $(MACHOBJS) $(COMOBJS) include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs include $(SRC)/cmd/sgs/Makefile.com +LIBS = $(DYNLIB) + +COMPATLINKS = usr/lib/$(DYNLIB) +COMPATLINKS64 = usr/lib/$(MACH64)/$(DYNLIB) + SRCDIR = ../common CPPFLAGS += -I../../rtld/common -I$(SRC)/lib/libc/inc \ -I$(SRC)/uts/common/krtld -I$(SRC)/common/sgsrtcid \ @@ -68,5 +74,3 @@ MSGSRCS= $(MACHOBJS:%.o=%.c) $(COMOBJS:%.o=../common/%.c) \ CLEANFILES += $(BLTFILES) CLOBBERFILES += $(DYNLIB) $(LIBLINKS) - -ROOTFS_DYNLIB= $(DYNLIB:%=$(ROOTFS_LIBDIR)/%) diff --git a/usr/src/cmd/sgs/librtld/amd64/Makefile b/usr/src/cmd/sgs/librtld/amd64/Makefile index ad8c67f0db..481b1c0a22 100644 --- a/usr/src/cmd/sgs/librtld/amd64/Makefile +++ b/usr/src/cmd/sgs/librtld/amd64/Makefile @@ -30,12 +30,9 @@ CPPFLAGS += -I../../../../uts/intel/amd64/krtld .KEEP_STATE: -ROOTFS_DYNLIB64 = $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) -$(ROOTFS_DYNLIB64) := FILEMODE=755 - all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) CPPFLAGS += -D_ELF64 diff --git a/usr/src/cmd/sgs/librtld/i386/Makefile b/usr/src/cmd/sgs/librtld/i386/Makefile index 54e5e30586..5d9e11a226 100644 --- a/usr/src/cmd/sgs/librtld/i386/Makefile +++ b/usr/src/cmd/sgs/librtld/i386/Makefile @@ -32,6 +32,6 @@ CPPFLAGS += -I../../../../uts/intel/ia32/krtld all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/cmd/sgs/librtld/Makefile.targ diff --git a/usr/src/cmd/sgs/librtld/sparc/Makefile b/usr/src/cmd/sgs/librtld/sparc/Makefile index ac07f8b8c0..eb5a2547e4 100644 --- a/usr/src/cmd/sgs/librtld/sparc/Makefile +++ b/usr/src/cmd/sgs/librtld/sparc/Makefile @@ -32,6 +32,6 @@ CPPFLAGS += -I../../../../uts/sparc/krtld all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include $(SRC)/cmd/sgs/librtld/Makefile.targ diff --git a/usr/src/cmd/sgs/librtld/sparcv9/Makefile b/usr/src/cmd/sgs/librtld/sparcv9/Makefile index 00a9c3ca48..fd02c33926 100644 --- a/usr/src/cmd/sgs/librtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/librtld/sparcv9/Makefile @@ -30,12 +30,9 @@ CPPFLAGS += -I../../../../uts/sparc/krtld .KEEP_STATE: -ROOTFS_DYNLIB64 = $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) -$(ROOTFS_DYNLIB64) := FILEMODE=755 - all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTFS_DYNLIB64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) CPPFLAGS += -D_ELF64 diff --git a/usr/src/cmd/sgs/librtld_db/Makefile.com b/usr/src/cmd/sgs/librtld_db/Makefile.com index 2d7b9093c3..ad00e866a3 100644 --- a/usr/src/cmd/sgs/librtld_db/Makefile.com +++ b/usr/src/cmd/sgs/librtld_db/Makefile.com @@ -32,6 +32,7 @@ BLTOBJ= msg.o OBJECTS = $(BLTOBJ) $(COMOBJS) $(COMOBJS64) $(PLTOBJS) include $(SRC)/lib/Makefile.lib +include $(SRC)/lib/Makefile.rootfs include $(SRC)/cmd/sgs/Makefile.com SRCDIR = ../common diff --git a/usr/src/cmd/sgs/librtld_db/amd64/Makefile b/usr/src/cmd/sgs/librtld_db/amd64/Makefile index 705c6ef07a..e4454c5ef2 100644 --- a/usr/src/cmd/sgs/librtld_db/amd64/Makefile +++ b/usr/src/cmd/sgs/librtld_db/amd64/Makefile @@ -39,7 +39,7 @@ CONVLIBDIR = $(CONVLIBDIR64) all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) pics/plt32_resolution.o: ../i386/plt32_resolution.c $(COMPILE.c) -D_ELF32 $(PICFLAGS) -o $@ \ diff --git a/usr/src/cmd/sgs/librtld_db/i386/Makefile b/usr/src/cmd/sgs/librtld_db/i386/Makefile index ff610a1129..331d8aa3bb 100644 --- a/usr/src/cmd/sgs/librtld_db/i386/Makefile +++ b/usr/src/cmd/sgs/librtld_db/i386/Makefile @@ -37,6 +37,6 @@ SGSMSGTARG += $(SGSMSGINTEL) all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB) $(ROOTFS_LINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/librtld_db/sparc/Makefile b/usr/src/cmd/sgs/librtld_db/sparc/Makefile index 36c1b54df5..8a82b99e92 100644 --- a/usr/src/cmd/sgs/librtld_db/sparc/Makefile +++ b/usr/src/cmd/sgs/librtld_db/sparc/Makefile @@ -35,6 +35,6 @@ include ../Makefile.com all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB) $(ROOTFS_LINKS) +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile b/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile index 29be0d82b3..c150914bc7 100644 --- a/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile +++ b/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile @@ -39,7 +39,7 @@ CONVLIBDIR = $(CONVLIBDIR64) all: $(DYNLIB) -install: all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64) +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) pics/plt32_resolution.o: ../sparc/plt32_resolution.c $(COMPILE.c) -D_ELF32 $(PICFLAGS) -o $@ \ 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) diff --git a/usr/src/cmd/sgs/yacc/Makefile.com b/usr/src/cmd/sgs/yacc/Makefile.com index 2172234f49..9f9b3dc0e8 100644 --- a/usr/src/cmd/sgs/yacc/Makefile.com +++ b/usr/src/cmd/sgs/yacc/Makefile.com @@ -41,6 +41,13 @@ YACCPAR= yaccpar include ../../../../lib/Makefile.lib +COMPATLINKS= usr/ccs/lib/liby.so +COMPATLINKS64= usr/ccs/lib/$(MACH64)/liby.so + +$(ROOT)/usr/ccs/lib/liby.so := COMPATLINKTARGET=../../lib/liby.so.1 +$(ROOT)/usr/ccs/lib/$(MACH64)/liby.so:= \ + COMPATLINKTARGET=../../../lib/$(MACH64)/liby.so.1 + SRCDIR = ../common # Override default source file derivation rule (in Makefile.lib) diff --git a/usr/src/cmd/sgs/yacc/Makefile.targ b/usr/src/cmd/sgs/yacc/Makefile.targ index a7932225e0..1ff1f4e804 100644 --- a/usr/src/cmd/sgs/yacc/Makefile.targ +++ b/usr/src/cmd/sgs/yacc/Makefile.targ @@ -75,5 +75,8 @@ objs/%.o pics/%.o: ../common/%.c $(DYNLINKLIBDIR)/%: %$(VERS) $(INS.liblink) +$(ROOTCOMPATLINKS) $(ROOTCOMPATLINKS64): + $(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@ + clean: $(RM) $(POBJS) $(OBJS) $(PICS) $(CLEANFILES) diff --git a/usr/src/cmd/sgs/yacc/amd64/Makefile b/usr/src/cmd/sgs/yacc/amd64/Makefile index 3b987420ec..46c508df3d 100644 --- a/usr/src/cmd/sgs/yacc/amd64/Makefile +++ b/usr/src/cmd/sgs/yacc/amd64/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # This Makefile is only to produce 64-bit yacc shared library liby.so.1 # and not for building 64-bit yacc itself. @@ -39,7 +37,7 @@ POFILE= all_lib: $(LIBS) -install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) +install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/yacc/i386/Makefile b/usr/src/cmd/sgs/yacc/i386/Makefile index 5ca3d8bd7d..20885a7713 100644 --- a/usr/src/cmd/sgs/yacc/i386/Makefile +++ b/usr/src/cmd/sgs/yacc/i386/Makefile @@ -40,7 +40,7 @@ install: all $(ROOTPROG) $(ROOTYACCPAR) $(ROOTCCSBINLINK) $(RM) $(ROOTCCSBIN)/yaccpar $(SYMLINK) ../../share/lib/ccs/yaccpar $(ROOTCCSBIN)/yaccpar -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS) include ../Makefile.targ include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/yacc/sparc/Makefile b/usr/src/cmd/sgs/yacc/sparc/Makefile index 65d76b6f21..909fb6e7e2 100644 --- a/usr/src/cmd/sgs/yacc/sparc/Makefile +++ b/usr/src/cmd/sgs/yacc/sparc/Makefile @@ -38,7 +38,7 @@ all_lib: $(LIBS) install: all $(ROOTPROG) $(ROOTYACCPAR) $(ROOTCCSBINLINK) -install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) +install_lib: all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS) $(RM) $(ROOTCCSBIN)/yaccpar $(SYMLINK) ../../share/lib/ccs/yaccpar $(ROOTCCSBIN)/yaccpar diff --git a/usr/src/cmd/sgs/yacc/sparcv9/Makefile b/usr/src/cmd/sgs/yacc/sparcv9/Makefile index 1c65ac76b5..f94db938f3 100644 --- a/usr/src/cmd/sgs/yacc/sparcv9/Makefile +++ b/usr/src/cmd/sgs/yacc/sparcv9/Makefile @@ -20,13 +20,9 @@ # CDDL HEADER END # # -# ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1997 by Sun Microsystems, Inc. # All rights reserved. # -# cmd/sgs/yacc/sparcv9/Makefile -# # This Makefile is only to produce 64-bit yacc shared library liby.so.1 # and not for building 64-bit yacc itself. @@ -41,7 +37,7 @@ POFILE= all_lib: $(LIBS) -install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) +install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ include ../../../Makefile.targ |