diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/Makefile.master | 20 | ||||
| -rw-r--r-- | usr/src/Makefile.master.64 | 8 |
2 files changed, 22 insertions, 6 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 3494fe075c..31970c582f 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -116,6 +116,13 @@ __GNUC64= $(__GNUC) # to the 'next' version of the Sun Studio compiler to be used. __SSNEXT= $(POUND_SIGN) +# set __GNUC4 in the environment to build with GCC 4.4 These two variables are +# operative even when __GNUC is not, as they affect flags that will be used by +# the shadow compile. +__GNUC3= +__GNUC4= $(POUND_SIGN) +$(__GNUC4)__GNUC3= $(POUND_SIGN) + # CLOSED is the root of the tree that contains source which isn't released # as open source CLOSED= $(SRC)/../closed @@ -133,6 +140,11 @@ SFWINCDIR= $(SFW_ROOT)/include SFWLIBDIR= $(SFW_ROOT)/lib SFWLIBDIR64= $(SFW_ROOT)/lib/$(MACH64) +$(__GNUC3)GCC_ROOT= $(SFW_ROOT) +$(__GNUC4)GCC_ROOT= /opt/gcc/4.4.4 +GCCLIBDIR= $(GCC_ROOT)/lib +GCCLIBDIR64= $(GCC_ROOT)/lib/$(MACH64) + RPCGEN= /usr/bin/rpcgen STABS= $(ONBLD_TOOLS)/bin/$(MACH)/stabs ELFEXTRACT= $(ONBLD_TOOLS)/bin/$(MACH)/elfextract @@ -378,6 +390,10 @@ CERRWARN = -errtags=yes -errwarn=%all CERRWARN += -erroff=E_EMPTY_TRANSLATION_UNIT CERRWARN += -erroff=E_STATEMENT_NOT_REACHED +# Normally cw(1) would translate -v into a set of options including these +# but as they're GCC 4.x specific, we can't do that +$(__GNUC4)CERRWARN += -_gcc=-Wno-address + # # turn warnings into errors (C++) CCERRWARN= -xwe @@ -640,7 +656,7 @@ COMPILE.java= $(JAVAC) $(JAVAFLAGS) -classpath $(CLASSPATH) # Link time macros # CCNEEDED = -lC -$(__GNUC)CCNEEDED = -L$(SFWLIBDIR) -R$(SFWLIBDIR) -lstdc++ -lgcc_s +$(__GNUC)CCNEEDED = -L$(GCCLIBDIR) -R$(GCCLIBDIR) -lstdc++ -lgcc_s LINK.c= $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) LINK64.c= $(CC) $(CFLAGS64) $(CPPFLAGS) $(LDFLAGS) @@ -730,7 +746,6 @@ sparcv9_AS= /usr/ccs/bin/as -xregsym=no sparcv9_LD= /usr/ccs/bin/ld sparcv9_LINT= $(SPRO_ROOT)/sunstudio12.1/bin/lint -# We compile 32-bit objects with cc by default i386_CC= $(ONBLD_TOOLS)/bin/$(MACH)/cw -_cc $(__GNUC)i386_CC= $(ONBLD_TOOLS)/bin/$(MACH)/cw -_gcc i386_CCC= $(ONBLD_TOOLS)/bin/$(MACH)/cw -_CC @@ -741,7 +756,6 @@ $(__GNUC)i386_AS= $(ONBLD_TOOLS)/bin/$(MACH)/aw i386_LD= /usr/ccs/bin/ld i386_LINT= $(SPRO_ROOT)/sunstudio12.1/bin/lint -# We compile 64-bit objects with gcc amd64_CC= $(ONBLD_TOOLS)/bin/$(MACH)/cw -_cc $(__GNUC64)amd64_CC= $(ONBLD_TOOLS)/bin/$(MACH)/cw -_gcc amd64_CCC= $(ONBLD_TOOLS)/bin/$(MACH)/cw -_CC diff --git a/usr/src/Makefile.master.64 b/usr/src/Makefile.master.64 index f48eefb29a..db5a45031b 100644 --- a/usr/src/Makefile.master.64 +++ b/usr/src/Makefile.master.64 @@ -54,9 +54,10 @@ LDLIBS.cmd = $(LDLIBS64) LDLIBS.lib = $(LDLIBS64) # -# Override Makefile.master's settings of SFWLIBDIR +# Override Makefile.master's settings of SFWLIBDIR and GCCLIBDIR # SFWLIBDIR= $(SFWLIBDIR64) +GCCLIBDIR= $(GCCLIBDIR64) # # Override Makefile.master's settings of CC, CCC, AS and LINT @@ -80,8 +81,9 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \ MAPFILECLASS= -64 CCNEEDED = -lCrun -$(__GNUC64)CCNEEDED = -L$(SFWLIBDIR) -R$(SFWLIBDIR) -lstdc++ \ - -lgcc_s_$(MACH64) +$(__GNUC64)CCNEEDED = -L$(GCCLIBDIR) -R$(GCCLIBDIR) -lstdc++ +$(__GNUC64)$(__GNUC3)CCNEEDED += -lgcc_s_$(MACH64) +$(__GNUC64)$(__GNUC4)CCNEEDED += -lgcc_s BUILDCCC.SO= $(CCC) $(CCFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) \ $(PICS) $(EXTPICS) $(LDLIBS) $(CCNEEDED) |