ChangeLogTag: Mon Jun 8 18:39:58 UTC 2009 Adam Mitz <mitza@ociweb.com>

11 files changed, 65 insertions, 5 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 63c052304e0..f0516e03d49 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,41 @@
+Mon Jun  8 18:39:58 UTC 2009  Adam Mitz  <mitza@ociweb.com>
+
+        * ace/Message_Queue_Vx.h:
+        * ace/OS_main.h:
+
+          Added ACE_Export to ACE_Message_Queue_Vx.
+          Added "exports" for the symbols ace_os_main_i and ace_main_i.
+          This allows them to work with GCC 4.x hidden visibility on platforms
+          that use redefinition of main (VxWorks).
+
+        * contrib/minizip/minizip.mwc:
+
+          Added a workspace so minizip will be "found" when running
+          mwc.pl -recurse.
+
+        * include/makeinclude/platform_lynxos.GNU:
+        * include/makeinclude/platform_vxworks6.3.GNU:
+
+          Both VxWorks and LynxOS:
+          For shared library builds (RTP), use -rpath-link to silence
+          warnings from the linker.  We assume the libraries in $ACE_ROOT/lib
+          will be present at runtime.
+
+          VxWorks only:
+          Allow in-place (no HOST_ROOT) cross-compilation on Win32 hosts.
+
+        * include/makeinclude/platform_sunos5_sunc++.GNU:
+
+          Default "distrib" to 1, which means we will not set RPATH, similar to
+          other platforms.  This resolves bug #3678.
+
+        * tests/Network_Adapters_Test.h:
+        * tests/Process_Manager_Test.cpp:
+        * tests/Signal_Test.cpp:
+        * tests/run_test.lst:
+
+          Fix ACE tests that were failing in single-threaded builds.
+
 Mon Jun  8 09:51:05  2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Bug_1890_Regression_Test.cpp:
diff --git a/ACE/ace/Message_Queue_Vx.h b/ACE/ace/Message_Queue_Vx.h
index 418e8cce183..535e1e25557 100644
--- a/ACE/ace/Message_Queue_Vx.h
+++ b/ACE/ace/Message_Queue_Vx.h
@@ -62,7 +62,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * *   is ignored; only the first block of a fragment chain is
  * *   recognized.
  */
-class ACE_Message_Queue_Vx : public ACE_Message_Queue<ACE_NULL_SYNCH>
+class ACE_Export ACE_Message_Queue_Vx: public ACE_Message_Queue<ACE_NULL_SYNCH>
 {
 public:
   // = Initialization and termination methods.
diff --git a/ACE/ace/OS_main.h b/ACE/ace/OS_main.h
index b338c35287b..5749d471198 100644
--- a/ACE/ace/OS_main.h
+++ b/ACE/ace/OS_main.h
@@ -141,14 +141,14 @@ ace_main_i
 #     define main \
 ACE_MAIN (int, char *[]); /* forward decl to gobble up the 'int' if there is one */ \
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL \
-int ace_os_main_i (int, char *[]); \
+ACE_Export int ace_os_main_i (int, char *[]); \
 ACE_END_VERSIONED_NAMESPACE_DECL \
 int \
 ACE_MAIN (int argc, char *argv[])    /* user's entry point, e.g., main */ \
 { \
   return ace_os_main_i (argc, argv); /* what the user calls "main" */ \
 } \
-int \
+ACE_Proper_Export_Flag int \
 ace_main_i
 
 #   elif !defined (ACE_HAS_WINCE)
diff --git a/ACE/contrib/minizip/minizip.mwc b/ACE/contrib/minizip/minizip.mwc
new file mode 100644
index 00000000000..397b73c819f
--- /dev/null
+++ b/ACE/contrib/minizip/minizip.mwc
@@ -0,0 +1,3 @@
+// $Id$
+workspace {
+}
diff --git a/ACE/include/makeinclude/platform_lynxos.GNU b/ACE/include/makeinclude/platform_lynxos.GNU
index 6279f4d2624..b2ea6d788c9 100644
--- a/ACE/include/makeinclude/platform_lynxos.GNU
+++ b/ACE/include/makeinclude/platform_lynxos.GNU
@@ -96,6 +96,9 @@ ifeq ($(shared_libs),1)
   CPPFLAGS += -DACE_HAS_SVR4_DYNAMIC_LINKING
   LDFLAGS  += -mshared
   LIBS     += -ldl
+  ifeq ($(CROSS-COMPILE),1)
+    LDFLAGS += -Wl,-rpath-link,$(ACE_ROOT)/lib
+  endif
 else
   LIBS     += -lnetinet -lnsl
 endif
diff --git a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU
index 5bf5127adaf..0c4663d5796 100644
--- a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -42,7 +42,7 @@
 
 compat4 ?= 0
 debug ?= 1
-distrib ?= 0
+distrib ?= 1
 stdcpplib ?= 1
 threads ?= 1
 versioned_so ?= 1
diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU
index 7bdc6254526..efcb91d19b5 100644
--- a/ACE/include/makeinclude/platform_vxworks6.3.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU
@@ -64,6 +64,7 @@ ifeq ("$(WIND_HOST_TYPE)","x86-win32")
   CIAO_ROOT:=$(subst \,/,$(CIAO_ROOT))
   HOST_ROOT:=$(subst \,/,$(HOST_ROOT))
   override RM=rm -f
+  HOST_EXE_EXT = .exe
 endif # x86-win32
 
 ifneq (,$(HOST_ROOT))
@@ -80,6 +81,10 @@ endif
 TAO_IDL_DEP = $(TAO_IDL)
 TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)
 CIDLC_DEP = $(CIDLC)
+else
+TAO_IDL_DEP = $(TAO_IDL)$(HOST_EXE_EXT)
+TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2)$(HOST_EXE_EXT)
+CIDLC_DEP = $(CIDLC)$(HOST_EXE_EXT)
 endif
 
 HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
@@ -224,6 +229,7 @@ ifeq ("$(TOOL_FAMILY)","gnu")
   ifeq ($(rtp),1)
     PIC = -fpic
     SOFLAGS += -fpic
+    LDFLAGS += -Wl,-rpath-link,$(ACE_ROOT)/lib
   endif
   SOFLAGS += -shared
   LDFLAGS += -non-static
diff --git a/ACE/tests/Network_Adapters_Test.h b/ACE/tests/Network_Adapters_Test.h
index 0d9c03b7430..a726b1212b6 100644
--- a/ACE/tests/Network_Adapters_Test.h
+++ b/ACE/tests/Network_Adapters_Test.h
@@ -171,7 +171,11 @@ private:
 class Stop_Handler : public ACE_Event_Handler
 {
 public:
+#ifdef ACE_HAS_THREADS
   typedef ACE_Atomic_Op<ACE_Mutex, long> counter_sig;
+#else
+  typedef long counter_sig;
+#endif
 
   // Constructor.
   Stop_Handler (ACE_Reactor * const reactor = ACE_Reactor::instance ());
diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp
index 60d390db846..51f587cf68b 100644
--- a/ACE/tests/Process_Manager_Test.cpp
+++ b/ACE/tests/Process_Manager_Test.cpp
@@ -542,6 +542,7 @@ run_main (int argc, ACE_TCHAR *argv[])
         }
     }
 
+#ifdef ACE_HAS_THREADS
   Process_Task task1 (argc > 0 ? argv[0] : ACE_TEXT ("Process_Manager_Test"), mgr, 3);
   Process_Task task2 (argc > 0 ? argv[0] : ACE_TEXT ("Process_Manager_Test"), mgr, 2);
   Process_Task task3 (argc > 0 ? argv[0] : ACE_TEXT ("Process_Manager_Test"), mgr, 1);
@@ -566,6 +567,7 @@ run_main (int argc, ACE_TCHAR *argv[])
                   order.c_str ()));
       test_status = 1;
     }
+#endif /* ACE_HAS_THREADS */
 
 #if !defined (ACE_OPENVMS)
   // --------------------------------------------------
diff --git a/ACE/tests/Signal_Test.cpp b/ACE/tests/Signal_Test.cpp
index 74251025f0a..9fdf4114183 100644
--- a/ACE/tests/Signal_Test.cpp
+++ b/ACE/tests/Signal_Test.cpp
@@ -473,6 +473,7 @@ run_main (int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) **** test 1: handle signals synchronously in a separate thread\n")));
 
+#ifdef ACE_HAS_THREADS
       ++test_number;
       // Run the parent logic for the signal test, first by handling
       // signals synchronously in a separate thread.
@@ -487,6 +488,9 @@ run_main (int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) **** test 3: handle signals asynchronously in this thread\n")));
+#else
+      test_number += 2;
+#endif /* ACE_HAS_THREADS */
 
       ++test_number;
       // And finally by handling asynchronously signals in this thread.
diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst
index 33a6d86eb96..fa357c2e908 100644
--- a/ACE/tests/run_test.lst
+++ b/ACE/tests/run_test.lst
@@ -65,7 +65,7 @@ Conn_Test: !ACE_FOR_TAO
 DLL_Test: !Unicos !STATIC !KCC_Linux
 DLList_Test: !ACE_FOR_TAO
 Date_Time_Test: !ACE_FOR_TAO
-Dev_Poll_Reactor_Test: !nsk
+Dev_Poll_Reactor_Test: !nsk !ST
 Dirent_Test: !VxWorks_RTP !LabVIEW_RT
 Dynamic_Priority_Test
 Dynamic_Test