[csw-devel] SF.net SVN: gar:[9364] csw/mgar/gar/v2/gar.conf.mk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Mar 25 16:08:01 CET 2010


Revision: 9364
          http://gar.svn.sourceforge.net/gar/?rev=9364&view=rev
Author:   dmichelsen
Date:     2010-03-25 15:08:00 +0000 (Thu, 25 Mar 2010)

Log Message:
-----------
mGAR v2: Add suport for Sun Studio 12u1

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.conf.mk

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2010-03-25 13:34:37 UTC (rev 9363)
+++ csw/mgar/gar/v2/gar.conf.mk	2010-03-25 15:08:00 UTC (rev 9364)
@@ -78,12 +78,12 @@
 
 # Select compiler
 # GARCOMPILER can be either GNU/SUN which selects the default
-# Sun or GNU compiler, or the specific verions SOS11/SOS12/GCC3/GCC4
+# Sun or GNU compiler, or the specific verions SOS11/SOS12/SOS12U1/GCC3/GCC4
 
 GARCOMPILER ?= SUN
 
 # We have parameters for the following compilers
-GARCOMPILERS = GCC3 GCC4 SOS11 SOS12
+GARCOMPILERS = GCC3 GCC4 SOS11 SOS12 SOS12U1
 
 ifeq ($(GARCOMPILER),SUN)
   GARCOMPILER = SOS12
@@ -207,107 +207,124 @@
 # code can not be compiled for the requested architecture.
 # The MEMORYMODEL_$ARCH is e.g. used for the directoryname to set
 # libdir/pkgconfdir to /usr/lib/$MEMORYMODEL
-ARCHFLAGS_SOS11_sparcv9+fmuladd  = ERROR
-ARCHFLAGS_SOS12_sparcv9+fmuladd  = -m64 -xarch=sparcfmaf -fma=fused
- ARCHFLAGS_GCC3_sparcv9+fmuladd  = ERROR
- ARCHFLAGS_GCC4_sparcv9+fmuladd  = ERROR
-    MEMORYMODEL_sparcv9+fmuladd  = 64
+  ARCHFLAGS_SOS11_sparcv9+fmuladd = ERROR
+  ARCHFLAGS_SOS12_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused
+ARCHFLAGS_SOS12U1_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused
+   ARCHFLAGS_GCC3_sparcv9+fmuladd = ERROR
+   ARCHFLAGS_GCC4_sparcv9+fmuladd = ERROR
+      MEMORYMODEL_sparcv9+fmuladd = 64
 
-ARCHFLAGS_SOS11_sparcv9+vis2     = -xarch=v9b
-ARCHFLAGS_SOS12_sparcv9+vis2     = -m64 -xarch=sparcvis2
- ARCHFLAGS_GCC3_sparcv9+vis2     = ERROR
- ARCHFLAGS_GCC4_sparcv9+vis2     = ERROR
-    MEMORYMODEL_sparcv9+vis2     = 64
+     ARCHFLAGS_SOS11_sparcv9+vis2 = -xarch=v9b
+     ARCHFLAGS_SOS12_sparcv9+vis2 = -m64 -xarch=sparcvis2
+   ARCHFLAGS_SOS12U1_sparcv9+vis2 = -m64 -xarch=sparcvis2
+      ARCHFLAGS_GCC3_sparcv9+vis2 = ERROR
+      ARCHFLAGS_GCC4_sparcv9+vis2 = ERROR
+         MEMORYMODEL_sparcv9+vis2 = 64
 
-ARCHFLAGS_SOS11_sparcv9+vis      = -xarch=v9a
-ARCHFLAGS_SOS12_sparcv9+vis      = -m64 -xarch=sparcvis
- ARCHFLAGS_GCC3_sparcv9+vis      = -m64 -mcpu=ultrasparc -mvis
- ARCHFLAGS_GCC4_sparcv9+vis      = -m64 -mcpu=ultrasparc -mvis
-    MEMORYMODEL_sparcv9+vis      = 64
+      ARCHFLAGS_SOS11_sparcv9+vis = -xarch=v9a
+      ARCHFLAGS_SOS12_sparcv9+vis = -m64 -xarch=sparcvis
+    ARCHFLAGS_SOS12U1_sparcv9+vis = -m64 -xarch=sparcvis
+       ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis
+       ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis
+          MEMORYMODEL_sparcv9+vis = 64
 
-ARCHFLAGS_SOS11_sparcv9          = -xarch=v9
-ARCHFLAGS_SOS12_sparcv9          = -m64 -xarch=sparc
- ARCHFLAGS_GCC3_sparcv9          = -m64 -mcpu=v9
- ARCHFLAGS_GCC4_sparcv9          = -m64 -mcpu=v9
-    MEMORYMODEL_sparcv9          = 64
+          ARCHFLAGS_SOS11_sparcv9 = -xarch=v9
+          ARCHFLAGS_SOS12_sparcv9 = -m64 -xarch=sparc
+        ARCHFLAGS_SOS12U1_sparcv9 = -m64 -xarch=sparc
+           ARCHFLAGS_GCC3_sparcv9 = -m64 -mcpu=v9
+           ARCHFLAGS_GCC4_sparcv9 = -m64 -mcpu=v9
+              MEMORYMODEL_sparcv9 = 64
 
-ARCHFLAGS_SOS11_sparcv8plus+fmuladd  = ERROR
-ARCHFLAGS_SOS12_sparcv8plus+fmuladd  = -m32 -xarch=xparcfmaf -fma=fused
- ARCHFLAGS_GCC3_sparcv8plus+fmuladd  = ERROR
- ARCHFLAGS_GCC4_sparcv8plus+fmuladd  = ERROR
-    MEMORYMODEL_sparcv8plus+fmuladd  = 32
+  ARCHFLAGS_SOS11_sparcv8plus+fmuladd = ERROR
+  ARCHFLAGS_SOS12_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused
+ARCHFLAGS_SOS12U1_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused
+   ARCHFLAGS_GCC3_sparcv8plus+fmuladd = ERROR
+   ARCHFLAGS_GCC4_sparcv8plus+fmuladd = ERROR
+      MEMORYMODEL_sparcv8plus+fmuladd = 32
 
-ARCHFLAGS_SOS11_sparcv8plus+vis2 = -xarch=v8plusb
-ARCHFLAGS_SOS12_sparcv8plus+vis2 = -m32 -xarch=sparcvis2
- ARCHFLAGS_GCC3_sparcv8plus+vis2 = ERROR
- ARCHFLAGS_GCC4_sparcv8plus+vis2 = ERROR
-    MEMORYMODEL_sparcv8plus+vis2 = 32
+  ARCHFLAGS_SOS11_sparcv8plus+vis2 = -xarch=v8plusb
+  ARCHFLAGS_SOS12_sparcv8plus+vis2 = -m32 -xarch=sparcvis2
+ARCHFLAGS_SOS12U1_sparcv8plus+vis2 = -m32 -xarch=sparcvis2
+   ARCHFLAGS_GCC3_sparcv8plus+vis2 = ERROR
+   ARCHFLAGS_GCC4_sparcv8plus+vis2 = ERROR
+      MEMORYMODEL_sparcv8plus+vis2 = 32
 
-ARCHFLAGS_SOS11_sparcv8plus+vis  = -xarch=v8plusa
-ARCHFLAGS_SOS12_sparcv8plus+vis  = -m32 -xarch=sparcvis
- ARCHFLAGS_GCC3_sparcv8plus+vis  = -mcpu=v8 -mvis
- ARCHFLAGS_GCC4_sparcv8plus+vis  = -mcpu=v8 -mvis
-    MEMORYMODEL_sparcv8plus+vis  = 32
+  ARCHFLAGS_SOS11_sparcv8plus+vis = -xarch=v8plusa
+  ARCHFLAGS_SOS12_sparcv8plus+vis = -m32 -xarch=sparcvis
+ARCHFLAGS_SOS12U1_sparcv8plus+vis = -m32 -xarch=sparcvis
+   ARCHFLAGS_GCC3_sparcv8plus+vis = -mcpu=v8 -mvis
+   ARCHFLAGS_GCC4_sparcv8plus+vis = -mcpu=v8 -mvis
+      MEMORYMODEL_sparcv8plus+vis = 32
 
-ARCHFLAGS_SOS11_sparcv8plus      = -xarch=v8plus
-ARCHFLAGS_SOS12_sparcv8plus      = -m32 -xarch=v8plus
- ARCHFLAGS_GCC3_sparcv8plus      = -mcpu=v8 -mv8plus
- ARCHFLAGS_GCC4_sparcv8plus      = -mcpu=v8 -mv8plus
-    MEMORYMODEL_sparcv8plus      = 32
+      ARCHFLAGS_SOS11_sparcv8plus = -xarch=v8plus
+      ARCHFLAGS_SOS12_sparcv8plus = -m32 -xarch=v8plus
+    ARCHFLAGS_SOS12U1_sparcv8plus = -m32 -xarch=v8plus
+       ARCHFLAGS_GCC3_sparcv8plus = -mcpu=v8 -mv8plus
+       ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v8 -mv8plus
+          MEMORYMODEL_sparcv8plus = 32
 
-ARCHFLAGS_SOS11_sparcv8          = -xarch=v8
-ARCHFLAGS_SOS12_sparcv8          = -m32 -xarch=v8
- ARCHFLAGS_GCC3_sparcv8          = -mcpu=v8
- ARCHFLAGS_GCC4_sparcv8          = -mcpu=v8
-    MEMORYMODEL_sparcv8          = 32
+          ARCHFLAGS_SOS11_sparcv8 = -xarch=v8
+          ARCHFLAGS_SOS12_sparcv8 = -m32 -xarch=v8
+        ARCHFLAGS_SOS12U1_sparcv8 = -m32 -xarch=v8
+           ARCHFLAGS_GCC3_sparcv8 = -mcpu=v8
+           ARCHFLAGS_GCC4_sparcv8 = -mcpu=v8
+              MEMORYMODEL_sparcv8 = 32
 
-ARCHFLAGS_SOS11_sparcv8-fsmuld   = -xarch=v8a
-ARCHFLAGS_SOS12_sparcv8-fsmuld   = -m32 -xarch=v8a
- ARCHFLAGS_GCC3_sparcv8-fsmuld   = ERROR
- ARCHFLAGS_GCC4_sparcv8-fsmuld   = ERROR
-    MEMORYMODEL_sparcv8-fsmuld   = 32
+   ARCHFLAGS_SOS11_sparcv8-fsmuld = -xarch=v8a
+   ARCHFLAGS_SOS12_sparcv8-fsmuld = -m32 -xarch=v8a
+ ARCHFLAGS_SOS12U1_sparcv8-fsmuld = -m32 -xarch=v8a
+    ARCHFLAGS_GCC3_sparcv8-fsmuld = ERROR
+    ARCHFLAGS_GCC4_sparcv8-fsmuld = ERROR
+       MEMORYMODEL_sparcv8-fsmuld = 32
 
-ARCHFLAGS_SOS11_amd64            = -xarch=amd64
-ARCHFLAGS_SOS12_amd64            = -m64 -xarch=sse2
- ARCHFLAGS_GCC3_amd64            = -m64 -march=opteron
- ARCHFLAGS_GCC4_amd64            = -m64 -march=opteron
-    MEMORYMODEL_amd64            = 64
+            ARCHFLAGS_SOS11_amd64 = -xarch=amd64
+            ARCHFLAGS_SOS12_amd64 = -m64 -xarch=sse2
+          ARCHFLAGS_SOS12U1_amd64 = -m64 -xarch=sse2
+             ARCHFLAGS_GCC3_amd64 = -m64 -march=opteron
+             ARCHFLAGS_GCC4_amd64 = -m64 -march=opteron
+                MEMORYMODEL_amd64 = 64
 
-ARCHFLAGS_SOS11_pentium_pro+mmx  = -xarch=pentium_proa
-ARCHFLAGS_SOS12_pentium_pro+mmx  = -m32 -xarch=pentium_proa
- ARCHFLAGS_GCC3_pentium_pro+mmx  = -m32 -march=pentium2
- ARCHFLAGS_GCC4_pentium_pro+mmx  = -m32 -march=pentium2
-    MEMORYMODEL_pentium_pro+mmx  = 32
+  ARCHFLAGS_SOS11_pentium_pro+mmx = -xarch=pentium_proa
+  ARCHFLAGS_SOS12_pentium_pro+mmx = -m32 -xarch=pentium_proa
+ARCHFLAGS_SOS12U1_pentium_pro+mmx = -m32 -xarch=pentium_proa
+   ARCHFLAGS_GCC3_pentium_pro+mmx = -m32 -march=pentium2
+   ARCHFLAGS_GCC4_pentium_pro+mmx = -m32 -march=pentium2
+      MEMORYMODEL_pentium_pro+mmx = 32
 
-ARCHFLAGS_SOS11_pentium_pro      = -xarch=pentium_pro -xchip=pentium_pro
-ARCHFLAGS_SOS12_pentium_pro      = -m32 -xarch=pentium_pro -xchip=pentium_pro
- ARCHFLAGS_GCC3_pentium_pro      = -m32 -march=pentiumpro
- ARCHFLAGS_GCC4_pentium_pro      = -m32 -march=pentiumpro
-    MEMORYMODEL_pentium_pro      = 32
+      ARCHFLAGS_SOS11_pentium_pro = -xarch=pentium_pro -xchip=pentium_pro
+      ARCHFLAGS_SOS12_pentium_pro = -m32 -xarch=pentium_pro -xchip=pentium_pro
+    ARCHFLAGS_SOS12U1_pentium_pro = -m32 -xarch=pentium_pro -xchip=pentium_pro
+       ARCHFLAGS_GCC3_pentium_pro = -m32 -march=pentiumpro
+       ARCHFLAGS_GCC4_pentium_pro = -m32 -march=pentiumpro
+          MEMORYMODEL_pentium_pro = 32
 
-ARCHFLAGS_SOS11_pentium+mmx      = ERROR
-ARCHFLAGS_SOS12_pentium+mmx      = ERROR
- ARCHFLAGS_GCC3_pentium+mmx      = -m32 -march=pentium-mmx
- ARCHFLAGS_GCC4_pentium+mmx      = -m32 -march=pentium-mmx
-    MEMORYMODEL_pentium+mmx      = 32
+      ARCHFLAGS_SOS11_pentium+mmx = ERROR
+      ARCHFLAGS_SOS12_pentium+mmx = ERROR
+    ARCHFLAGS_SOS12U1_pentium+mmx = ERROR
+       ARCHFLAGS_GCC3_pentium+mmx = -m32 -march=pentium-mmx
+       ARCHFLAGS_GCC4_pentium+mmx = -m32 -march=pentium-mmx
+          MEMORYMODEL_pentium+mmx = 32
 
-ARCHFLAGS_SOS11_pentium          = -xchip=pentium
-ARCHFLAGS_SOS12_pentium          = -m32 -xchip=pentium
- ARCHFLAGS_GCC3_pentium          = -m32 -march=pentium
- ARCHFLAGS_GCC4_pentium          = -m32 -march=pentium
-    MEMORYMODEL_pentium          = 32
+          ARCHFLAGS_SOS11_pentium = -xchip=pentium
+          ARCHFLAGS_SOS12_pentium = -m32 -xchip=pentium
+        ARCHFLAGS_SOS12U1_pentium = -m32 -xchip=pentium
+           ARCHFLAGS_GCC3_pentium = -m32 -march=pentium
+           ARCHFLAGS_GCC4_pentium = -m32 -march=pentium
+              MEMORYMODEL_pentium = 32
 
-ARCHFLAGS_SOS11_i486             = -xarch=386 -xchip=486
-ARCHFLAGS_SOS12_i486             = -m32 -xarch=386 -xchip=486
- ARCHFLAGS_GCC3_i486             = -m32 -march=i486
- ARCHFLAGS_GCC4_i486             = -m32 -march=i486
-    MEMORYMODEL_i486             = 32
+             ARCHFLAGS_SOS11_i486 = -xarch=386 -xchip=486
+             ARCHFLAGS_SOS12_i486 = -m32 -xarch=386 -xchip=486
+           ARCHFLAGS_SOS12U1_i486 = -m32 -xarch=386 -xchip=486
+              ARCHFLAGS_GCC3_i486 = -m32 -march=i486
+              ARCHFLAGS_GCC4_i486 = -m32 -march=i486
+                 MEMORYMODEL_i486 = 32
 
-ARCHFLAGS_SOS11_i386             = -xarch=386
-ARCHFLAGS_SOS12_i386             = -m32 -xarch=386
- ARCHFLAGS_GCC3_i386             = -m32 -march=i386
- ARCHFLAGS_GCC4_i386             = -m32 -march=i386
-    MEMORYMODEL_i386             = 32
+             ARCHFLAGS_SOS11_i386 = -xarch=386
+             ARCHFLAGS_SOS12_i386 = -m32 -xarch=386
+           ARCHFLAGS_SOS12U1_i386 = -m32 -xarch=386
+              ARCHFLAGS_GCC3_i386 = -m32 -march=i386
+              ARCHFLAGS_GCC4_i386 = -m32 -march=i386
+                 MEMORYMODEL_i386 = 32
 
 # ISALIST_$(GARCOMPILER) contains all ISAs which are compilable with the selected compiler
 $(foreach C,$(GARCOMPILERS),$(eval ISALIST_$(C) ?= $(foreach I,$(ISALIST),$(if $(filter-out ERROR,$(ARCHFLAGS_$C_$I)),$I))))
@@ -329,19 +346,22 @@
 OPT_FLAGS_SOS ?= -xO3
 OPT_FLAGS_GCC ?= -O2 -pipe
 
-OPT_FLAGS_SOS11 ?= $(OPT_FLAGS_SOS)
-OPT_FLAGS_SOS12 ?= $(OPT_FLAGS_SOS)
- OPT_FLAGS_GCC3 ?= $(OPT_FLAGS_GCC)
- OPT_FLAGS_GCC4 ?= $(OPT_FLAGS_GCC)
+  OPT_FLAGS_SOS11 ?= $(OPT_FLAGS_SOS)
+  OPT_FLAGS_SOS12 ?= $(OPT_FLAGS_SOS)
+OPT_FLAGS_SOS12U1 ?= $(OPT_FLAGS_SOS)
+   OPT_FLAGS_GCC3 ?= $(OPT_FLAGS_GCC)
+   OPT_FLAGS_GCC4 ?= $(OPT_FLAGS_GCC)
 
-OPT_FLAGS_SOS11_sparc ?= $(OPT_FLAGS_SOS11)
-OPT_FLAGS_SOS12_sparc ?= $(OPT_FLAGS_SOS12)
- OPT_FLAGS_GCC3_sparc ?= $(OPT_FLAGS_GCC3)
- OPT_FLAGS_GCC4_sparc ?= $(OPT_FLAGS_GCC4)
- OPT_FLAGS_SOS11_i386 ?= $(OPT_FLAGS_SOS11)
- OPT_FLAGS_SOS12_i386 ?= $(OPT_FLAGS_SOS12)
-  OPT_FLAGS_GCC3_i386 ?= $(OPT_FLAGS_GCC3)
-  OPT_FLAGS_GCC4_i386 ?= $(OPT_FLAGS_GCC4)
+  OPT_FLAGS_SOS11_sparc ?= $(OPT_FLAGS_SOS11)
+  OPT_FLAGS_SOS12_sparc ?= $(OPT_FLAGS_SOS12)
+OPT_FLAGS_SOS12U1_sparc ?= $(OPT_FLAGS_SOS12U1)
+   OPT_FLAGS_GCC3_sparc ?= $(OPT_FLAGS_GCC3)
+   OPT_FLAGS_GCC4_sparc ?= $(OPT_FLAGS_GCC4)
+   OPT_FLAGS_SOS11_i386 ?= $(OPT_FLAGS_SOS11)
+   OPT_FLAGS_SOS12_i386 ?= $(OPT_FLAGS_SOS12)
+ OPT_FLAGS_SOS12U1_i386 ?= $(OPT_FLAGS_SOS12U1)
+    OPT_FLAGS_GCC3_i386 ?= $(OPT_FLAGS_GCC3)
+    OPT_FLAGS_GCC4_i386 ?= $(OPT_FLAGS_GCC4)
 
 # Most of these are empty because '-march' implies '-mtune'
           OPT_ISAFLAGS_GCC3_amd64 ?=
@@ -358,14 +378,16 @@
            OPT_ISAFLAGS_GCC4_i386 ?= -mtune=i686
 
 
-DBG_FLAGS_SOS11_sparc ?= -g
-DBG_FLAGS_SOS12_sparc ?= -g
- DBG_FLAGS_GCC3_sparc ?= -g
- DBG_FLAGS_GCC4_sparc ?= -g
- DBG_FLAGS_SOS11_i386 ?= -g
- DBG_FLAGS_SOS12_i386 ?= -g
-  DBG_FLAGS_GCC3_i386 ?= -g
-  DBG_FLAGS_GCC4_i386 ?= -g
+  DBG_FLAGS_SOS11_sparc ?= -g
+  DBG_FLAGS_SOS12_sparc ?= -g
+DBG_FLAGS_SOS12U1_sparc ?= -g
+   DBG_FLAGS_GCC3_sparc ?= -g
+   DBG_FLAGS_GCC4_sparc ?= -g
+   DBG_FLAGS_SOS11_i386 ?= -g
+   DBG_FLAGS_SOS12_i386 ?= -g
+ DBG_FLAGS_SOS12U1_i386 ?= -g
+    DBG_FLAGS_GCC3_i386 ?= -g
+    DBG_FLAGS_GCC4_i386 ?= -g
 
 # This variable contains the opt flags for the current compiler on the current architecture
 FLAVOR_FLAGS ?= $($(GARFLAVOR)_ISAFLAGS_$(GARCOMPILER)_$(ISA)) $($(GARFLAVOR)_FLAGS_$(GARCOMPILER)_$(GARCH))
@@ -426,48 +448,58 @@
 # Forte Compiler Configuration
 #
 
-GCC3_CC_HOME  ?= /opt/csw/gcc3
-GCC4_CC_HOME  ?= /opt/csw/gcc4
-SOS11_CC_HOME ?= /opt/studio/SOS11/SUNWspro
-SOS12_CC_HOME ?= /opt/studio/SOS12/SUNWspro
-GCC3_CC       ?= $(GCC3_CC_HOME)/bin/gcc
-GCC4_CC       ?= $(GCC4_CC_HOME)/bin/gcc
-SOS11_CC      ?= $(SOS11_CC_HOME)/bin/cc
-SOS12_CC      ?= $(SOS12_CC_HOME)/bin/cc
-GCC3_CXX      ?= $(GCC3_CC_HOME)/bin/g++
-GCC4_CXX      ?= $(GCC4_CC_HOME)/bin/g++
-SOS11_CXX     ?= $(SOS11_CC_HOME)/bin/CC
-SOS12_CXX     ?= $(SOS12_CC_HOME)/bin/CC
+   GCC3_CC_HOME ?= /opt/csw/gcc3
+   GCC4_CC_HOME ?= /opt/csw/gcc4
+  SOS11_CC_HOME ?= /opt/studio/SOS11/SUNWspro
+  SOS12_CC_HOME ?= /opt/studio/SOS12/SUNWspro
+SOS12U1_CC_HOME ?= /opt/studio/sunstudio12.1
 
-GCC3_CC_FLAGS   ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
-GCC4_CC_FLAGS   ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
-SOS11_CC_FLAGS  ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS)
-SOS12_CC_FLAGS  ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS)
-GCC3_CXX_FLAGS  ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
-GCC4_CXX_FLAGS  ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
-SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
-SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
-GCC3_AS_FLAGS   ?= $(EXTRA_GCC3_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS)
-GCC4_AS_FLAGS   ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS)
-SOS11_AS_FLAGS  ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
-SOS12_AS_FLAGS  ?= $(EXTRA_SOS12_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
-GCC3_LD_FLAGS   ?= -L$(GCC3_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
-GCC4_LD_FLAGS   ?= -L$(GCC4_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
-SOS11_LD_FLAGS  ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS)
-SOS12_LD_FLAGS  ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS)
+     GCC3_CC ?= $(GCC3_CC_HOME)/bin/gcc
+     GCC4_CC ?= $(GCC4_CC_HOME)/bin/gcc
+    SOS11_CC ?= $(SOS11_CC_HOME)/bin/cc
+    SOS12_CC ?= $(SOS12_CC_HOME)/bin/cc
+  SOS12U1_CC ?= $(SOS12U1_CC_HOME)/bin/cc
+    GCC3_CXX ?= $(GCC3_CC_HOME)/bin/g++
+    GCC4_CXX ?= $(GCC4_CC_HOME)/bin/g++
+   SOS11_CXX ?= $(SOS11_CC_HOME)/bin/CC
+   SOS12_CXX ?= $(SOS12_CC_HOME)/bin/CC
+ SOS12U1_CXX ?= $(SOS12U1_CC_HOME)/bin/CC
 
+    GCC3_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
+    GCC4_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
+   SOS11_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS)
+   SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS)
+ SOS12U1_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS) -xnorunpath
+   GCC3_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
+   GCC4_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
+  SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -xnorunpath
+  SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -xnorunpath
+SOS12U1_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -xnorunpath
+    GCC3_AS_FLAGS ?= $(EXTRA_GCC3_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS)
+    GCC4_AS_FLAGS ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS)
+   SOS11_AS_FLAGS ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
+   SOS12_AS_FLAGS ?= $(EXTRA_SOS12_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
+ SOS12U1_AS_FLAGS ?= $(EXTRA_SOS12U1_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
+    GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
+    GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
+   SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS)
+   SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS)
+ SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS)
+
 # Compiler version
-GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version)
-GCC3_CXX_VERSION = $(shell $(GCC3_CXX) -v 2>&1| ggrep version)
-GCC4_CC_VERSION = $(shell $(GCC4_CC) -v 2>&1| ggrep version)
-GCC4_CXX_VERSION = $(shell $(GCC4_CXX) -v 2>&1| ggrep version)
+    GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version)
+   GCC3_CXX_VERSION = $(shell $(GCC3_CXX) -v 2>&1| ggrep version)
+    GCC4_CC_VERSION = $(shell $(GCC4_CC) -v 2>&1| ggrep version)
+   GCC4_CXX_VERSION = $(shell $(GCC4_CXX) -v 2>&1| ggrep version)
 
-SOS11_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //')
-SOS11_CXX_VERSION = $(shell $(SOS11_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //')
-SOS12_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //')
-SOS12_CXX_VERSION = $(shell $(SOS11_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //')
+   SOS11_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //')
+  SOS11_CXX_VERSION = $(shell $(SOS11_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //')
+   SOS12_CC_VERSION = $(shell $(SOS12_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //')
+  SOS12_CXX_VERSION = $(shell $(SOS12_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //')
+ SOS12U1_CC_VERSION = $(shell $(SOS12U1_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //')
+SOS12U1_CXX_VERSION = $(shell $(SOS12U1_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //')
 
-CC_VERSION = $($(GARCOMPILER)_CC_VERSION)
+ CC_VERSION = $($(GARCOMPILER)_CC_VERSION)
 CXX_VERSION = $($(GARCOMPILER)_CXX_VERSION)
 
 #
@@ -526,6 +558,7 @@
 GCC4_LD_OPTIONS = -R$(abspath $(GCC4_CC_HOME)/lib/$(MM_LIBDIR)) $(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS)
 SOS11_LD_OPTIONS = $(EXTRA_SOS11_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS)
 SOS12_LD_OPTIONS = $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS)
+SOS12U1_LD_OPTIONS = $(EXTRA_SOS12U1_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS)
 
 LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(EXTRA_LD_OPTIONS) $(_CATEGORY_LD_OPTIONS))
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list