diff options
| author | Steve Huston <shuston@riverace.com> | 2014-06-05 14:31:51 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2014-06-05 14:31:51 +0000 |
| commit | 71fe28028e7debee31e3edf4b849d79103faaddd (patch) | |
| tree | 7dcfc95af451d1f1d110629fd5b5f3fb8fb83054 | |
| parent | a1f9f01117f42ee08b9c20200d019da617ca8c61 (diff) | |
| download | ATCD-71fe28028e7debee31e3edf4b849d79103faaddd.tar.gz | |
ChangeLogTag:Thu Jun 5 14:24:58 UTC 2014 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/makeinclude/platform_aix_ibm.GNU | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 79a4a962b89..15efc3eeff9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 5 14:24:58 UTC 2014 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_aix_ibm.GNU: Add XL C++ 12.1 to the + set of compiler versions using the settings created for V9. + Thu Dec 12 16:28:45 UTC 2013 Steve Huston <shuston@riverace.com> * ace/ATM_Stream.cpp: Add missing OS_NS_string.h diff --git a/include/makeinclude/platform_aix_ibm.GNU b/include/makeinclude/platform_aix_ibm.GNU index 86056359dae..ff3477ab64f 100644 --- a/include/makeinclude/platform_aix_ibm.GNU +++ b/include/makeinclude/platform_aix_ibm.GNU @@ -111,13 +111,17 @@ else # try-catch blocks. CCFLAGS += -qeh=v6 else - # Until there's a reason to change, use the V9 settings for V10.1 and 11. + # Until there's a reason to change, use the V9 settings for V10.1, 11.1 + # and 12.1. ifeq ($(XLCVERSION),0x0a01) XLCVERSION = 0x0900 endif ifeq ($(XLCVERSION),0x0b01) XLCVERSION = 0x0900 endif + ifeq ($(XLCVERSION),0x0c01) + XLCVERSION = 0x0900 + endif ifeq ($(XLCVERSION),0x0900) CCFLAGS += -qflag=w:w ifeq ($(templates),manual) |