summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2008-03-14 19:57:24 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2008-03-14 19:57:24 +0000
commit3d776301555c1b2576190a986689686724de0b0e (patch)
tree4715fb3c73ce9d3157a39efa1e563b628b0da92f
parent5ce8c0f4d1718d01a3ccc96e94a9e5d6dfc9562c (diff)
downloadATCD-3d776301555c1b2576190a986689686724de0b0e.tar.gz
Fri Mar 14 19:57:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/include/makeinclude/platform_aix_g++.GNU4
2 files changed, 8 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 0459c3fc324..0e93ce102a4 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 14 19:57:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * include/makeinclude/platform_aix_g++.GNU:
+ Improved support for buildbits=64
+
Fri Mar 14 19:09:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/INET_Addr.cpp:
diff --git a/ACE/include/makeinclude/platform_aix_g++.GNU b/ACE/include/makeinclude/platform_aix_g++.GNU
index 51d833a415a..c892df15647 100644
--- a/ACE/include/makeinclude/platform_aix_g++.GNU
+++ b/ACE/include/makeinclude/platform_aix_g++.GNU
@@ -56,6 +56,8 @@ ifeq ($(buildbits),32)
endif
ifeq ($(buildbits),64)
CFLAGS += -maix64
+ LDFLAGS += -maix64
+ ARFLAGS += -X64
endif
DCFLAGS += -g
DLD = $(CXX)
@@ -82,7 +84,7 @@ else
endif
LIBS += -lxti -ldl
-ARFLAGS = cruv
+ARFLAGS += cruv
RANLIB = ranlib
# Test for template instantiation, add to SOFLAGS if versioned_so set,