--- a/usr/src/cmd/getconf/Makefile Wed Jan 25 14:52:02 2006 -0800
+++ b/usr/src/cmd/getconf/Makefile Wed Jan 25 15:13:08 2006 -0800
@@ -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 @@
# 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
--- a/usr/src/cmd/lp/Makefile.lp Wed Jan 25 14:52:02 2006 -0800
+++ b/usr/src/cmd/lp/Makefile.lp Wed Jan 25 15:13:08 2006 -0800
@@ -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 @@
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
--- a/usr/src/cmd/rpld/Makefile Wed Jan 25 14:52:02 2006 -0800
+++ b/usr/src/cmd/rpld/Makefile Wed Jan 25 15:13:08 2006 -0800
@@ -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 @@
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
--- a/usr/src/lib/libc/i386/Makefile.com Wed Jan 25 14:52:02 2006 -0800
+++ b/usr/src/lib/libc/i386/Makefile.com Wed Jan 25 15:13:08 2006 -0800
@@ -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 @@
# 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 @@
-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 @@
unwind.o
THREADS_INLINES = $(LIBCBASE)/threads/i386.il
-$(__GNUC)THREADS_INLINES =
$(TIL:%=pics/%) := CFLAGS += $(THREADS_INLINES)
# pics/mul64.o := CFLAGS += $(LIBCBASE)/crt/mul64.il
--- a/usr/src/lib/openssl/Makefile.openssl Wed Jan 25 14:52:02 2006 -0800
+++ b/usr/src/lib/openssl/Makefile.openssl Wed Jan 25 15:13:08 2006 -0800
@@ -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$(SFWLIBDIR)
OPENSSL_DYNFLAGS = -R $(SFWLIBDIR)
-$(__GNUC)CFLAGS += -_gcc=-fasm
+CFLAGS += -_gcc=-fasm
--- a/usr/src/uts/intel/aac/Makefile Wed Jan 25 14:52:02 2006 -0800
+++ b/usr/src/uts/intel/aac/Makefile Wed Jan 25 15:13:08 2006 -0800
@@ -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 @@
#
# Overrides
#
-CFLAGS_CPP_COMMENTS = -xCC
-$(__GNUC)CFLAGS_CPP_COMMENTS =
-
-CFLAGS += $(CFLAGS_CPP_COMMENTS)
#
# Default build targets.
#
-#.KEEP_STATE:
+.KEEP_STATE:
def: $(DEF_DEPS)
--- a/usr/src/uts/intel/amr/Makefile Wed Jan 25 14:52:02 2006 -0800
+++ b/usr/src/uts/intel/amr/Makefile Wed Jan 25 15:13:08 2006 -0800
@@ -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 @@
#
# Overrides
#
-CFLAGS_CPP_COMMENTS = -xCC
-$(__GNUC)CFLAGS_CPP_COMMENTS =
-
-CFLAGS += $(CFLAGS_CPP_COMMENTS)
#
# Default build targets.
#
-#.KEEP_STATE:
+.KEEP_STATE:
def: $(DEF_DEPS)