diff options
| author | Steve Huston <shuston@riverace.com> | 2011-04-22 19:50:21 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2011-04-22 19:50:21 +0000 |
| commit | 5e83084d311c4bae530bc8b921cf70e8478ca7a7 (patch) | |
| tree | 463b4bc8b239427fb746cd4bc7ab0ea2f9af5ea8 | |
| parent | dda043cae80374692bee226744335c03523a2a08 (diff) | |
| download | ATCD-5e83084d311c4bae530bc8b921cf70e8478ca7a7.tar.gz | |
ChangeLogTag:Fri Apr 22 15:19:29 UTC 2011 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | include/makeinclude/platform_aix_ibm.GNU | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 7d275c6d9a8..a5ff3559089 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. + Mon Feb 28 20:29:59 UTC 2011 Steve Huston <shuston@riverace.com> * examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp: 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) |