[illumos-gate merge]

commit 35abe3277cc67d1a650f8fd7ce718b89fbece04d
    13215 qsort_r(3C) manual synopsis was botched
commit 85f4cb87104c72587029a6e0f1663332c85ba118
    13184 Stop translating ld(1) options through cw(1)
commit 0a36db39c3cd88f4799ecd9db875f43d834d0a81
    13210 Removing multiple links from aggr leaves last link dangling

        Conflicts:
        usr/src/uts/sun4u/opl/unix/Makefile
        usr/src/lib/krb5/plugins/preauth/pkinit/Makefile.com
        usr/src/cmd/rcap/rcapstat/Makefile
        usr/src/cmd/cmd-inet/usr.sbin/snoop/Makefile
        usr/src/cmd/cmd-inet/usr.sbin/Makefile

14 files changed, 14 insertions, 14 deletions

diff --git a/usr/src/ucblib/libcurses/amd64/Makefile b/usr/src/ucblib/libcurses/amd64/Makefile
index e538678e29..d8db69d15c 100644
--- a/usr/src/ucblib/libcurses/amd64/Makefile
+++ b/usr/src/ucblib/libcurses/amd64/Makefile
@@ -27,7 +27,7 @@ include ../Makefile.com
 include ../../../lib/Makefile.lib.64
 
 DYNFLAGS += $(DYNFLAGS64)
-BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
+BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) \
 	-L $(ROOT)/usr/ucblib/$(MACH64) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
 
 .KEEP_STATE:
diff --git a/usr/src/ucblib/libcurses/sparc/Makefile b/usr/src/ucblib/libcurses/sparc/Makefile
index 79054c8e18..75f501557f 100644
--- a/usr/src/ucblib/libcurses/sparc/Makefile
+++ b/usr/src/ucblib/libcurses/sparc/Makefile
@@ -26,7 +26,7 @@
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
-BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
+BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
 
 .KEEP_STATE:
 
diff --git a/usr/src/ucblib/libcurses/sparcv9/Makefile b/usr/src/ucblib/libcurses/sparcv9/Makefile
index e538678e29..d8db69d15c 100644
--- a/usr/src/ucblib/libcurses/sparcv9/Makefile
+++ b/usr/src/ucblib/libcurses/sparcv9/Makefile
@@ -27,7 +27,7 @@ include ../Makefile.com
 include ../../../lib/Makefile.lib.64
 
 DYNFLAGS += $(DYNFLAGS64)
-BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
+BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) \
 	-L $(ROOT)/usr/ucblib/$(MACH64) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
 
 .KEEP_STATE:
diff --git a/usr/src/ucblib/libdbm/amd64/Makefile b/usr/src/ucblib/libdbm/amd64/Makefile
index 20434991fd..5880da6858 100644
--- a/usr/src/ucblib/libdbm/amd64/Makefile
+++ b/usr/src/ucblib/libdbm/amd64/Makefile
@@ -26,7 +26,7 @@
 include ../Makefile.com
 include ../../../lib/Makefile.lib.64
 
-BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
+BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) \
 	-L $(ROOT)/usr/ucblib/$(MACH64) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
 
 .KEEP_STATE:
diff --git a/usr/src/ucblib/libdbm/sparc/Makefile b/usr/src/ucblib/libdbm/sparc/Makefile
index c9b8beb496..85705049e2 100644
--- a/usr/src/ucblib/libdbm/sparc/Makefile
+++ b/usr/src/ucblib/libdbm/sparc/Makefile
@@ -25,7 +25,7 @@
 
 include ../Makefile.com
 
-BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
+BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
 
 .KEEP_STATE:
 
diff --git a/usr/src/ucblib/libdbm/sparcv9/Makefile b/usr/src/ucblib/libdbm/sparcv9/Makefile
index 20434991fd..5880da6858 100644
--- a/usr/src/ucblib/libdbm/sparcv9/Makefile
+++ b/usr/src/ucblib/libdbm/sparcv9/Makefile
@@ -26,7 +26,7 @@
 include ../Makefile.com
 include ../../../lib/Makefile.lib.64
 
-BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
+BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) \
 	-L $(ROOT)/usr/ucblib/$(MACH64) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
 
 .KEEP_STATE:
diff --git a/usr/src/ucblib/librpcsoc/amd64/Makefile b/usr/src/ucblib/librpcsoc/amd64/Makefile
index 49026576ef..562dcca232 100644
--- a/usr/src/ucblib/librpcsoc/amd64/Makefile
+++ b/usr/src/ucblib/librpcsoc/amd64/Makefile
@@ -27,7 +27,7 @@ include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
 DYNFLAGS += $(DYNFLAGS64)
-BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
+BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) \
 	-L $(ROOT)/usr/ucblib/$(MACH64) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
 
 LIBS=	$(DYNLIB)
diff --git a/usr/src/ucblib/librpcsoc/sparc/Makefile b/usr/src/ucblib/librpcsoc/sparc/Makefile
index ebb1fecfe8..8c2e44b15a 100644
--- a/usr/src/ucblib/librpcsoc/sparc/Makefile
+++ b/usr/src/ucblib/librpcsoc/sparc/Makefile
@@ -26,7 +26,7 @@
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
-BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
+BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
 
 LIBS = $(DYNLIB)
 
diff --git a/usr/src/ucblib/librpcsoc/sparcv9/Makefile b/usr/src/ucblib/librpcsoc/sparcv9/Makefile
index 49026576ef..562dcca232 100644
--- a/usr/src/ucblib/librpcsoc/sparcv9/Makefile
+++ b/usr/src/ucblib/librpcsoc/sparcv9/Makefile
@@ -27,7 +27,7 @@ include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
 DYNFLAGS += $(DYNFLAGS64)
-BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
+BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) \
 	-L $(ROOT)/usr/ucblib/$(MACH64) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
 
 LIBS=	$(DYNLIB)
diff --git a/usr/src/ucblib/libtermcap/amd64/Makefile b/usr/src/ucblib/libtermcap/amd64/Makefile
index 4faa7cf698..437abcff88 100644
--- a/usr/src/ucblib/libtermcap/amd64/Makefile
+++ b/usr/src/ucblib/libtermcap/amd64/Makefile
@@ -27,7 +27,7 @@ include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
 DYNFLAGS += $(DYNFLAGS64)
-BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
+BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) \
 	-L $(ROOT)/usr/ucblib/$(MACH64) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
 
 .KEEP_STATE:
diff --git a/usr/src/ucblib/libtermcap/sparc/Makefile b/usr/src/ucblib/libtermcap/sparc/Makefile
index c9b8beb496..85705049e2 100644
--- a/usr/src/ucblib/libtermcap/sparc/Makefile
+++ b/usr/src/ucblib/libtermcap/sparc/Makefile
@@ -25,7 +25,7 @@
 
 include ../Makefile.com
 
-BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
+BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
 
 .KEEP_STATE:
 
diff --git a/usr/src/ucblib/libtermcap/sparcv9/Makefile b/usr/src/ucblib/libtermcap/sparcv9/Makefile
index 4faa7cf698..437abcff88 100644
--- a/usr/src/ucblib/libtermcap/sparcv9/Makefile
+++ b/usr/src/ucblib/libtermcap/sparcv9/Makefile
@@ -27,7 +27,7 @@ include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
 DYNFLAGS += $(DYNFLAGS64)
-BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
+BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) \
 	-L $(ROOT)/usr/ucblib/$(MACH64) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
 
 .KEEP_STATE:
diff --git a/usr/src/ucblib/libucb/amd64/Makefile b/usr/src/ucblib/libucb/amd64/Makefile
index 564565f610..5e1a2ba04a 100644
--- a/usr/src/ucblib/libucb/amd64/Makefile
+++ b/usr/src/ucblib/libucb/amd64/Makefile
@@ -29,7 +29,7 @@ include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
 DYNFLAGS += $(DYNFLAGS64)
-BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
+BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
 
 # amd64-specific rule
 pics/%.o: ../$(MACH)/sys/%.c
diff --git a/usr/src/ucblib/libucb/sparcv9/Makefile b/usr/src/ucblib/libucb/sparcv9/Makefile
index 97883b2a05..5ff8fa00b1 100644
--- a/usr/src/ucblib/libucb/sparcv9/Makefile
+++ b/usr/src/ucblib/libucb/sparcv9/Makefile
@@ -33,7 +33,7 @@ include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
 DYNFLAGS += $(DYNFLAGS64)
-BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
+BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
 BUILD.s=	$(AS) $(ASFLAGS) -xarch=v9 -D__sparcv9 $< -o $@
 
 # sparcv9-specific rule