# HG changeset patch
# User Norm Jacobs <Norm.Jacobs@Oracle.COM>
# Date 1456431830 28800
# Node ID 3b7bb04ece7403fa70753d2d408f3370ce056348
# Parent  a84361b9374b50c7e27fefd57179339ebcf55ec0
22821402 Userland build doesn't need GCC3 references any more.

diff -r a84361b9374b -r 3b7bb04ece74 make-rules/shared-macros.mk
--- a/make-rules/shared-macros.mk	Wed Feb 24 11:36:03 2016 -0600
+++ b/make-rules/shared-macros.mk	Thu Feb 25 12:23:50 2016 -0800
@@ -434,7 +434,6 @@
 
 PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.7.1
 PARFAIT_TOOLS=	$(WS_TOOLS)/$(MACH)/parfait
-PARFAIT_TOOLS_GCC3=	$(PARFAIT_TOOLS)/gcc3
 PARFAIT= $(PARFAIT_ROOT)/bin/parfait
 export PARFAIT_NATIVESUNCC=$(SPRO_VROOT)/bin/cc
 export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC
@@ -442,7 +441,6 @@
 export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++
 
 GCC_ROOT =	/usr/gcc/4.8
-GCC3_ROOT =	/usr/gcc/3.4
 
 CC.studio.32 =	$(SPRO_VROOT)/bin/cc
 CXX.studio.32 =	$(SPRO_VROOT)/bin/CC
@@ -457,12 +455,6 @@
 CC.gcc.64 =	$(GCC_ROOT)/bin/gcc
 CXX.gcc.64 =	$(GCC_ROOT)/bin/g++
 
-CC.gcc3.32 =	$(GCC3_ROOT)/bin/gcc
-CXX.gcc3.32 =	$(GCC3_ROOT)/bin/g++
-
-CC.gcc3.64 =	$(GCC3_ROOT)/bin/gcc
-CXX.gcc3.64 =	$(GCC3_ROOT)/bin/g++
-
 lint.32 =	$(SPRO_VROOT)/bin/lint -m32
 lint.64 =	$(SPRO_VROOT)/bin/lint -m64
 
@@ -479,10 +471,6 @@
 CXX.gcc.32 =	$(PARFAIT_TOOLS)/g++
 CC.gcc.64 =	$(PARFAIT_TOOLS)/gcc
 CXX.gcc.64 =	$(PARFAIT_TOOLS)/g++
-CC.gcc3.32 =	$(PARFAIT_TOOLS_GCC3)/gcc
-CXX.gcc3.32 =	$(PARFAIT_TOOLS_GCC3)/g++
-CC.gcc3.64 =	$(PARFAIT_TOOLS_GCC3)/gcc
-CXX.gcc3.64 =	$(PARFAIT_TOOLS_GCC3)/g++
 LD =		$(PARFAIT_TOOLS)/ld
 endif
 
@@ -823,8 +811,6 @@
 # configure environment.
 CFLAGS.gcc +=	$(gcc_OPT)
 CFLAGS.gcc +=	$(gcc_XREGS)
-CFLAGS.gcc3 +=	$(gcc_OPT)
-CFLAGS.gcc3 +=	$(gcc_XREGS)
 
 # Default GNU C++ compiler flags.  Add the required feature to your Makefile
 # with CXXFLAGS += $(FEATURE_MACRO) and add to the component build with
@@ -833,8 +819,6 @@
 # configure environment.
 CXXFLAGS.gcc +=		$(gcc_OPT)
 CXXFLAGS.gcc +=		$(gcc_XREGS)
-CXXFLAGS.gcc3 +=	$(gcc_OPT)
-CXXFLAGS.gcc3 +=	$(gcc_XREGS)
 
 # Build 32 or 64 bit objects.
 CFLAGS +=	$(CC_BITS)
@@ -1008,9 +992,6 @@
 #
 REQUIRED_PACKAGES += developer/build/gnu-make
 REQUIRED_PACKAGES += developer/build/make
-ifeq ($(COMPILER),gcc3)
-REQUIRED_PACKAGES += developer/gcc-3
-endif
 ifeq ($(COMPILER),gcc)
 REQUIRED_PACKAGES += developer/gcc-48
 endif
diff -r a84361b9374b -r 3b7bb04ece74 tools/Makefile
--- a/tools/Makefile	Wed Feb 24 11:36:03 2016 -0600
+++ b/tools/Makefile	Thu Feb 25 12:23:50 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../make-rules/shared-macros.mk
@@ -44,14 +44,6 @@
 		echo "exec" $(PARFAIT_ROOT)/$(MACH)/parfait-$$i '$$*' >> $(PARFAIT_TOOLS)/$$i ; \
 		chmod +x $(PARFAIT_TOOLS)/$$i ; \
 	done
-	@$(MKDIR) $(PARFAIT_TOOLS_GCC3)
-	@for i in cc CC gcc g++ ld ; do \
-		$(RM) $(PARFAIT_TOOLS_GCC3)/$$i ; \
-		sed \
-		    -e "s,$(GCC_ROOT),$(GCC3_ROOT)," < $(PARFAIT_TOOLS)/$$i \
-		    > $(PARFAIT_TOOLS_GCC3)/$$i ; \
-		chmod +x $(PARFAIT_TOOLS_GCC3)/$$i ; \
-	done
 
 pkglint:
 	@rm -f pkglint
@@ -76,5 +68,5 @@
 
 clobber:	clean
 	@$(RM) time-*.so python/pkglint/*.pyc
-	@$(RM) -r $(PARFAIT_TOOLS) $(PARFAIT_TOOLS_GCC3) $(MACH)
+	@$(RM) -r $(PARFAIT_TOOLS) $(MACH)