13184 Stop translating ld(1) options through cw(1)

Reviewed by: Jason King <jason.brian.king+illumos@gmail.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Approved by: Robert Mustacchi <rm@fingolfin.org>

8 files changed, 8 insertions, 16 deletions

diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile
index 2c428afacb..2d350372d6 100644
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -1061,7 +1061,7 @@ CFLAGS64 += $(XSTRCONST)
 
 ALTPICS= $(TRACEOBJS:%=pics/%)
 
-$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS)
+$(DYNLIB) := BUILD.SO = $(LD) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS)
 
 MAPFILES =	$(LIBCDIR)/port/mapfile-vers
 
diff --git a/usr/src/lib/libc/capabilities/Makefile.com b/usr/src/lib/libc/capabilities/Makefile.com
index f8e9e46331..34f57102b6 100644
--- a/usr/src/lib/libc/capabilities/Makefile.com
+++ b/usr/src/lib/libc/capabilities/Makefile.com
@@ -26,7 +26,7 @@
 include		$(SRC)/lib/Makefile.lib
 
 MAPFILE-CAP =	../common/mapfile-cap
-MAPOPT-CAP =	$(MAPFILE-CAP:%=-M%)
+MAPOPT-CAP =	$(MAPFILE-CAP:%=-Wl,-M%)
 
 OBJCAP =	pics/objcap.o
 SYMCAP =	pics/symcap.o
diff --git a/usr/src/lib/libc/capabilities/Makefile.targ b/usr/src/lib/libc/capabilities/Makefile.targ
index d9f7891f22..1691d37898 100644
--- a/usr/src/lib/libc/capabilities/Makefile.targ
+++ b/usr/src/lib/libc/capabilities/Makefile.targ
@@ -43,7 +43,7 @@ pics/%.o:	../../$(ALT_PLATFORM)/common/%.s
 # to this object, and define the interface.
 
 pics/objcap.o:	$(PICS) $(MAPFILE-CAP)
-		$(LD) -r -o $@ $(MAPOPT-CAP) -Breduce $(PICS)
+		$(LD) -r -o $@ $(MAPOPT-CAP) $(BREDUCE) $(PICS)
 		$(POST_PROCESS_OBJCAP_O)
 
 # Convert the combined object capabilities object into a symbol capabilities
diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com
index 35f96feda3..d3e2c51360 100644
--- a/usr/src/lib/libc/i386/Makefile.com
+++ b/usr/src/lib/libc/i386/Makefile.com
@@ -1110,7 +1110,7 @@ CFLAGS += $(XSTRCONST)
 
 ALTPICS= $(TRACEOBJS:%=pics/%)
 
-$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) \
+$(DYNLIB) := BUILD.SO = $(LD) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(ALTPICS) \
 		$(EXTPICS) $(LDLIBS)
 
 MAPFILES =	$(LIBCDIR)/port/mapfile-vers
diff --git a/usr/src/lib/libc/i386_hwcap1/Makefile b/usr/src/lib/libc/i386_hwcap1/Makefile
index 42fa4d5cae..a9ce500424 100644
--- a/usr/src/lib/libc/i386_hwcap1/Makefile
+++ b/usr/src/lib/libc/i386_hwcap1/Makefile
@@ -23,10 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libc/i386_hwcap1/Makefile
-#
 
 LIBCBASE=	../i386
 
@@ -34,7 +30,7 @@ LIBRARY=	libc_hwcap1.a
 
 EXTN_CPPFLAGS=	-D_CMOV_INSN -D_SSE_INSN -D_MMX_INSN -D_SEP_INSN
 EXTN_CFLAGS=	-xtarget=pentium_pro
-EXTN_DYNFLAGS=	-M mapfile
+EXTN_DYNFLAGS=	-Wl,-Mmapfile
 
 # Defining this means build targets will first try to use source from this
 # directory before falling back to unoptimized i386 source.
diff --git a/usr/src/lib/libc/i386_hwcap3/Makefile b/usr/src/lib/libc/i386_hwcap3/Makefile
index 39725b9b5b..a3d925770c 100644
--- a/usr/src/lib/libc/i386_hwcap3/Makefile
+++ b/usr/src/lib/libc/i386_hwcap3/Makefile
@@ -22,10 +22,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libc/i386_hwcap3/Makefile
-#
 
 LIBCBASE=	../i386
 
@@ -33,7 +29,7 @@ LIBRARY=	libc_hwcap3.a
 
 EXTN_CPPFLAGS=	-D_CMOV_INSN -D_SSE_INSN -D_MMX_INSN
 EXTN_CFLAGS=	-xtarget=pentium_pro
-EXTN_DYNFLAGS=	-M mapfile
+EXTN_DYNFLAGS=	-Wl,-Mmapfile
 
 # Defining this means build targets will first try to use source from this
 # directory before falling back to unoptimized i386 source.
diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com
index abd0d25056..8ecec57516 100644
--- a/usr/src/lib/libc/sparc/Makefile.com
+++ b/usr/src/lib/libc/sparc/Makefile.com
@@ -1134,7 +1134,7 @@ CFLAGS += $(XSTRCONST)
 
 ALTPICS= $(TRACEOBJS:%=pics/%)
 
-$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS)
+$(DYNLIB) := BUILD.SO = $(LD) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS)
 
 MAPFILES =	$(LIBCDIR)/port/mapfile-vers
 
diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com
index f5bfaf5c9d..7036b2e20d 100644
--- a/usr/src/lib/libc/sparcv9/Makefile.com
+++ b/usr/src/lib/libc/sparcv9/Makefile.com
@@ -1075,7 +1075,7 @@ CFLAGS64 += $(XSTRCONST)
 
 ALTPICS= $(TRACEOBJS:%=pics/%)
 
-$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS)
+$(DYNLIB) := BUILD.SO = $(LD) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS)
 
 MAPFILES =	$(LIBCDIR)/port/mapfile-vers