ChangeLogTag:Wed Feb 21 19:27:14 UTC 2007 Ossama Othman <ossama_othman at symantec dot com>

6 files changed, 37 insertions, 8 deletions

diff --git a/ACE/include/makeinclude/platform_freebsd.GNU b/ACE/include/makeinclude/platform_freebsd.GNU
index a40ffbef07e..864ce829009 100644
--- a/ACE/include/makeinclude/platform_freebsd.GNU
+++ b/ACE/include/makeinclude/platform_freebsd.GNU
@@ -46,7 +46,7 @@ PRELIB = @echo
 ifeq ($(threads),1)
 RET = $(shell test $(OSVERSION) -lt 500016 && printf 1)
 ifeq ($(RET),1)
-  PTHREAD_CFLAGS = -D_THREAD_SAFE
+  PTHREAD_CPPFLAGS = -D_THREAD_SAFE
   PTHREAD_LIBS   = -pthread
 else
   RET = $(shell test $(OSVERSION) -lt 502102 && printf 1)
@@ -57,9 +57,11 @@ else
   endif
 endif # RET
 
-CFLAGS  += $(PTHREAD_CFLAGS)
+CPPFLAGS  += $(PTHREAD_CPPFLAGS)
 LIBS += $(PTHREAD_LIBS)
 
+else
+CPPFLAGS += -DACE_MT_SAFE=0
 endif # threads
 
 # Test for template instantiation, add to SOFLAGS if SONAME set,
diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU
index b794df1e43c..45184c092be 100644
--- a/ACE/include/makeinclude/platform_hpux_aCC.GNU
+++ b/ACE/include/makeinclude/platform_hpux_aCC.GNU
@@ -190,3 +190,20 @@ ifeq ($(threads),1)
   endif
 endif
 LIBS          += -lxti -lrt -ldld
+
+# The correct flags to pass to the linker for dynamic shared library
+# versioning
+#
+ifneq ($(SONAME),)
+  SOFLAGS += -Wl,+h -Wl,$(SONAME)
+endif
+
+# if _FILE_OFFSET_BITS==64 then the HP headers will produce
+# spurious 600 warnings, except on 11.23
+# Can also (possible) be fixed with patch PHKL_34670 on HP-UX 11.11
+#
+ifeq ($(64bitoffsets),1)
+  ifneq ($(HPUX_VERS), 1123)
+    CCFLAGS += +W600
+  endif
+endif
diff --git a/ACE/include/makeinclude/platform_irix6.x_sgic++.GNU b/ACE/include/makeinclude/platform_irix6.x_sgic++.GNU
index 1ad3c5c7d3d..8d18862b6dd 100644
--- a/ACE/include/makeinclude/platform_irix6.x_sgic++.GNU
+++ b/ACE/include/makeinclude/platform_irix6.x_sgic++.GNU
@@ -83,8 +83,17 @@ endif
 endif
 
 PIC		= -KPIC
-AR		= ar
-ARFLAGS		= r
+
+ifneq ($(templates),implicit)
+  AR            = ar
+  ARFLAGS       = r
+else
+# We need to create the archive via CC so that the prelinker can
+# instantiate the required templates.
+  AR            = CC -ar
+  ARFLAGS       = -o
+endif # templates != implicit
+
 RANLIB		= echo
 SOFLAGS		+= -shared $(CCFLAGS) $(CPPFLAGS) -all -multigot
 SOBUILD		= $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU
index 5b1963fbfb5..c18863b876d 100644
--- a/ACE/include/makeinclude/platform_linux.GNU
+++ b/ACE/include/makeinclude/platform_linux.GNU
@@ -104,9 +104,9 @@ LIBS    += -ldl
 
 ifeq ($(threads),1)
   LIBS += -lpthread
+  # look for the rt library in the usual places
+  LIBS += $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -lrt)
 endif
-# look for the rt library in the usual places
-LIBS += $(shell test "`ls -L /usr/lib/librt.so* /lib/librt.so*`" && echo -lrt)
 
 ifeq ($(optimize),1)
   SOFLAGS += -Wl,-O3
diff --git a/ACE/include/makeinclude/platform_tru64_cxx.GNU b/ACE/include/makeinclude/platform_tru64_cxx.GNU
index 335c10f362a..8db177d16c5 100644
--- a/ACE/include/makeinclude/platform_tru64_cxx.GNU
+++ b/ACE/include/makeinclude/platform_tru64_cxx.GNU
@@ -93,7 +93,7 @@ ifneq ($(SONAME),)
 endif
 
 CCFLAGS         += $(CFLAGS) $(WARNING_FLAGS) $(TEMPLATES_FLAG)
-DCFLAGS         += -g -O0
+DCFLAGS         += -g1 -O0
 DLD             = $(CXX)
 LD              = $(CXX)
 #### The -hidden [...] -non_hidden business avoids multiply defined
diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU
index 2b0ded6127f..8cff7458812 100644
--- a/ACE/include/makeinclude/rules.lib.GNU
+++ b/ACE/include/makeinclude/rules.lib.GNU
@@ -156,7 +156,8 @@ $(VLIB): $(VLOBJS)
         #### to lib files, for example.
 	-$(LINK.cc) $(LINK_OUTPUT_FLAG) ace-templ_inst $? $(LDFLAGS) $(ACE_NUL_STDERR)
   endif # ace_lib_prelink
-	echo $(TMPINCDIR:%=%/*.o) $(filter %.o, $?) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
+	([ "`echo $(TMPINCDIR:%=%/*.o)`" != "$(TMPINCDIR:%=%/*.o)" ] && echo $(TMPINCDIR:%=%/*.o); \
+	echo $(filter %.o, $?)) | xargs $(AR) $(ARFLAGS) $@ $(AREXTRA)
   ifdef ibmcxx_build
 # This is required to get AIX IBM C/C++ to instantiate and compile the needed
 # templates.