summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2011-04-22 18:43:34 +0000
committerSteve Huston <shuston@riverace.com>2011-04-22 18:43:34 +0000
commitac409a0566afcd3c67691d7550196e6b839fed2f (patch)
treef9d7856c614968b22bb6b45b3ad166ac75c6b195
parent7274f1df365342c90994458baed21afe696f987d (diff)
downloadATCD-ac409a0566afcd3c67691d7550196e6b839fed2f.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 707a152bf28..05b1f8a3c16 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 2f8a9abe8f1..e99cdd7be51 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
@@ -123,10 +123,13 @@ else
CCFLAGS += -qeh=v6
endif
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)