44 $(shell $(CPP) -V 2>&1 | sed -n 's/^.*[ ,\t]C++[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p') |
44 $(shell $(CPP) -V 2>&1 | sed -n 's/^.*[ ,\t]C++[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p') |
45 C_COMPILER_REV := \ |
45 C_COMPILER_REV := \ |
46 $(shell $(CC) -V 2>&1 | sed -n 's/^.*[ ,\t]C[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p') |
46 $(shell $(CC) -V 2>&1 | sed -n 's/^.*[ ,\t]C[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p') |
47 |
47 |
48 # Pick which compiler is validated |
48 # Pick which compiler is validated |
49 ifeq ($(JDK_MINOR_VERSION),6) |
49 ifeq ($(JRE_RELEASE_VER),1.6.0) |
50 # Validated compiler for JDK6 is SS11 (5.8) |
50 # Validated compiler for JDK6 is SS11 (5.8) |
51 VALIDATED_COMPILER_REV := 5.8 |
51 VALIDATED_COMPILER_REV := 5.8 |
52 VALIDATED_C_COMPILER_REV := 5.8 |
52 VALIDATED_C_COMPILER_REV := 5.8 |
53 else |
53 else |
54 # Validated compiler for JDK7 is SS12 (5.9) |
54 # Validated compiler for JDK7 is SS12 (5.9) |
99 $(shell uname -r | awk -F. '{ if ($$2 >= 7) print "-DSOLARIS_7_OR_LATER"; }') |
99 $(shell uname -r | awk -F. '{ if ($$2 >= 7) print "-DSOLARIS_7_OR_LATER"; }') |
100 CFLAGS += ${SOLARIS_7_OR_LATER} |
100 CFLAGS += ${SOLARIS_7_OR_LATER} |
101 |
101 |
102 # New architecture options started in SS12 (5.9), we need both styles to build. |
102 # New architecture options started in SS12 (5.9), we need both styles to build. |
103 # The older arch options for SS11 (5.8) or older and also for /usr/ccs/bin/as. |
103 # The older arch options for SS11 (5.8) or older and also for /usr/ccs/bin/as. |
104 # Note: SS12 default for 32bit sparc is now the same as v8plus, so the |
104 # Note: default for 32bit sparc is now the same as v8plus, so the |
105 # settings below have changed all SS12 32bit sparc builds to be v8plus. |
105 # settings below have changed all 32bit sparc builds to be v8plus. |
106 # The older SS11 (5.8) settings have remained as they always have been. |
106 ARCHFLAG_OLD/sparc = -xarch=v8plus |
107 ifeq ($(TYPE),COMPILER2) |
|
108 ARCHFLAG_OLD/sparc = -xarch=v8plus |
|
109 else |
|
110 ifeq ($(TYPE),TIERED) |
|
111 ARCHFLAG_OLD/sparc = -xarch=v8plus |
|
112 else |
|
113 ARCHFLAG_OLD/sparc = -xarch=v8 |
|
114 endif |
|
115 endif |
|
116 ARCHFLAG_NEW/sparc = -m32 -xarch=sparc |
107 ARCHFLAG_NEW/sparc = -m32 -xarch=sparc |
117 ARCHFLAG_OLD/sparcv9 = -xarch=v9 |
108 ARCHFLAG_OLD/sparcv9 = -xarch=v9 |
118 ARCHFLAG_NEW/sparcv9 = -m64 -xarch=sparc |
109 ARCHFLAG_NEW/sparcv9 = -m64 -xarch=sparc |
119 ARCHFLAG_OLD/i486 = |
110 ARCHFLAG_OLD/i486 = |
120 ARCHFLAG_NEW/i486 = -m32 |
111 ARCHFLAG_NEW/i486 = -m32 |