enable inlining on VxWorks

4 files changed, 15 insertions, 11 deletions

diff --git a/ace/config-vxworks-ghs-1.8.h b/ace/config-vxworks-ghs-1.8.h
index be8fb30047a..02b3c8f0b72 100644
--- a/ace/config-vxworks-ghs-1.8.h
+++ b/ace/config-vxworks-ghs-1.8.h
@@ -2,7 +2,7 @@
 // $Id$
 
 // The following configuration file is designed to work for VxWorks
-// 5.2 platforms using the GreenHills 1.8.8 compiler.
+// 5.2/5.3 platforms using the GreenHills 1.8.8 (not 1.8.7!!!!) compiler.
 
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
@@ -13,6 +13,7 @@
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 #define ACE_HAS_CPLUSPLUS_HEADERS
 #define ACE_HAS_GREENHILLS_SOCKETS
+#define ACE_HAS_INLINED_OSCALLS
 #define ACE_HAS_MSG
 #define ACE_HAS_MT_SAFE_SOCKETS
 #define ACE_HAS_POSIX_NONBLOCK
@@ -47,14 +48,17 @@
 // Defines the page size of the system.
 #define ACE_PAGE_SIZE 4096
 
+#if !defined (ACE_NTRACE)
+#define ACE_NTRACE 1
+#endif /* ACE_NTRACE */
+
+// vxWorks.h must be included before time.h, and key_t must be
+// defined early also:  these are here
+// because Time_Value.h #includes ace/config.h, but not ace/OS.h.
+// Also, GreenHills 1.8.8 needs the stdarg.h #include early.
 typedef int key_t;
-// GreenHills 1.8.8 needs the stdarg.h #include early:  it shouldn't
-// hurt other compilers.
 #include /**/ <stdarg.h>
 #include /**/ <vxWorks.h>
 
-#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
 
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-vxworks5.2-g++.h b/ace/config-vxworks5.2-g++.h
index 9b0883162d9..842c11d723d 100644
--- a/ace/config-vxworks5.2-g++.h
+++ b/ace/config-vxworks5.2-g++.h
@@ -2,7 +2,7 @@
 // $Id$
 
 // The following configuration file is designed to work for VxWorks
-// 5.2 platforms using the GNU g++ 2.7.2 compiler, without repo patch
+// 5.2/5.3 platforms using the GNU g++ 2.7.2 compiler, without repo patch
 
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
@@ -14,6 +14,7 @@
 #define ACE_HAS_CPLUSPLUS_HEADERS
 #define ACE_HAS_GNU_CSTRING_H
 #define ACE_HAS_GREENHILLS_SOCKETS
+#define ACE_HAS_INLINED_OSCALLS
 #define ACE_HAS_MSG
 #define ACE_HAS_MT_SAFE_SOCKETS
 #define ACE_HAS_POSIX_NONBLOCK
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index e35b94dfed3..904a5e6a4fe 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -9,9 +9,8 @@ LIB_DIR		= $(HOST_DIR)/powerpc-wrs-vxworks/lib
 GCCLIB_DIR	= $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126
 
 CC		= $(BIN_DIR)/g++ppc
-#### CXX		= $(BIN_DIR)/g++ppc -D__INLINE__
 CXX		= $(CC)
-CCFLAGS		+= -B$(GCCLIB_DIR)/ -DCPU=PPC604 -DVXWORKS
+CCFLAGS		+= -B$(GCCLIB_DIR)/ -DCPU=PPC604 -DVXWORKS -D__ACE_INLINE__
 INCLDIRS	+= -I$(TARGET_DIR)/h
 LD		= $(BIN_DIR)/ldppc
 LDFLAGS		+= -r -L$(LIB_DIR) -L$(GCCLIB_DIR)
diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU
index f9eef7808a0..52144e92f47 100644
--- a/include/makeinclude/platform_vxworks5.x_ghs.GNU
+++ b/include/makeinclude/platform_vxworks5.x_ghs.GNU
@@ -2,7 +2,7 @@
 # *not* using Orbix
 CC		= cxvxppc
 CXX		= $(CC)
-CCFLAGS		+= --no_rtti -D__INLINE__
+CCFLAGS		+= --no_rtti -D__ACE_INLINE__
 DLD		= $(CXX) 
 LD		= $(CXX)
 LIBS            += /appl/newgreen/vxppc603/indlib.o
@@ -13,7 +13,7 @@ RANLIB		= /bin/true
 PRELIB	= (echo "int main() { return 0; }" > gcctemp.c && \
 	  $(COMPILE.cc) -o gcctemp.o gcctemp.c && \
 	  $(CXX) $(INCLDIRS) $^ $(LDFLAGS) $(LIBS); \
-	  status=$$?; rm -f gcctemp.c; exit $$status)
+	  status=$$?; rm -f gcctemp.c a.out*; exit $$status)
 
 #### don't build shared objects:
 BUILD           = $(VOBJS) $(VLIB) $(VBIN)