7 files changed, 13 insertions, 28 deletions
diff --git a/usr/src/cmd/getconf/Makefile b/usr/src/cmd/getconf/Makefile
index 4bda27dd84..8fb8d5d192 100644
--- a/usr/src/cmd/getconf/Makefile
+++ b/usr/src/cmd/getconf/Makefile
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -68,7 +68,6 @@ $(XPG4) := CFLAGS += -D_XOPEN_SOURCE -I$(SRC)/lib/libc/inc
 # if we use the c89 utility as opposed to cc.
 
 XPG6MODE = $(C99_ENABLE)
-$(__GNUC)XPG6MODE = $(C99_ENABLE)
 $(XPG6) := C99MODE = $(XPG6MODE)
 $(XPG6) := CFLAGS += -D_XOPEN_SOURCE=600 -I$(SRC)/lib/libc/inc
 
diff --git a/usr/src/cmd/lp/Makefile.lp b/usr/src/cmd/lp/Makefile.lp
index e153488730..f31a2e529e 100644
--- a/usr/src/cmd/lp/Makefile.lp
+++ b/usr/src/cmd/lp/Makefile.lp
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
@@ -96,8 +96,8 @@ LINTSEC	=	$(LPLIB)/secure/llib-llpsec.ln
 LINTSYS	=	$(LPLIB)/systems/llib-llpsys.ln
 LINTUSR	=	$(LPLIB)/users/llib-llpusr.ln
 
-$(__GNUC)CFLAGS += -_gcc=-fwritable-strings -_gcc=-Wno-sequence-points
-$(__GNUC)CFLAGS64 += -_gcc=-fwritable-strings -_gcc=-Wno-sequence-points
+CFLAGS += -_gcc=-fwritable-strings -_gcc=-Wno-sequence-points
+CFLAGS64 += -_gcc=-fwritable-strings -_gcc=-Wno-sequence-points
 
 all:=           TARGET= all
 install:=       TARGET= install
diff --git a/usr/src/cmd/rpld/Makefile b/usr/src/cmd/rpld/Makefile
index b704d3b4ff..27c5748dc2 100644
--- a/usr/src/cmd/rpld/Makefile
+++ b/usr/src/cmd/rpld/Makefile
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -38,7 +38,7 @@ OBJS= 	rpld.o llcsetup.o debug.o sighandler.o params.o \
 LIBOBJS=	dl_open.o dl_bind.o dl_snd.o dl_rcv.o dl_addr.o dl_close.o \
 	 	dl_unbind.o dl_attach.o dl_info.o dl_error.o
 
-$(__GNUC)rplin.o :=	CFLAGS += -_gcc=-Wno-return-type
+rplin.o :=	CFLAGS += -_gcc=-Wno-return-type
 
 LIBDLA= 	libdla.a
 
diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com
index 96544e7e7c..ed6944e5a3 100644
--- a/usr/src/lib/libc/i386/Makefile.com
+++ b/usr/src/lib/libc/i386/Makefile.com
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -917,7 +917,6 @@ CFLAGS += $(CCVERBOSE) $(CTF_FLAGS)
 # This is necessary to avoid problems with calling _ex_unwind().
 # We probably don't want any inlining anyway.
 XINLINE = -xinline=
-$(__GNUC)XINLINE =
 CFLAGS += $(XINLINE)
 
 # Setting THREAD_DEBUG = -DTHREAD_DEBUG (make THREAD_DEBUG=-DTHREAD_DEBUG ...)
@@ -952,10 +951,6 @@ DYNFLAGS +=	$(SPECMAPFILE:%=-M %) $(PGA_MAPFILE:%=-M %) $(NX_MAP:%=-M%) \
 		-e __rtboot -M $(MAPFILE) $(RTLDINFO)
 DYNFLAGS +=	$(EXTN_DYNFLAGS)
 
-# special case for fp/fpsetsticky.s
-$(__GNUC)pics/fpsetsticky.o := \
-	ASFLAGS += --no-warn
-
 BUILD.s=	$(AS) $(ASFLAGS) $< -o $@
 
 # Override this top level flag so the compiler builds in its native
@@ -1055,7 +1050,6 @@ TIL=				\
 	unwind.o
 
 THREADS_INLINES = $(LIBCBASE)/threads/i386.il
-$(__GNUC)THREADS_INLINES =
 $(TIL:%=pics/%) := CFLAGS += $(THREADS_INLINES)
 
 # pics/mul64.o := CFLAGS += $(LIBCBASE)/crt/mul64.il
diff --git a/usr/src/lib/openssl/Makefile.openssl b/usr/src/lib/openssl/Makefile.openssl
index 954963b2f6..50f70c6435 100644
--- a/usr/src/lib/openssl/Makefile.openssl
+++ b/usr/src/lib/openssl/Makefile.openssl
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -83,4 +83,4 @@ OPENSSL_LDFLAGS +=	-L$(PARENT_ROOT)$(SFWLIBDIR)
 OPENSSL_LDFLAGS +=	-L$(SFWLIBDIR)
 
 OPENSSL_DYNFLAGS =	-R $(SFWLIBDIR)
-$(__GNUC)CFLAGS += -_gcc=-fasm
+CFLAGS += -_gcc=-fasm
diff --git a/usr/src/uts/intel/aac/Makefile b/usr/src/uts/intel/aac/Makefile
index 393d744abf..060fadc94f 100644
--- a/usr/src/uts/intel/aac/Makefile
+++ b/usr/src/uts/intel/aac/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -38,15 +38,11 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 #
 # 	Overrides
 #
-CFLAGS_CPP_COMMENTS = -xCC
-$(__GNUC)CFLAGS_CPP_COMMENTS =
-
-CFLAGS += $(CFLAGS_CPP_COMMENTS)
 
 #
 #	Default build targets.
 #
-#.KEEP_STATE:
+.KEEP_STATE:
 
 def:		$(DEF_DEPS)
 
diff --git a/usr/src/uts/intel/amr/Makefile b/usr/src/uts/intel/amr/Makefile
index 951ee4039e..7c8ab45a65 100644
--- a/usr/src/uts/intel/amr/Makefile
+++ b/usr/src/uts/intel/amr/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -38,15 +38,11 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 #
 #	Overrides
 #
-CFLAGS_CPP_COMMENTS = -xCC
-$(__GNUC)CFLAGS_CPP_COMMENTS =
-
-CFLAGS += $(CFLAGS_CPP_COMMENTS)
 
 #
 #	Default build targets.
 #
-#.KEEP_STATE:
+.KEEP_STATE:
 
 def:		$(DEF_DEPS)