summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--exception_lists/packaging30
-rw-r--r--usr/src/Makefile.master2
-rw-r--r--usr/src/tools/Makefile1
-rw-r--r--usr/src/tools/Makefile.targ8
-rw-r--r--usr/src/tools/Makefile.tools5
-rw-r--r--usr/src/tools/sgs/ld/Makefile7
-rw-r--r--usr/src/tools/sgs/libconv/Makefile1
-rw-r--r--usr/src/tools/sgs/libelf/Makefile11
-rw-r--r--usr/src/tools/sgs/libld/Makefile13
-rw-r--r--usr/src/tools/sgs/liblddbg/Makefile11
10 files changed, 47 insertions, 42 deletions
diff --git a/exception_lists/packaging b/exception_lists/packaging
index 4e5ae5f3c8..9a0dbf76a6 100644
--- a/exception_lists/packaging
+++ b/exception_lists/packaging
@@ -923,22 +923,24 @@ usr/lib/libjedec.so
#
# the tools copy of the link-editor is not delivered
#
-opt/onbld/bin/i386/ld i386
-opt/onbld/bin/sparc/ld sparc
+opt/onbld/bin/amd64 i386
+opt/onbld/bin/sparcv9 sparc
+# The directory exclusions above cover bin/.../ld, should we ever not exclude
+# those directories, ld must be added here
opt/onbld/bin/i386/sgsmsg i386
opt/onbld/bin/sparc/sgsmsg sparc
-opt/onbld/lib/i386/libelf.so i386
-opt/onbld/lib/i386/libelf.so.1 i386
-opt/onbld/lib/i386/libld.so i386
-opt/onbld/lib/i386/libld.so.4 i386
-opt/onbld/lib/i386/liblddbg.so i386
-opt/onbld/lib/i386/liblddbg.so.4 i386
-opt/onbld/lib/sparc/libelf.so sparc
-opt/onbld/lib/sparc/libelf.so.1 sparc
-opt/onbld/lib/sparc/libld.so sparc
-opt/onbld/lib/sparc/libld.so.4 sparc
-opt/onbld/lib/sparc/liblddbg.so sparc
-opt/onbld/lib/sparc/liblddbg.so.4 sparc
+opt/onbld/lib/i386/64/libelf.so i386
+opt/onbld/lib/i386/64/libelf.so.1 i386
+opt/onbld/lib/i386/64/libld.so i386
+opt/onbld/lib/i386/64/libld.so.4 i386
+opt/onbld/lib/i386/64/liblddbg.so i386
+opt/onbld/lib/i386/64/liblddbg.so.4 i386
+opt/onbld/lib/sparc/64/libelf.so sparc
+opt/onbld/lib/sparc/64/libelf.so.1 sparc
+opt/onbld/lib/sparc/64/libld.so sparc
+opt/onbld/lib/sparc/64/libld.so.4 sparc
+opt/onbld/lib/sparc/64/liblddbg.so sparc
+opt/onbld/lib/sparc/64/liblddbg.so.4 sparc
opt/onbld/man/man1onbld/sgsmsg.1onbld
#
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index f54d9e5d28..526cee9aef 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -931,7 +931,7 @@ CW= $(ONBLD_TOOLS)/bin/$(MACH)/cw
BUILD_CC= $(CW) $(CW_LINKER) $(CW_CC_COMPILERS) --
BUILD_CCC= $(CW) -C $(CW_LINKER) $(CW_CCC_COMPILERS) --
BUILD_CPP= /usr/lib/cpp
-BUILD_LD= $(ONBLD_TOOLS)/bin/$(MACH)/ld
+BUILD_LD= $(ONBLD_TOOLS)/bin/$(MACH64)/ld
$(MACH)_CC= $(BUILD_CC)
$(MACH)_CCC= $(BUILD_CCC)
diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile
index 3c1d9097a7..0f2d1800e8 100644
--- a/usr/src/tools/Makefile
+++ b/usr/src/tools/Makefile
@@ -108,6 +108,7 @@ ROOTDIRS= \
$(ROOTONBLD) \
$(ROOTONBLD)/bin \
$(ROOTONBLD)/bin/$(MACH) \
+ $(ROOTONBLD)/bin/$(MACH64) \
$(ROOTONBLD)/lib \
$(ROOTONBLD)/lib/$(MACH) \
$(ROOTONBLD)/lib/$(MACH)/64 \
diff --git a/usr/src/tools/Makefile.targ b/usr/src/tools/Makefile.targ
index b496f5d5fd..62ea62bfb0 100644
--- a/usr/src/tools/Makefile.targ
+++ b/usr/src/tools/Makefile.targ
@@ -19,8 +19,6 @@
# CDDL HEADER END
#
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -28,9 +26,3 @@
clobber: clean
-$(RM) $(PROG) $(CLOBBERFILES)
-
-lint_PROG:
- $(LINT.c) $(PROG).c
-
-lint_SRCS:
- $(LINT.c) $(SRCS)
diff --git a/usr/src/tools/Makefile.tools b/usr/src/tools/Makefile.tools
index 315a10b6c6..6bc8e66c14 100644
--- a/usr/src/tools/Makefile.tools
+++ b/usr/src/tools/Makefile.tools
@@ -34,6 +34,7 @@ ROOTOPT= $(TOOLS_PROTO)/opt
ROOTONBLD= $(ROOTOPT)/onbld
ROOTONBLDBIN= $(ROOTONBLD)/bin
ROOTONBLDBINMACH= $(ROOTONBLD)/bin/$(MACH)
+ROOTONBLDBINMACH64= $(ROOTONBLD)/bin/$(MACH64)
ROOTONBLDETC= $(ROOTONBLD)/etc
ROOTONBLDLIB= $(ROOTONBLD)/lib
ROOTONBLDLIBMACH= $(ROOTONBLD)/lib/$(MACH)
@@ -78,6 +79,7 @@ CW_LINKER=
ROOTONBLDPROG= $(PROG:%=$(ROOTONBLDBIN)/%)
ROOTONBLDSCRIPTS= $(SCRIPTS:%=$(ROOTONBLDBIN)/%)
ROOTONBLDMACHPROG= $(PROG:%=$(ROOTONBLDBINMACH)/%)
+ROOTONBLDMACH64PROG= $(PROG:%=$(ROOTONBLDBINMACH64)/%)
ROOTONBLDSHFILES= $(SHFILES:%=$(ROOTONBLDBIN)/%)
ROOTONBLDMAKEFILES= $(MAKEFILES:%=$(ROOTONBLDBIN)/%)
ROOTONBLDMACHSHFILES= $(SHFILES:%=$(ROOTONBLDBINMACH)/%)
@@ -106,6 +108,9 @@ $(ROOTONBLDBIN)/%: %
$(ROOTONBLDBINMACH)/%: %
$(INS.file)
+$(ROOTONBLDBINMACH64)/%: %
+ $(INS.file)
+
$(ROOTONBLDETC)/%: %
$(INS.file)
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
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-08 09:50:40 +0000