diff options
| author | Steve Huston <shuston@riverace.com> | 2011-01-26 20:42:22 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2011-01-26 20:42:22 +0000 |
| commit | 7600d346fa2a149775d656b8d4b8313a12ef7d7d (patch) | |
| tree | ec65ee1f79d765c07773af33d915a81021a859fc | |
| parent | e6276dcaf952cd6303b97c3bf1b9a076b59f8b0c (diff) | |
| download | ATCD-7600d346fa2a149775d656b8d4b8313a12ef7d7d.tar.gz | |
ChangeLogTag:Wed Jan 26 20:17:28 UTC 2011 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/makeinclude/platform_aix_ibm.GNU | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 4b576618838..e05f0e989e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 26 20:17:28 UTC 2011 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_aix_ibm.GNU: If XL C/C++ 10.1 is used, + use the same compiler options as for XL C/C++ 9. + Fri Jan 21 17:04:29 UTC 2011 Steve Huston <shuston@riverace.com> * ace/config-hpux-11.00.h: Set ACE_LACKS_(STR|WCS)TO[U]LL when diff --git a/include/makeinclude/platform_aix_ibm.GNU b/include/makeinclude/platform_aix_ibm.GNU index 110db9cf5c2..ecc0d63c746 100644 --- a/include/makeinclude/platform_aix_ibm.GNU +++ b/include/makeinclude/platform_aix_ibm.GNU @@ -111,6 +111,10 @@ else # try-catch blocks. CCFLAGS += -qeh=v6 else + # For now, use the V9 settings for V10.1 + ifeq ($(XLCVERSION),0x0a01) + XLCVERSION = 0x0900 + endif ifeq ($(XLCVERSION),0x0900) CCFLAGS += -qflag=w:w ifeq ($(templates),manual) |