diff options
| author | Adam Mitz <mitza@ociweb.com> | 2015-06-15 10:38:48 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2015-06-15 10:38:48 -0500 |
| commit | 4f176a53eb6d2fbe24bfc2b3fd7fa57fb47a128a (patch) | |
| tree | 1b6e8b04798326326380d863dbc8494dde298ca6 | |
| parent | 20cf91a8349ef44cba4b01d31d2bea07b2204ec7 (diff) | |
| download | ATCD-4f176a53eb6d2fbe24bfc2b3fd7fa57fb47a128a.tar.gz | |
Support for VxWorks 7.0 kernel mode.
| -rw-r--r-- | ACE/ace/OS_NS_unistd.inl | 4 | ||||
| -rw-r--r-- | ACE/ace/config-vxworks7.0.h | 4 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks7.0.GNU | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index 6bcc6f72547..5bc4e19a300 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -1110,7 +1110,7 @@ ACE_OS::ualarm (useconds_t usecs, useconds_t interval) #if defined (ACE_HAS_UALARM) return ::ualarm (usecs, interval); -#elif !defined (ACE_LACKS_UNIX_SIGNALS) +#elif !defined (ACE_LACKS_UNIX_SIGNALS) && !defined (ACE_LACKS_ALARM) ACE_UNUSED_ARG (interval); # if defined (ACE_VXWORKS) && ACE_VXWORKS >= 0x690 && defined (_WRS_CONFIG_LP64) return ::alarm (static_cast<unsigned int> (usecs * ACE_ONE_SECOND_IN_USECS)); @@ -1135,7 +1135,7 @@ ACE_OS::ualarm (const ACE_Time_Value &tv, useconds_t interval = (tv_interval.sec () * ACE_ONE_SECOND_IN_USECS) + tv_interval.usec (); return ::ualarm (usecs, interval); -#elif !defined (ACE_LACKS_UNIX_SIGNALS) +#elif !defined (ACE_LACKS_UNIX_SIGNALS) && !defined (ACE_LACKS_ALARM) ACE_UNUSED_ARG (tv_interval); # if defined (ACE_VXWORKS) && ACE_VXWORKS >= 0x690 && defined (_WRS_CONFIG_LP64) return ::alarm (static_cast<unsigned int> (tv.sec ())); diff --git a/ACE/ace/config-vxworks7.0.h b/ACE/ace/config-vxworks7.0.h index 6456bed2ff8..a0c45979569 100644 --- a/ACE/ace/config-vxworks7.0.h +++ b/ACE/ace/config-vxworks7.0.h @@ -18,6 +18,10 @@ # define ACE_LACKS_REGEX_H #endif +#ifndef __RTP__ +# define ACE_LACKS_ALARM +#endif + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_VXWORKS_7_0_H */ diff --git a/ACE/include/makeinclude/platform_vxworks7.0.GNU b/ACE/include/makeinclude/platform_vxworks7.0.GNU index b84d6dc3bd5..ae486c3ad1f 100644 --- a/ACE/include/makeinclude/platform_vxworks7.0.GNU +++ b/ACE/include/makeinclude/platform_vxworks7.0.GNU @@ -131,7 +131,9 @@ SOFLAGS += $(C++_COMPILER) $(OPTION_SHARED_CODE) $(LD_SHARED_LIB) \ $(LD_OPTION_SONAME) LDFLAGS := $(filter-out -X -N,$(LDFLAGS)) -LDFLAGS += -L$(VSB_DIR)/usr/lib/common$(if $(filter library,$(PRJ_TYPE)),/PIC) +ifeq ($(rtp),1) + LDFLAGS += -L$(VSB_DIR)/usr/lib/common$(if $(filter library,$(PRJ_TYPE)),/PIC -L$(VSB_DIR)/usr/lib/common) +endif LIBS += -lstdc++ LDFLAGS += $(if $(filter 1,$(shared_libs)),$(if $(filter 1,$(static_libs_only)),,$(LD_OPTION_DYNAMIC))) |