diff options
author | Steve Huston <shuston@riverace.com> | 2014-06-05 14:30:55 +0000 |
---|---|---|
committer | Steve Huston <shuston@riverace.com> | 2014-06-05 14:30:55 +0000 |
commit | ce85af6c068a1d89f9a4bcc774d7b3943b8c166b (patch) | |
tree | 02dd9be9cdfcd3f226cebcf33637744e45f478f1 | |
parent | edbe150bb8106fee588a1be9cd61f17c2d5f8250 (diff) | |
download | ATCD-ce85af6c068a1d89f9a4bcc774d7b3943b8c166b.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 4365c5f15e1..71eb3892103 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. + Fri Feb 14 16:34:46 UTC 2014 Steve Huston <shuston@riverace.com> * ace/Dev_Poll_Reactor.cpp (dispatch_io_event): Do not dispatch to 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) |