diff options
Diffstat (limited to 'usr/src/tools/sgs')
| -rw-r--r-- | usr/src/tools/sgs/ld/Makefile | 7 | ||||
| -rw-r--r-- | usr/src/tools/sgs/libconv/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/tools/sgs/libelf/Makefile | 11 | ||||
| -rw-r--r-- | usr/src/tools/sgs/libld/Makefile | 13 | ||||
| -rw-r--r-- | usr/src/tools/sgs/liblddbg/Makefile | 11 |
5 files changed, 24 insertions, 19 deletions
diff --git a/usr/src/tools/sgs/ld/Makefile b/usr/src/tools/sgs/ld/Makefile index 05ce16f7a6..f8c54774da 100644 --- a/usr/src/tools/sgs/ld/Makefile +++ b/usr/src/tools/sgs/ld/Makefile @@ -25,16 +25,17 @@ include ../Makefile.com include ../../Makefile.tools include $(SGSHOME)/ld/Makefile.com +include $(SRC)/Makefile.master.64 -LDLIBS = -lumem -L../libconv -L$(ROOTONBLDLIBMACH) -lld -lelf -lconv +LDLIBS = -lumem -L../libconv -L$(ROOTONBLDLIBMACH64) -lld -lelf -lconv NATIVE_LIBS += libc.so libumem.so CPPFLAGS = $(NATIVE_CPPFLAGS) CFLAGS = $(NATIVE_CFLAGS) MAPFILES = $(SRCDIR)/common/mapfile-intf -RPATH = '-R$$ORIGIN/../../lib/$(MACH)' +RPATH = '-R$$ORIGIN/../../lib/$(MACH)/64' CW_LINKER = -install: $(ROOTONBLDMACHPROG) +install: $(ROOTONBLDMACH64PROG) .KEEP_STATE: diff --git a/usr/src/tools/sgs/libconv/Makefile b/usr/src/tools/sgs/libconv/Makefile index a4423c8304..626221f74e 100644 --- a/usr/src/tools/sgs/libconv/Makefile +++ b/usr/src/tools/sgs/libconv/Makefile @@ -27,6 +27,7 @@ include ../Makefile.com include $(SGSHOME)/libconv/Makefile.com +include $(SRC)/Makefile.master.64 CPPFLAGS = $(NATIVE_CPPFLAGS) -I$(SRC)/lib/libc/inc -I$(ELFCAP) \ -I$(SRC)/common/sgsrtcid \ diff --git a/usr/src/tools/sgs/libelf/Makefile b/usr/src/tools/sgs/libelf/Makefile index 7fc734dc99..bb397296f6 100644 --- a/usr/src/tools/sgs/libelf/Makefile +++ b/usr/src/tools/sgs/libelf/Makefile @@ -26,6 +26,7 @@ include ../Makefile.com include ../../Makefile.tools include $(SGSHOME)/libelf/Makefile.com +include $(SRC)/Makefile.master.64 CONVLIBDIR = -L../libconv CPPFLAGS = $(NATIVE_CPPFLAGS) @@ -40,14 +41,14 @@ MAPFILES= .KEEP_STATE: -install: all $(ROOTONBLDLIBMACH)/$(DYNLIB) $(ROOTONBLDLIBMACH)/$(LIBLINKS) +install: all $(ROOTONBLDLIBMACH64)/$(DYNLIB) $(ROOTONBLDLIBMACH64)/$(LIBLINKS) -$(ROOTONBLDLIBMACH)/$(DYNLIB): $(PICS) $(ROOTONBLDLIBMACH) +$(ROOTONBLDLIBMACH64)/$(DYNLIB): $(PICS) $(ROOTONBLDLIBMACH64) $(BUILD.SO) $(POST_PROCESS_SO) -$(ROOTONBLDLIBMACH)/$(LIBLINKS): $(ROOTONBLDLIBMACH)/$(DYNLIB) - @$(RM) $(ROOTONBLDLIBMACH)/$(LIBLINKS) - $(SYMLINK) $(DYNLIB) $(ROOTONBLDLIBMACH)/$(LIBLINKS) +$(ROOTONBLDLIBMACH64)/$(LIBLINKS): $(ROOTONBLDLIBMACH64)/$(DYNLIB) + @$(RM) $(ROOTONBLDLIBMACH64)/$(LIBLINKS) + $(SYMLINK) $(DYNLIB) $(ROOTONBLDLIBMACH64)/$(LIBLINKS) include $(SGSHOME)/libelf/Makefile.targ diff --git a/usr/src/tools/sgs/libld/Makefile b/usr/src/tools/sgs/libld/Makefile index 956a85c482..72c3adf4f1 100644 --- a/usr/src/tools/sgs/libld/Makefile +++ b/usr/src/tools/sgs/libld/Makefile @@ -28,6 +28,7 @@ include ../Makefile.com include ../../Makefile.tools include $(SGSHOME)/libld/Makefile.com +include $(SRC)/Makefile.master.64 .KEEP_STATE: @@ -43,7 +44,7 @@ CW_LINKER = CPPFLAGS = $(NATIVE_CPPFLAGS) -DUSE_LIBLD_MALLOC -I$(SRC)/lib/libc/inc \ -I$(SRC)/uts/common/krtld -I$(SRC)/uts/sparc \ -I$(SRC)/uts/common -LDLIBS += -L../libconv -lconv -L$(ROOTONBLDLIBMACH) -llddbg -lelf -lc +LDLIBS += -L../libconv -lconv -L$(ROOTONBLDLIBMACH64) -llddbg -lelf -lc NATIVE_LIBS += libc.so DYNFLAGS += $(VERSREF) '-R$$ORIGIN' @@ -51,14 +52,14 @@ CFLAGS = $(NATIVE_CFLAGS) all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTONBLDLIBMACH)/$(DYNLIB) $(ROOTONBLDLIBMACH)/$(LIBLINKS) +install: all $(ROOTONBLDLIBMACH64)/$(DYNLIB) $(ROOTONBLDLIBMACH64)/$(LIBLINKS) -$(ROOTONBLDLIBMACH)/$(DYNLIB): $(PICS) $(ROOTONBLDLIBMACH) +$(ROOTONBLDLIBMACH64)/$(DYNLIB): $(PICS) $(ROOTONBLDLIBMACH64) $(BUILD.SO) $(POST_PROCESS_SO) -$(ROOTONBLDLIBMACH)/$(LIBLINKS): $(ROOTONBLDLIBMACH)/$(DYNLIB) - @$(RM) $(ROOTONBLDLIBMACH)/$(LIBLINKS) - $(SYMLINK) $(DYNLIB) $(ROOTONBLDLIBMACH)/$(LIBLINKS) +$(ROOTONBLDLIBMACH64)/$(LIBLINKS): $(ROOTONBLDLIBMACH64)/$(DYNLIB) + @$(RM) $(ROOTONBLDLIBMACH64)/$(LIBLINKS) + $(SYMLINK) $(DYNLIB) $(ROOTONBLDLIBMACH64)/$(LIBLINKS) include $(SGSHOME)/libld/Makefile.targ diff --git a/usr/src/tools/sgs/liblddbg/Makefile b/usr/src/tools/sgs/liblddbg/Makefile index 968af30d3e..5a7818e852 100644 --- a/usr/src/tools/sgs/liblddbg/Makefile +++ b/usr/src/tools/sgs/liblddbg/Makefile @@ -27,6 +27,7 @@ include ../Makefile.com include ../../Makefile.tools include $(SGSHOME)/liblddbg/Makefile.com +include $(SRC)/Makefile.master.64 .KEEP_STATE: @@ -42,14 +43,14 @@ MAPFILES = all: $(DYNLIB) $(LIBLINKS) -install: all $(ROOTONBLDLIBMACH)/$(DYNLIB) $(ROOTONBLDLIBMACH)/$(LIBLINKS) +install: all $(ROOTONBLDLIBMACH64)/$(DYNLIB) $(ROOTONBLDLIBMACH64)/$(LIBLINKS) -$(ROOTONBLDLIBMACH)/$(DYNLIB): $(PICS) $(ROOTONBLDLIBMACH) +$(ROOTONBLDLIBMACH64)/$(DYNLIB): $(PICS) $(ROOTONBLDLIBMACH64) $(BUILD.SO) $(POST_PROCESS_SO) -$(ROOTONBLDLIBMACH)/$(LIBLINKS): $(ROOTONBLDLIBMACH)/$(DYNLIB) - @$(RM) $(ROOTONBLDLIBMACH)/$(LIBLINKS) - $(SYMLINK) $(DYNLIB) $(ROOTONBLDLIBMACH)/$(LIBLINKS) +$(ROOTONBLDLIBMACH64)/$(LIBLINKS): $(ROOTONBLDLIBMACH64)/$(DYNLIB) + @$(RM) $(ROOTONBLDLIBMACH64)/$(LIBLINKS) + $(SYMLINK) $(DYNLIB) $(ROOTONBLDLIBMACH64)/$(LIBLINKS) include $(SGSHOME)/liblddbg/Makefile.targ |