diff options
author | Steve Huston <shuston@riverace.com> | 2014-06-05 14:32:36 +0000 |
---|---|---|
committer | Steve Huston <shuston@riverace.com> | 2014-06-05 14:32:36 +0000 |
commit | eade7de9e9920e2393d409331543e4b4be46f1af (patch) | |
tree | 0cb8c4ae681a8b69e2180b6fdbbd57129849f12b | |
parent | 6e991bb3a8a7ad1466c538000c2105e13581574f (diff) | |
download | ATCD-eade7de9e9920e2393d409331543e4b4be46f1af.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 44aa39a3fe5..6820b5ae148 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 e99cdd7be51..4d6988f329e 100644 --- a/include/makeinclude/platform_aix_ibm.GNU +++ b/include/makeinclude/platform_aix_ibm.GNU @@ -123,13 +123,17 @@ else CCFLAGS += -qeh=v6 endif 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) |