Merge pull request #351 from mitza-oci/master

Updates for VxWorks 7 December 2016 release

4 files changed, 15 insertions, 19 deletions

diff --git a/ACE/ace/Atomic_Op.cpp b/ACE/ace/Atomic_Op.cpp
index 5b8cc7a0d59..e1075809b28 100644
--- a/ACE/ace/Atomic_Op.cpp
+++ b/ACE/ace/Atomic_Op.cpp
@@ -32,7 +32,7 @@ single_cpu_increment (volatile long *value)
      (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64))))
   return ace_atomic_add_long (
            reinterpret_cast<volatile unsigned long*> (value), 1);
-#elif defined(__GNUC__) && defined(PPC)
+#elif defined(__GNUC__) && defined(__PPC__)
   long tmp;
   asm("lwz %0,%1" : "=r" (tmp) : "m" (*value) );
   asm("addi %0,%0,1" : "+r" (tmp) );
@@ -56,7 +56,7 @@ single_cpu_decrement (volatile long *value)
      (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64))))
   return ace_atomic_add_long (
             reinterpret_cast<volatile unsigned long*> (value), -1);
-#elif defined(__GNUC__) && defined(PPC)
+#elif defined(__GNUC__) && defined(__PPC__)
   long tmp;
   asm("lwz %0,%1" : "=r" (tmp) : "m" (*value) );
   asm("addi %0,%0,-1" : "+r" (tmp) );
@@ -79,7 +79,7 @@ single_cpu_exchange (volatile long *value, long rhs)
      (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64))))
   return ace_atomic_swap_long (
            reinterpret_cast<volatile unsigned long*> (value), rhs);
-#elif defined(__GNUC__) && defined(PPC)
+#elif defined(__GNUC__) && defined(__PPC__)
   long tmp;
   asm("lwz %0,%1" : "=r" (tmp) : "m" (rhs) );
   asm("stw %0,%1" : "+r" (tmp), "=m" (*value) );
@@ -102,7 +102,7 @@ single_cpu_exchange_add (volatile long *value, long rhs)
      (defined (__SUNPRO_CC) && (defined (__i386) || defined (__x86_64))))
   return ace_atomic_swap_add_long (
            reinterpret_cast<volatile unsigned long*> (value), rhs);
-#elif defined(__GNUC__) && defined(PPC)
+#elif defined(__GNUC__) && defined(__PPC__)
   long tmp;
   asm("add %0,%1,%2" : "=r" (tmp) : "r" (*value), "r" (rhs) );
   asm("stw %0,%1" : "+r" (tmp), "=m" (*value) );
diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp
index 2988aaee6e6..ad949935525 100644
--- a/ACE/ace/OS_NS_netdb.cpp
+++ b/ACE/ace/OS_NS_netdb.cpp
@@ -27,6 +27,7 @@
 
 #ifdef ACE_VXWORKS
 # include "ace/os_include/sys/os_sysctl.h"
+# include <net/route.h>
 #endif
 
 #ifdef ACE_HAS_ALLOC_HOOKS
diff --git a/ACE/include/makeinclude/platform_vxworks.GNU b/ACE/include/makeinclude/platform_vxworks.GNU
index 9e09aa9aa3b..ffdcd18d159 100644
--- a/ACE/include/makeinclude/platform_vxworks.GNU
+++ b/ACE/include/makeinclude/platform_vxworks.GNU
@@ -30,6 +30,6 @@ endif
 ifeq (vxworks-6.9, $(findstring vxworks-6.9,$(WIND_PLATFORM)))
   include $(ACE_ROOT)/include/makeinclude/platform_vxworks6.9.GNU
 endif
-ifeq (vxworks-7.0, $(findstring vxworks-7.0,$(WIND_PLATFORM)))
+ifeq (vxworks-7, $(findstring vxworks-7,$(WIND_PLATFORM)))
   include $(ACE_ROOT)/include/makeinclude/platform_vxworks7.0.GNU
 endif
diff --git a/ACE/include/makeinclude/platform_vxworks7.0.GNU b/ACE/include/makeinclude/platform_vxworks7.0.GNU
index 41909ee772a..3491533a53a 100644
--- a/ACE/include/makeinclude/platform_vxworks7.0.GNU
+++ b/ACE/include/makeinclude/platform_vxworks7.0.GNU
@@ -1,7 +1,7 @@
 # -*- Makefile -*-
-# VxWorks 7.0
+# VxWorks 7
 
-# Building ACE for VxWorks 7.0
+# Building ACE for VxWorks 7
 #
 # Unlike earlier versions, VxWorks 7 requires a VSB before application code
 # can be compiled (either kernel mode or RTP).  See the VxWorks documentation
@@ -10,6 +10,7 @@
 # Create the file ace/config.h containing #include "ace/config-vxworks.h"
 # Create the file include/makeinclude/platform_macros.GNU containing...
 # VSB_DIR = <<absolute path to the VSB directory for the target system>>
+# TOOL = gnu
 # HOST_ROOT = <<location of host tools if using tao_idl, etc.>>
 # << add other build settings here (debug, optimize, inline, rtp) >>
 # include $(ACE_ROOT)/include/makeinclude/platform_vxworks.GNU
@@ -20,13 +21,7 @@
 #
 # Not all configurations supported on VxWorks 6.x have been brought forward
 # to this file.  If you are building a configuration that has not yet been
-# attempted on VxWorks 7, this file may need to be changed.  The following have
-# been tested:
-#   hosts: linux
-#   targets: itl_x86
-#   toolchains: gnu4.3
-#   rtp settings: 1, 0
-#   libraries: shared, static
+# attempted on VxWorks 7, this file may need to be changed.
 
 VXWORKS = 1
 CROSS-COMPILE = 1
@@ -95,10 +90,10 @@ ifeq ($(rtp),0)
 
   IFILE = $(VDIR)$(notdir $(basename $(1)))
   define LINK.cc.override
-$(LD) -r -nostdlib -Wl,-X $(LDFLAGS) -o $(call IFILE,$@)_partial.o $(filter %.o,$^) $(DKM_LIBS)
+$(LD) -r -nostdlib $(LDFLAGS) -o $(call IFILE,$@)_partial.o $(filter %.o,$^) $(DKM_LIBS)
 	$(NM) $(call IFILE,$@)_partial.o | $(MUNCH) > $(call IFILE,$@)_ctdt.c
 	$(COMPILE.cc) -o $(call IFILE,$@)_ctdt.o $(call IFILE,$@)_ctdt.c
-	$(LD) -r -nostdlib -Wl,-X $(LD_SCRIPT_DOWNLOAD) -o $@ $(call IFILE,$@)_ctdt.o $(call IFILE,$@)_partial.o
+	$(LD) -r -nostdlib -X $(LD_SCRIPT_DOWNLOAD) -o $@ $(call IFILE,$@)_ctdt.o $(call IFILE,$@)_partial.o
   endef
 
   SOLINK.cc.override = $(LINK.cc.override)
@@ -123,7 +118,6 @@ endif
 DCFLAGS += -g
 DCCFLAGS += -g
 
-LD = $(CXX)
 DLD = $(LD)
 
 EXEEXT = $(if $(findstring 1,$(rtp)),.vxe,.out)
@@ -132,11 +126,12 @@ SO_NAME = $(SHLIB)
 SOFLAGS += $(C++_COMPILER) $(OPTION_SHARED_CODE) $(LD_SHARED_LIB) \
            $(LD_OPTION_SONAME)
 
-LDFLAGS := $(filter-out -X -N,$(LDFLAGS))
 ifeq ($(rtp),1)
+  LD = $(CXX)
+  LDFLAGS := $(filter-out -X -N,$(LDFLAGS))
   LDFLAGS += -L$(VSB_DIR)/usr/lib/common$(if $(filter library,$(PRJ_TYPE)),/PIC -L$(VSB_DIR)/usr/lib/common)
 endif
 LIBS += -lstdc++
 
 build_nonstatic = $(if $(findstring 1,$(shared_libs)$(shared_libs_only)),$(if $(filter 1,$(static_libs_only)),,1))
-LDFLAGS += $(if $(build_nonstatic),$(LD_OPTION_DYNAMIC),-static)
+LDFLAGS += $(if $(build_nonstatic),$(LDFLAGS_DYNAMIC),-static)