diff options
| author | Steve Huston <shuston@riverace.com> | 2011-01-26 21:01:54 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2011-01-26 21:01:54 +0000 |
| commit | 3c71370fe526f21bfec53df52096ba480a13367a (patch) | |
| tree | 6084700d175947114dc95eef5fa1d88f16a69ef9 | |
| parent | 2c3f1e27e5d24318d84eb61189d11454f966402f (diff) | |
| download | ATCD-3c71370fe526f21bfec53df52096ba480a13367a.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 ee2432e5ec7..8e535a7f447 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 d675201759b..33627219c2b 100644 --- a/include/makeinclude/platform_aix_ibm.GNU +++ b/include/makeinclude/platform_aix_ibm.GNU @@ -123,6 +123,10 @@ else CCFLAGS += -qeh=v6 endif 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) |