stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r430144 - in /incubator/stdcxx/trunk: GNUmakefile etc/config/acc.config etc/config/gcc.config etc/config/mipspro.config etc/config/sunpro.config etc/config/vacpp.config
Date Wed, 09 Aug 2006 20:51:47 GMT
Author: sebor
Date: Wed Aug  9 13:51:47 2006
New Revision: 430144

URL: http://svn.apache.org/viewvc?rev=430144&view=rev
Log:
2006-08-09  Martin Sebor  <sebor@roguewave.com>

	* GNUmakefile (WIDE_CXXFLAGS, WIDE_LDFLAGS, WIDE_LDSOFLAGS,
	WIDE_ARFLAGS): Renamed to CXXFLAGS.wide, LDFLAGS.wide, etc.
	Handled CXXFLAGS.narrow etc. analogously.
	* acc.config: Same. Introduced CXXFLAGS.narrow, etc., to
	parallel the wide flags.
	* gcc.config: Same.
	* mipspro.config: Same.
	* sunpro.config: Same.
	* vacpp.config: Same.

Modified:
    incubator/stdcxx/trunk/GNUmakefile
    incubator/stdcxx/trunk/etc/config/acc.config
    incubator/stdcxx/trunk/etc/config/gcc.config
    incubator/stdcxx/trunk/etc/config/mipspro.config
    incubator/stdcxx/trunk/etc/config/sunpro.config
    incubator/stdcxx/trunk/etc/config/vacpp.config

Modified: incubator/stdcxx/trunk/GNUmakefile
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/GNUmakefile?rev=430144&r1=430143&r2=430144&view=diff
==============================================================================
--- incubator/stdcxx/trunk/GNUmakefile (original)
+++ incubator/stdcxx/trunk/GNUmakefile Wed Aug  9 13:51:47 2006
@@ -471,10 +471,16 @@
 
   # wide (typically 64-bit) mode
   ifeq ($(findstring wide,$(BUILDMODE)),wide)
-    CXXFLAGS  += $(WIDE_CXXFLAGS)
-    LDFLAGS   += $(WIDE_LDFLAGS)
-    LDSOFLAGS += $(WIDE_LDSOFLAGS)
-    ARFLAGS   += $(WIDE_ARFLAGS)
+    CXXFLAGS  += $(CXXFLAGS.wide)
+    LDFLAGS   += $(LDFLAGS.wide)
+    LDSOFLAGS += $(LDSOFLAGS.wide)
+    ARFLAGS   += $(ARFLAGS.wide)
+  endif
+  ifeq ($(findstring wide,$(BUILDMODE)),narrow)
+    CXXFLAGS  += $(CXXFLAGS.narrow)
+    LDFLAGS   += $(LDFLAGS.narrow)
+    LDSOFLAGS += $(LDSOFLAGS.narrow)
+    ARFLAGS   += $(ARFLAGS.narrow)
   endif
 
   # platform is determined as {OS-name}-{OS-version}-{hardware}

Modified: incubator/stdcxx/trunk/etc/config/acc.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/acc.config?rev=430144&r1=430143&r2=430144&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/acc.config (original)
+++ incubator/stdcxx/trunk/etc/config/acc.config Wed Aug  9 13:51:47 2006
@@ -104,8 +104,14 @@
 SINGL_CPPFLAGS =
 SINGL_LDFLAGS  =
 
-# wide (64-bit, LP64) flags
-WIDE_CXXFLAGS  = +DD64
-WIDE_LDFLAGS   = +DD64
-WIDE_LDSOFLAGS = +DD64
-WIDE_ARFLAGS   =
+# wide (64-bit, LP64) flags -- must be set explicitly
+CXXFLAGS.wide    = +DD64
+LDFLAGS.wide     = +DD64
+LDSOFLAGS.wide   = +DD64
+ARFLAGS.wide   =
+
+# narrow (32-bit, ILP32) flags -- implicit in the default invocation
+CXXFLAGS.narrow  = +DD32
+LDFLAGS.narrow   = +DD32
+LDSOFLAGS.narrow = +DD32
+ARFLAGS.narrow   =

Modified: incubator/stdcxx/trunk/etc/config/gcc.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/gcc.config?rev=430144&r1=430143&r2=430144&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/gcc.config (original)
+++ incubator/stdcxx/trunk/etc/config/gcc.config Wed Aug  9 13:51:47 2006
@@ -200,12 +200,18 @@
 arch=$(shell uname -p 2>/dev/null)
 
 ifeq ($(arch),ia64)
-  # -mlp64 is the default setting on IA64
-  # TODO: add a way to select the narrow (32-bit) model
+  # LP64 is the default (implicit) setting on IA64
+  ifeq ($(OSNAME),HP-UX)
+    # -milp32, -mlp64, etc. are options specific to HP-UX
+    CXXFLAGS.narrow  = -milp32
+    LDFLAGS.narrow   = -milp32
+    LDSOFLAGS.narrow = -milp32
+    ARFLAGS.narrow   =
+  endif
 else
   # wide (64-bit flags)
-  WIDE_CXXFLAGS  = -m64
-  WIDE_LDFLAGS   = -m64
-  WIDE_LDSOFLAGS = -m64
-  WIDE_ARFLAGS   =
+  CXXFLAGS.wide  = -m64
+  LDFLAGS.wide   = -m64
+  LDSOFLAGS.wide = -m64
+  ARFLAGS.wide   =
 endif

Modified: incubator/stdcxx/trunk/etc/config/mipspro.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/mipspro.config?rev=430144&r1=430143&r2=430144&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/mipspro.config (original)
+++ incubator/stdcxx/trunk/etc/config/mipspro.config Wed Aug  9 13:51:47 2006
@@ -64,8 +64,14 @@
 SINGL_CPPFLAGS  =
 SINGL_LDFLAGS   =
 
-# wide (64-bit flags)
-WIDE_CXXFLAGS  = -64
-WIDE_LDFLAGS   = -64
-WIDE_LDSOFLAGS = -64
-WIDE_ARFLAGS   =
+# wide (64-bit) flags -- must be set explicitly
+CXXFLAGS.wide  = -64
+LDFLAGS.wide   = -64
+LDSOFLAGS.wide = -64
+ARFLAGS.wide   =
+
+# narrow (32-bit) flags -- implicit in the default invocation
+CXXFLAGS.narrow  = -32
+LDFLAGS.narrow   = -32
+LDSOFLAGS.narrow = -32
+ARFLAGS.narrow   =

Modified: incubator/stdcxx/trunk/etc/config/sunpro.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/sunpro.config?rev=430144&r1=430143&r2=430144&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/sunpro.config (original)
+++ incubator/stdcxx/trunk/etc/config/sunpro.config Wed Aug  9 13:51:47 2006
@@ -1,5 +1,5 @@
 #
-# $Id: //stdlib/dev/etc/stdlib/config/sunpro.config#2 $
+# $Id$
 #
 # configuration file for SunPro CC on SunOS
 #
@@ -73,8 +73,14 @@
 SINGL_CPPFLAGS =
 SINGL_LDFLAGS  =
 
-# wide (64-bit flags)
-WIDE_CXXFLAGS  = -xarch=v9
-WIDE_LDFLAGS   = -xarch=v9
-WIDE_LDSOFLAGS = -xarch=v9
-WIDE_ARFLAGS   =
+# wide (64-bit) flags -- must be set explicitly
+CXXFLAGS.wide  = -xarch=v9
+LDFLAGS.wide   = -xarch=v9
+LDSOFLAGS.wide = -xarch=v9
+ARFLAGS.wide   =
+
+# narrow (32-bit) flags
+CXXFLAGS.wide  =
+LDFLAGS.wide   =
+LDSOFLAGS.wide =
+ARFLAGS.wide   =

Modified: incubator/stdcxx/trunk/etc/config/vacpp.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/vacpp.config?rev=430144&r1=430143&r2=430144&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/vacpp.config (original)
+++ incubator/stdcxx/trunk/etc/config/vacpp.config Wed Aug  9 13:51:47 2006
@@ -141,14 +141,21 @@
 SINGL_CPPFLAGS =
 SINGL_LDFLAGS  =
 
-# wide (64-bit flags)
-WIDE_CXXFLAGS  = -q64 # do not use the overly chatty -qwarn64
-WIDE_LDFLAGS   = -q64
-WIDE_LDSOFLAGS = -q64
+# wide (64-bit) flags -- must be set explicitly
+CXXFLAGS.wide  = -q64 # do not use the overly chatty -qwarn64
+LDFLAGS.wide   = -q64
+LDSOFLAGS.wide = -q64
 
 ifeq ($(OSNAME),AIX)
-  WIDE_ARFLAGS = -X64
+  ARFLAGS.wide = -X64
 endif
+
+# narrow (32-bit) flags -- implicit in the default invocation
+CXXFLAGS.narrow  = -q32
+LDFLAGS.narrow   = -q32
+LDSOFLAGS.narrow = -q32
+ARFLAGS.narrow   =
+
 
 # override default (rv, no leading dash) to make ar -rv -X64 well-formed
 ARFLAGS        = -rv



Mime
View raw message