summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2011-04-22 18:42:44 +0000
committerSteve Huston <shuston@riverace.com>2011-04-22 18:42:44 +0000
commitcf34403edf6208c30bcb5844c354ff824ed64e9a (patch)
tree2861d5337045b565757596cd83ac3fd1823d28cf
parenta5209fbd990c56339449c87e6b8703e3d107d098 (diff)
downloadATCD-cf34403edf6208c30bcb5844c354ff824ed64e9a.tar.gz
ChangeLogTag:Fri Apr 22 15:19:29 UTC 2011 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog4
-rw-r--r--include/makeinclude/platform_aix_ibm.GNU7
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2cdb2b6c7e7..5896b5d7439 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 22 15:19:29 UTC 2011 Steve Huston <shuston@riverace.com>
+
+ * include/makeinclude/platform_aix_ibm.GNU: Add support for XL C++ 11.
+
Wed Mar 16 12:08:36 UTC 2011 Steve Huston <shuston@riverace.com>
* ace/config-aix-7.h: New config for AIX 7.
diff --git a/include/makeinclude/platform_aix_ibm.GNU b/include/makeinclude/platform_aix_ibm.GNU
index a26b1aa02e4..86056359dae 100644
--- a/include/makeinclude/platform_aix_ibm.GNU
+++ b/include/makeinclude/platform_aix_ibm.GNU
@@ -1,7 +1,7 @@
# $Id$
# This file is for use with AIX 5.x and up, using either of the IBM
-# compilers (Visual Age C++ 6 or newer compiler).
+# compilers (Visual Age C++ 6 or newer XL C++ compiler).
debug ?= 1
distrib ?= 0
@@ -111,10 +111,13 @@ else
# try-catch blocks.
CCFLAGS += -qeh=v6
else
- # For now, use the V9 settings for V10.1
+ # Until there's a reason to change, use the V9 settings for V10.1 and 11.
ifeq ($(XLCVERSION),0x0a01)
XLCVERSION = 0x0900
endif
+ ifeq ($(XLCVERSION),0x0b01)
+ XLCVERSION = 0x0900
+ endif
ifeq ($(XLCVERSION),0x0900)
CCFLAGS += -qflag=w:w
ifeq ($(templates),manual)