diff options
| author | Steve Huston <shuston@riverace.com> | 2014-06-05 14:33:33 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2014-06-05 14:33:33 +0000 |
| commit | 4ed7ec97b8dbb43ffe1dbbb1dfef5b6a056f8787 (patch) | |
| tree | f27c4deaeb41569c3adbf2187002fd12acf0aeb4 | |
| parent | 80edf584a0e25df6a2440f5824354b550f89ffc4 (diff) | |
| download | ATCD-Riverace-5.7.tar.gz | |
ChangeLogTag:Thu Jun 5 14:24:58 UTC 2014 Steve Huston <shuston@riverace.com>Riverace-5.7
| -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 9748b08b5e8..d177dee3eed 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) |