ChangeLogTag:Fri Oct 18 22:07:31 2002 Steve Huston <shuston@riverace.com>

5 files changed, 35 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index afe56b5387a..bdb1917c7e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Oct 18 22:07:31 2002  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-aix-4.x.h: Only define ACE_HAS_ALLOCA for IBM
+          compilers. They do it via "builtin" trickery and g++ doesn't
+          know that trick.
+
+        * include/makeinclude/platform_aix4_g++.GNU: Set with_ld to aix
+          to avoid trying to do an soname - AIX's ld doesn't do that.
+
+        * include/makeinclude/platform_g++_common.GNU: If with_ld is aix,
+          don't try to add to soname option to the linker.
+
 Fri Oct 18 20:13:29 2002  Steve Huston  <shuston@riverace.com>
 
         * include/makeinclude/platform_hpux_gcc.GNU: Added an optional
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index afe56b5387a..bdb1917c7e1 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,15 @@
+Fri Oct 18 22:07:31 2002  Steve Huston  <shuston@riverace.com>
+
+        * ace/config-aix-4.x.h: Only define ACE_HAS_ALLOCA for IBM
+          compilers. They do it via "builtin" trickery and g++ doesn't
+          know that trick.
+
+        * include/makeinclude/platform_aix4_g++.GNU: Set with_ld to aix
+          to avoid trying to do an soname - AIX's ld doesn't do that.
+
+        * include/makeinclude/platform_g++_common.GNU: If with_ld is aix,
+          don't try to add to soname option to the linker.
+
 Fri Oct 18 20:13:29 2002  Steve Huston  <shuston@riverace.com>
 
         * include/makeinclude/platform_hpux_gcc.GNU: Added an optional
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index 23c4ce9e23c..045c2211a3a 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -14,6 +14,9 @@
    //********************************************************************
    //
 
+// Compiler does this with a builtin - it's not in libc.
+#  define ACE_HAS_ALLOCA
+
    // Compiler supports the ssize_t typedef.
 #  define ACE_HAS_SSIZE_T
 
@@ -125,7 +128,6 @@
 #endif /* ACE_AIX_VERS >= 403 */
 
 #define ACE_HAS_AIX_HI_RES_TIMER
-#define ACE_HAS_ALLOCA
 
 // Compiler/platform has correctly prototyped header files.
 #define ACE_HAS_CPLUSPLUS_HEADERS
diff --git a/include/makeinclude/platform_aix4_g++.GNU b/include/makeinclude/platform_aix4_g++.GNU
index efd557a35b2..c047d47044c 100644
--- a/include/makeinclude/platform_aix4_g++.GNU
+++ b/include/makeinclude/platform_aix4_g++.GNU
@@ -1,7 +1,7 @@
 # $Id$
 #
 # Platform macros for building on AIX 4.x with g++.  This has been tested on
-# AIX 4.3 with gcc 3.1
+# AIX 4.3 with gcc 3.2
 #
 # Original contributed by Ian Wright <I.Wright@elsevier.co.uk>. Updated for
 # AIX 4 and egcs by Steve Huston <shuston@riverace.com>.
@@ -22,6 +22,9 @@ endif
 ifeq (,$(exceptions))
   exceptions = 0
 endif
+ifeq (,$(with_ld))
+  with_ld = aix
+endif
 
 # Yes, believe it or not...
 # The way to make a shared lib on AIX is to make a shared object file and
@@ -79,8 +82,7 @@ SOFLAGS        += -shared -Wl,-bexpall # -Wl,-bloadmap:lib.map
 LIBS           += -ltli_r -ldl
 ARFLAGS         = cruv
 RANLIB          = ranlib
-SONAME		=
-SOVERSION	=
+
 # On AIX, shared libraries are not generally left in .so form to link against.
 # To do so requires the run-time linker and that is an unnecessary evil.
 # So build the .so as usual, but then put in an archive library to link
diff --git a/include/makeinclude/platform_g++_common.GNU b/include/makeinclude/platform_g++_common.GNU
index bcce0bd0419..13db5c1e966 100644
--- a/include/makeinclude/platform_g++_common.GNU
+++ b/include/makeinclude/platform_g++_common.GNU
@@ -43,6 +43,8 @@ ifneq ($(SONAME),)
   ifeq ($(with_ld),hpux)
     SOFLAGS += -Wl,+h -Wl,$(SONAME)
   else
-    SOFLAGS += -Wl,-h -Wl,$(SONAME)
+    ifneq ($(with_ld),aix)
+      SOFLAGS += -Wl,-h -Wl,$(SONAME)
+    endif
   endif
 endif