diff options
| author | Adam Mitz <mitza@ociweb.com> | 2017-01-09 16:49:56 -0600 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2017-01-09 16:49:56 -0600 |
| commit | a55bc9658df5e1bb763c8ff2f4d39d5921770701 (patch) | |
| tree | 86c12ed48f2753f3d502aa129d68b8506c0ce0ee | |
| parent | 8ee074292a1884a0b5d43e9ecd7c7e69b0975dd2 (diff) | |
| download | ATCD-a55bc9658df5e1bb763c8ff2f4d39d5921770701.tar.gz | |
Updates for VxWorks 7 December 2016 release
| -rw-r--r-- | ACE/ace/Atomic_Op.cpp | 8 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_netdb.cpp | 1 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks.GNU | 2 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks7.0.GNU | 2 |
4 files changed, 7 insertions, 6 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..d5fbc37b076 100644 --- a/ACE/include/makeinclude/platform_vxworks7.0.GNU +++ b/ACE/include/makeinclude/platform_vxworks7.0.GNU @@ -139,4 +139,4 @@ 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),$(LD_OPTION_DYNAMIC) -non-static,-static) |