backout 6311077: causes 6453635, due to 6454083

12 files changed, 27 insertions, 58 deletions

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index a9d5860eb9..e087f4791b 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -279,8 +279,6 @@ V9ABIWARN=
 CCREGSYM=		-Wc,-Qiselect-regsym=0
 CCCREGSYM=		-Qoption cg -Qiselect-regsym=0
 
-# prevent static symbols being optimized out
-CCSTATICSYM=		-Wc,-Qassembler-ounrefsym=0
 #
 # generate 32-bit addresses in the v9 kernel. Saves memory.
 CCABS32=		-Wc,-xcode=abs32
@@ -360,8 +358,7 @@ C99LMODE=	$(C99MODE:-xc99%=-Xc99%)
 # In most places, assignments to these macros should be appended with +=
 # (CPPFLAGS.master allows values to be prepended to CPPFLAGS).
 sparc_CFLAGS=	$(sparc_XARCH)
-sparcv9_CFLAGS=	$(sparcv9_XARCH) -dalign $(CCVERBOSE) $(V9ABIWARN) $(CCREGSYM) \
-		$(CCSTATICSYM)
+sparcv9_CFLAGS=	$(sparcv9_XARCH) -dalign $(CCVERBOSE) $(V9ABIWARN) $(CCREGSYM)
 i386_CFLAGS=	$(i386_XARCH)
 amd64_CFLAGS=	$(amd64_XARCH)
 
@@ -400,18 +397,12 @@ CDWARFSTR=	-_gcc=-fno-dwarf2-indirect-strings
 CALLSYMS=	-W0,-xdbggen=no%usedonly
 
 #
-# Default debug format for Sun Studio 11 is dwarf, so force it to
-# generate stabs.
-#
-DEBUGFORMAT=	-xdebugformat=stabs
-
-#
 # Flags used to build in debug mode for ctf generation.  Bugs in the Devpro
 # compilers currently prevent us from building with cc-emitted DWARF.
 #
 CTF_FLAGS_sparc	= -g -Wc,-Qiselect-T1 $(C99MODE) $(CNOGLOBAL) $(CDWARFSTR)
 CTF_FLAGS_i386	= -g $(C99MODE) $(CNOGLOBAL) $(CDWARFSTR)
-CTF_FLAGS	= $(CTF_FLAGS_$(MACH)) $(DEBUGFORMAT)
+CTF_FLAGS	= $(CTF_FLAGS_$(MACH))
 
 #
 # Flags used with genoffsets
@@ -429,27 +420,14 @@ OFFSETS_CREATE64 = $(GENOFFSETS) -s $(CTFSTABS) -r $(CTFCONVERT) \
 #
 # tradeoff time for space (smaller is better)
 #
-sparc_SPACEFLAG		= -xspace -W0,-Lt
-sparcv9_SPACEFLAG	= -xspace -W0,-Lt
+sparc_SPACEFLAG		= -xspace -W0,-Lt -W2,-Rcond_elim
+sparcv9_SPACEFLAG	= -xspace -W0,-Lt -W2,-Rcond_elim
 i386_SPACEFLAG		= -xspace
 amd64_SPACEFLAG		=
 
 SPACEFLAG		= $($(MACH)_SPACEFLAG)
 SPACEFLAG64		= $($(MACH64)_SPACEFLAG)
 
-#
-# The Sun Studio 11 compiler has changed the behaviour of integer
-# wrap arounds and so a flag is needed to use the legacy behaviour
-# (without this flag panics/hangs could be exposed within the source).
-#
-sparc_IROPTFLAG		= -W2,-xwrap_int
-sparcv9_IROPTFLAG	= -W2,-xwrap_int
-i386_IROPTFLAG		=
-amd64_IROPTFLAG		=
-
-IROPTFLAG		= $($(MACH)_IROPTFLAG)
-IROPTFLAG64		= $($(MACH64)_IROPTFLAG)
-
 sparc_XREGSFLAG		= -xregs=no%appl
 sparcv9_XREGSFLAG	= -xregs=no%appl
 i386_XREGSFLAG		=
@@ -459,10 +437,10 @@ XREGSFLAG		= $($(MACH)_XREGSFLAG)
 XREGSFLAG64		= $($(MACH64)_XREGSFLAG)
 
 CFLAGS=         $(COPTFLAG) $($(MACH)_CFLAGS) $(SPACEFLAG) $(CCMODE) \
-		$(ILDOFF) $(CERRWARN) $(C99MODE) $(CCUNBOUND) $(IROPTFLAG) \
+		$(ILDOFF) $(CERRWARN) $(C99MODE) $(CCUNBOUND) \
 		$(CGLOBALSTATIC)
 CFLAGS64=       $(COPTFLAG64) $($(MACH64)_CFLAGS) $(SPACEFLAG64) $(CCMODE64) \
-		$(ILDOFF) $(CERRWARN) $(C99MODE) $(CCUNBOUND) $(IROPTFLAG64) \
+		$(ILDOFF) $(CERRWARN) $(C99MODE) $(CCUNBOUND) \
 		$(CGLOBALSTATIC)
 NATIVE_CFLAGS=	$(COPTFLAG) $($(NATIVE_MACH)_CFLAGS) $(CCMODE) \
 		$(ILDOFF) $(CERRWARN) $(C99MODE) $($(NATIVE_MACH)_CCUNBOUND) \
@@ -613,7 +591,7 @@ NATIVE_MACH=	$(MACH:amd64=i386)
 # Defined here so it can be overridden by developer.
 #
 SPRO_ROOT=		$(BUILD_TOOLS)/SUNWspro
-SPRO_VROOT=		$(SPRO_ROOT)/SS11
+SPRO_VROOT=		$(SPRO_ROOT)/SOS10
 GNU_ROOT=		$(SFW_ROOT)
 
 # Specify platform compiler versions for languages
diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
index 97a7440871..5d3e211f97 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
@@ -220,6 +220,8 @@ include $(REL_PATH)/../../Makefile.lib
 # Must come after Makefile.lib so CPPFLAGS doesn't get overwritten
 include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5
 
+sparcv9_C_PICFLAGS =  -K PIC
+
 K5LIBLINK=$(LIBRARY:%.a=lib%.so)
 
 # override default text domain
diff --git a/usr/src/lib/gss_mechs/mech_krb5/sparc/Makefile b/usr/src/lib/gss_mechs/mech_krb5/sparc/Makefile
index 4a270806e9..b56364c572 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/sparc/Makefile
+++ b/usr/src/lib/gss_mechs/mech_krb5/sparc/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -27,8 +27,6 @@
 
 include ../Makefile.com
 
-sparc_C_PICFLAGS = $(C_BIGPICFLAGS)
-
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/gss_mechs/mech_krb5/sparcv9/Makefile b/usr/src/lib/gss_mechs/mech_krb5/sparcv9/Makefile
index cce46ce8d9..408d1fc9f5 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/sparcv9/Makefile
+++ b/usr/src/lib/gss_mechs/mech_krb5/sparcv9/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -28,8 +28,6 @@
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
-sparcv9_C_PICFLAGS = $(C_BIGPICFLAGS64)
-
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/psm/stand/boot/i386/Makefile.com b/usr/src/psm/stand/boot/i386/Makefile.com
index 06e00ac095..a57dd079a2 100644
--- a/usr/src/psm/stand/boot/i386/Makefile.com
+++ b/usr/src/psm/stand/boot/i386/Makefile.com
@@ -2,8 +2,9 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -113,10 +114,6 @@ CFLAGS	+=	-xcache=0/16/0:0/16/0
 # This should be globally enabled!
 #
 CFLAGS	+=	$(CCVERBOSE)
-#
-# Inherit the debug format
-#
-CFLAGS	+=	$(DEBUGFORMAT)
 
 YFLAGS	=	-d
 
diff --git a/usr/src/tools/cw/cw.c b/usr/src/tools/cw/cw.c
index 933ee9cf56..29fc29e4d5 100644
--- a/usr/src/tools/cw/cw.c
+++ b/usr/src/tools/cw/cw.c
@@ -1636,10 +1636,10 @@ main(int argc, char **argv)
 	if ((dir = getenv("SPRO_VROOT")) != NULL) {
 		(void) snprintf(cc_buf, MAXPATHLEN, "%s/bin", dir);
 	} else if ((dir = getenv("SPRO_ROOT")) != NULL) {
-		(void) snprintf(cc_buf, MAXPATHLEN, "%s/SS11/bin", dir);
+		(void) snprintf(cc_buf, MAXPATHLEN, "%s/SOS10/bin", dir);
 	} else if ((dir = getenv("BUILD_TOOLS")) != NULL) {
 		(void) snprintf(cc_buf, MAXPATHLEN,
-		    "%s/SUNWspro/SS11/bin", dir);
+		    "%s/SUNWspro/SOS10/bin", dir);
 	}
 	if (dir != NULL) {
 		dirs[CIDX(CW_C_CC, 0)] = (const char *)cc_buf;
diff --git a/usr/src/uts/sparc/Makefile.sparc.shared b/usr/src/uts/sparc/Makefile.sparc.shared
index 2d5b42389c..a69908f463 100644
--- a/usr/src/uts/sparc/Makefile.sparc.shared
+++ b/usr/src/uts/sparc/Makefile.sparc.shared
@@ -137,8 +137,6 @@ CFLAGS		+= $(CTF_FLAGS)
 CFLAGS		+= $(C99MODE)
 CFLAGS		+= $(CCUNBOUND)
 CFLAGS		+= $(CGLOBALSTATIC)
-CFLAGS		+= $(CCSTATICSYM)
-CFLAGS		+= $(IROPTFLAG)
 CFLAGS		+= -xregs=no%float
 
 ASFLAGS		+= $(XARCH)
diff --git a/usr/src/uts/sun4u/Makefile.sun4u.shared b/usr/src/uts/sun4u/Makefile.sun4u.shared
index 1dfc2fe6fb..7288c1582e 100644
--- a/usr/src/uts/sun4u/Makefile.sun4u.shared
+++ b/usr/src/uts/sun4u/Makefile.sun4u.shared
@@ -206,8 +206,6 @@ CFLAGS		+= $(CTF_FLAGS)
 CFLAGS		+= $(C99MODE)
 CFLAGS		+= $(CCUNBOUND)
 CFLAGS		+= $(CGLOBALSTATIC)
-CFLAGS		+= $(CCSTATICSYM)
-CFLAGS		+= $(IROPTFLAG)
 CFLAGS		+= -xregs=no%float
 
 ASFLAGS		+= $(AS_XARCH)
diff --git a/usr/src/uts/sun4v/Makefile.sun4v.shared b/usr/src/uts/sun4v/Makefile.sun4v.shared
index 26ed893c1d..57e79a9720 100644
--- a/usr/src/uts/sun4v/Makefile.sun4v.shared
+++ b/usr/src/uts/sun4v/Makefile.sun4v.shared
@@ -168,8 +168,6 @@ CFLAGS		+= $(CTF_FLAGS)
 CFLAGS		+= $(C99MODE)
 CFLAGS		+= $(CCUNBOUND)
 CFLAGS		+= $(CGLOBALSTATIC)
-CFLAGS		+= $(CCSTATICSYM)
-CFLAGS		+= $(IROPTFLAG)
 CFLAGS		+= -xregs=no%float
 CPPFLAGS	+= -DGLREG
 
diff --git a/usr/src/uts/sun4v/arcfour/Makefile b/usr/src/uts/sun4v/arcfour/Makefile
index 0a7abb5b3f..55b9b59470 100644
--- a/usr/src/uts/sun4v/arcfour/Makefile
+++ b/usr/src/uts/sun4v/arcfour/Makefile
@@ -2,8 +2,9 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -21,7 +22,7 @@
 #
 # uts/sun4v/arcfour/Makefile
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -79,7 +80,7 @@ COPTIMIZE	= -xO5 -xbuiltin=%all
 #
 # Override the default -xspace setting
 #
-sparc_SPACEFLAG	= -W0,-Lt
+sparc_SPACEFLAG	= -W0,-Lt -W2,-Rcond_elim
 
 #
 #	Default build targets.
diff --git a/usr/src/uts/sun4v/arcfour2048/Makefile b/usr/src/uts/sun4v/arcfour2048/Makefile
index 3cd7b549d1..dcbb88d920 100644
--- a/usr/src/uts/sun4v/arcfour2048/Makefile
+++ b/usr/src/uts/sun4v/arcfour2048/Makefile
@@ -2,8 +2,9 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -69,7 +70,7 @@ COPTIMIZE	= -xO5 -xbuiltin=%all
 #
 # Override the default -xspace setting
 #
-sparc_SPACEFLAG	= -W0,-Lt
+sparc_SPACEFLAG	= -W0,-Lt -W2,-Rcond_elim
 
 #
 # Turn on doubleword alignment for 64 bit registers
diff --git a/usr/src/uts/sun4v/md5/Makefile b/usr/src/uts/sun4v/md5/Makefile
index 535be83119..e99af50999 100644
--- a/usr/src/uts/sun4v/md5/Makefile
+++ b/usr/src/uts/sun4v/md5/Makefile
@@ -65,7 +65,7 @@ CFLAGS += $(CCVERBOSE)
 #
 # Override the default -xspace setting
 #
-sparc_SPACEFLAG	= -W0,-Lt
+sparc_SPACEFLAG	= -W0,-Lt -W2,-Rcond_elim
 
 #
 # md5 depends on the kcf framework