ChangeLogTag:Thu Mar 29 19:12:38 2001 Steve Huston <shuston@riverace.com>

5 files changed, 71 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index a1c13fb4f21..a43fc3f574f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Thu Mar 29 19:12:38 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/rules.lib.GNU: AIX-specific changes to
+          build shared libraries by making a shared shr.o file and putting
+          that into an archive. Seems weird, but that's the way AIX does
+          things. This makes ACE consistent with other AIX software.
+
+        * include/makeinclude/platform_aix4_cset++.GNU: Made some changes
+          to attempt to work with the new scheme for shared lib creation on
+          AIX. Did not test it, and don't plan to. The CSet++ compiler is not
+          supported by IBM any longer, and Riverace is not supporting ACE
+          with it. If someone out there sends patches for this, I'll put
+          them in, but this file is going away after ACE 5.2 is released.
+          All uses of IBM-supported compilers (IBM C/C++ and Visual Age C++
+          in batch mode) should be with the platform_aix_ibm.GNU file.
+
 Thu Mar 29 16:16:07 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/Token.cpp (renew): A conditional expression used an && rather
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index a1c13fb4f21..a43fc3f574f 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,19 @@
+Thu Mar 29 19:12:38 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/rules.lib.GNU: AIX-specific changes to
+          build shared libraries by making a shared shr.o file and putting
+          that into an archive. Seems weird, but that's the way AIX does
+          things. This makes ACE consistent with other AIX software.
+
+        * include/makeinclude/platform_aix4_cset++.GNU: Made some changes
+          to attempt to work with the new scheme for shared lib creation on
+          AIX. Did not test it, and don't plan to. The CSet++ compiler is not
+          supported by IBM any longer, and Riverace is not supporting ACE
+          with it. If someone out there sends patches for this, I'll put
+          them in, but this file is going away after ACE 5.2 is released.
+          All uses of IBM-supported compilers (IBM C/C++ and Visual Age C++
+          in batch mode) should be with the platform_aix_ibm.GNU file.
+
 Thu Mar 29 16:16:07 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/Token.cpp (renew): A conditional expression used an && rather
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a1c13fb4f21..a43fc3f574f 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,19 @@
+Thu Mar 29 19:12:38 2001  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/rules.lib.GNU: AIX-specific changes to
+          build shared libraries by making a shared shr.o file and putting
+          that into an archive. Seems weird, but that's the way AIX does
+          things. This makes ACE consistent with other AIX software.
+
+        * include/makeinclude/platform_aix4_cset++.GNU: Made some changes
+          to attempt to work with the new scheme for shared lib creation on
+          AIX. Did not test it, and don't plan to. The CSet++ compiler is not
+          supported by IBM any longer, and Riverace is not supporting ACE
+          with it. If someone out there sends patches for this, I'll put
+          them in, but this file is going away after ACE 5.2 is released.
+          All uses of IBM-supported compilers (IBM C/C++ and Visual Age C++
+          in batch mode) should be with the platform_aix_ibm.GNU file.
+
 Thu Mar 29 16:16:07 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/Token.cpp (renew): A conditional expression used an && rather
diff --git a/include/makeinclude/platform_aix4_cset++.GNU b/include/makeinclude/platform_aix4_cset++.GNU
index 44ef5396f7b..429d64a354e 100644
--- a/include/makeinclude/platform_aix4_cset++.GNU
+++ b/include/makeinclude/platform_aix4_cset++.GNU
@@ -1,8 +1,18 @@
 # $Id$
 
-# AIX 4.x using the C Set++ compiler.
+# AIX 4.x using the IBM C Set++ compiler.
 # *not* using Orbix
 #
+# NOTE! IBM is no longer supporting AIX at any version earlier than 4.3,
+# and Riverace is not testing or supporting ACE on them either. No steps
+# have been taken to intentionally disable anything, but it is not being
+# tested either.
+#
+# NOTE 2! This file is only for use with the older CSet++ compiler, which
+# IBM doesn't sell or support any longer. Riverace doesn't support ACE
+# with it either. This file is still here in case there is some site
+# still using the old compiler, but it is completely unsupported.
+#
 # On 4.1, this file assumes that the user has installed the AIX patch
 # containing the dl*() APIs.  To use these APIs, IBM has created a
 # separate product (free to AIX licensees) called shared library
@@ -42,6 +52,12 @@ endif
 AIX_MAJOR_VERS := $(shell uname -v)
 AIX_MINOR_VERS := $(shell uname -r)
 
+# aix_build turns on the funky shared library building code.
+aix_build = 1
+# ibmcxx_build turns on the extra step for instantiating and compiling
+# template instances.
+ibmcxx_build = 1
+
 ifeq ($(threads),1)
 CC	    = xlc_r
 CXX	    = xlC_r
@@ -77,13 +93,9 @@ CPPFLAGS    += -qlanglvl=ansi -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_M
 # Process_Strategy_Test went CPU bound in ostream, so I removed it (S. Huston)
 DCFLAGS     += -g -qcheck=nobounds:div:null
 
+ACELIB      = -lACE
 LD          = $(CXX)
 
-ifeq ($(shared_libs),1)
-ACELIB      = -lACEshr
-SHLIBA      = $(SHLIB:lib%.so=lib%shr.a)
-endif
-
 ifeq ($(AIX_MINOR_VERS),1)
 LLIBS	    = -lsvld -ltli_r $(ACELIB)
 LIBS	    += $(filter-out $(SHLIBA:lib%.a=-l%), $(LLIBS))
@@ -104,4 +116,3 @@ OCCFLAGS    += -O2 -qarch=com
 RANLIB	    = ranlib
 SOFLAGS	    = -p 0
 TEMPINCDIR  = tempinc
-SOBUILD = 
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU
index ddc6eabf0d9..ab57d5df40f 100644
--- a/include/makeinclude/rules.lib.GNU
+++ b/include/makeinclude/rules.lib.GNU
@@ -100,8 +100,8 @@ ifeq (1,$(ace_lib_prelink))
 	-$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR)
 endif # ace_lib_prelink
 	$(AR) $(ARFLAGS) $@ $?
-ifdef TEMPINCDIR
-# This is required to get AIX xlC to instantiate and compile the needed
+ifdef ibmcxx_build
+# This is required to get AIX IBM C/C++ to instantiate and compile the needed
 # templates.
 	if test -s ./$(TEMPINCDIR)/*.C; \
 	then \
@@ -135,8 +135,8 @@ endif  # SHLIBBUILD
 ifdef PRELIB
 	$(PRELIB)
 endif
-ifdef TEMPINCDIR
-# This is required to get AIX xlC to instantiate and compile the needed
+ifdef ibmcxx_build
+# This is required to get AIX IBM C/C++ to instantiate and compile the needed
 # templates before building the library.
 	if test -s ./$(TEMPINCDIR)/*.C; \
 	then \
@@ -147,7 +147,7 @@ endif
 ifdef SHLIBBUILD
 	$(SHLIBBUILD)
 else
-ifdef TEMPINCDIR
+ifdef ibmcxx_build
 	if test -s ./$(TEMPINCDIR)/*.$(OBJEXT); \
         then \
 		$(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ $(VSHOBJS1) $(TEMPINCDIR)/*.$(OBJEXT) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS); \
@@ -168,12 +168,3 @@ endif
 endif
 	-chmod a+rx $@
 endif
-
-ifdef SHLIBA
-$(SHLIBA): $(VSHLIB)
-	$(AR) $(ARFLAGS) $@ $?
-	-chmod a+rx $@
-ifneq (,$(RANLIB))
-	-$(RANLIB) $@
-endif # RANLIB
-endif