Wed Mar 08 14:46:52 2000 Steve Huston <shuston@riverace.com>

2 files changed, 46 insertions, 23 deletions

diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index 122f8887736..6603d388526 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -30,6 +30,10 @@
 #  if defined (__xlC__)
 #    define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
 #    define ACE_TEMPLATES_REQUIRE_PRAGMA
+     // If compiling without thread support, turn off ACE's thread capability.
+#    if !defined (_THREAD_SAFE)
+#      define ACE_HAS_THREADS 0
+#    endif /* _THREAD_SAFE */
 #  endif
 
    // These are for Visual Age C++ only
@@ -140,12 +144,15 @@
 #define ACE_LACKS_TIMESPEC_T
 #define ACE_HAS_SELECT_H
 
+#define ACE_HAS_REENTRANT_FUNCTIONS
+
 // Compiler/platform defines the sig_atomic_t typedef
 #define ACE_HAS_SIG_ATOMIC_T
 #if (ACE_AIX_MINOR_VERS >= 2)
 #  define ACE_HAS_SIGINFO_T
 #  define ACE_LACKS_SIGINFO_H
 #endif /* ACE_AIX_MINOR_VERS >=2 */
+#define ACE_HAS_SIGWAIT
 
 #define ACE_HAS_SIN_LEN
 #define ACE_HAS_STRBUF_T
@@ -211,38 +218,45 @@
 // the tid_t (kernel thread ID) if called from a thread.
 // Thanks very much to Chris Lahey for straightening this out.
 
-#define ACE_HAS_THREADS
-#if !defined (ACE_MT_SAFE)
-#define ACE_MT_SAFE 1
+// Unless threads are specifically turned off, build with them enabled.
+#if !defined (ACE_HAS_THREADS)
+#  define ACE_HAS_THREADS 1
 #endif
 
-#define ACE_HAS_PTHREADS
+#if (ACE_HAS_THREADS != 0)
+#  if !defined (ACE_MT_SAFE)
+#    define ACE_MT_SAFE 1
+#  endif
+
+#  define ACE_HAS_PTHREADS
 // 4.3 and up has 1003.1c standard; 4.2 has draft 7
-#if (ACE_AIX_MINOR_VERS >= 3)
-#  define ACE_HAS_PTHREADS_STD
-#  define ACE_HAS_PTHREADS_UNIX98_EXT
+#  if (ACE_AIX_MINOR_VERS >= 3)
+#    define ACE_HAS_PTHREADS_STD
+#    define ACE_HAS_PTHREADS_UNIX98_EXT
 // ACE_LACKS_SETSCHED should not be needed, but the OS.* doesn't fine tune
 // this enough - it's too overloaded. Fix after ACE 5 is done.
-#  define ACE_LACKS_SETSCHED
-#else
-#  define ACE_HAS_PTHREADS_DRAFT7
-#  define ACE_LACKS_RWLOCK_T
-#  define ACE_LACKS_THREAD_STACK_ADDR
+#    define ACE_LACKS_SETSCHED
+#  else
+#    define ACE_HAS_PTHREADS_DRAFT7
+#    define ACE_LACKS_RWLOCK_T
+#    define ACE_LACKS_THREAD_STACK_ADDR
 // If ACE doesn't compile due to the lack of these methods, please
 // send email to ace-users@cs.wustl.edu reporting this.
 // #define ACE_LACKS_CONDATTR_PSHARED
 // #define ACE_LACKS_MUTEXATTR_PSHARED
-#  define ACE_LACKS_SETSCHED
-#endif /* ACE_AIX_MINOR_VERS >= 3 */
+#    define ACE_LACKS_SETSCHED
+#  endif /* ACE_AIX_MINOR_VERS >= 3 */
 
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
-#define ACE_HAS_REENTRANT_FUNCTIONS
-#define ACE_HAS_SIGTHREADMASK
-#define ACE_HAS_SIGWAIT
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE
-#define ACE_MALLOC_ALIGN 8
+#  define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
+#  define ACE_HAS_SIGTHREADMASK
+#  define ACE_HAS_THREAD_SPECIFIC_STORAGE
 
-#define ACE_LACKS_THREAD_PROCESS_SCOPING
+#  define ACE_LACKS_THREAD_PROCESS_SCOPING
+#else
+#  undef ACE_HAS_THREADS
+#endif /* ACE_HAS_THREADS != 0 */
+
+#define ACE_MALLOC_ALIGN 8
 
 // By default, tracing code is not compiled.  To compile it in, cause
 // ACE_NTRACE to not be defined, and rebuild ACE.
diff --git a/include/makeinclude/platform_aix4_cset++.GNU b/include/makeinclude/platform_aix4_cset++.GNU
index 09a29b05657..37f3c7da559 100644
--- a/include/makeinclude/platform_aix4_cset++.GNU
+++ b/include/makeinclude/platform_aix4_cset++.GNU
@@ -25,14 +25,24 @@ endif
 ifeq (,$(optimize))
   optimize = 0
 endif
+ifeq (,$(threads))
+  threads = 1
+endif
 
 # In case anything here or in the config depends on OS version number,
 # grab it here and pass it all to the compiler as well.
 AIX_MAJOR_VERS := $(shell uname -v)
 AIX_MINOR_VERS := $(shell uname -r)
 
+ifeq ($(threads),1)
 CC	    = xlc_r
 CXX	    = xlC_r
+DLD	    = makeC++SharedLib_r
+else
+CC          = xlc
+CXX         = xlC
+DLD	    = makeC++SharedLib
+endif
 
 # -qextchk is handy, but produces false type mismatches when linking
 # netsvcs with 3.1.4, so it's disabled.  IBM reports this fixed in 3.6.4.
@@ -59,7 +69,6 @@ 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
 
-DLD	    = makeC++SharedLib_r
 LD          = $(CXX)
 
 ifeq ($(shared_libs),1)
@@ -83,7 +92,7 @@ LDFLAGS	    += -bI:/lib/pse.exp
 # OCCFLAGS is not used by default.  To used it, set optimize=1
 # either in this file or on the command line.
 #OCCFLAGS    += -qarch=ppc -qtune=604
-OCCFLAGS    += -qarch=com 
+OCCFLAGS    += -O2 -qarch=com 
 RANLIB	    = ranlib
 SOFLAGS	    = -p 0
 TEMPINCDIR  = tempinc