diff options
| author | Steve Huston <shuston@riverace.com> | 2014-06-05 14:30:06 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2014-06-05 14:30:06 +0000 |
| commit | ba216f09a07500b0a425ca96e7f0fd06d93f1cb2 (patch) | |
| tree | 98a14424461d85518477540bffb2fc349d66b669 | |
| parent | 0b7ec8532dc74dd526d1c70e40e524707a9a2f88 (diff) | |
| download | ATCD-ba216f09a07500b0a425ca96e7f0fd06d93f1cb2.tar.gz | |
ChangeLogTag:Thu Jun 5 14:24:58 UTC 2014 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_aix_ibm.GNU | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index dd9586090de..cc7b0789194 100644 --- a/ACE/ChangeLog +++ b/ACE/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/ACE/include/makeinclude/platform_aix_ibm.GNU b/ACE/include/makeinclude/platform_aix_ibm.GNU index 86056359dae..ff3477ab64f 100644 --- a/ACE/include/makeinclude/platform_aix_ibm.GNU +++ b/ACE/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) |