ChangeLogTag: Tue Feb 4 11:21:13 MST 2003 Rob Andzik <andzik@rtlogic.com>

5 files changed, 93 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index c9c5438d75b..2052a327c8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Tue Feb  4 11:21:13 MST 2003 Rob Andzik <andzik@rtlogic.com>
+
+         * ACE_wrappers/include/makeinclude/platform_vxworks5.x_g++.GNU
+            - Added three new variables
+		         GCC_VERSION (defaults to gcc-2.96)
+		         VXWORKS_VERSION_FLAG (defaults to -DACE_VXWORKS=0x542)
+		         VXWORKS_STDINC_FLAG (defaults to <null>)
+
+            - Modified all sets of GCCLIB_DIR to use GCC_VERSION
+            - Modified all references to ACE_VXWORKS to use VXWORKS_VERSION_FLAG
+            - replaced -nostdinc with VXWORKS_STDINC_FLAG
+
+         * ACE_wrappers/ace/config-vxworks5.x.h
+            - Added define ACE_LACKS_CLEARERR (wrapped in ACE_VXWORKS check)
+
+         * ACE_wrappers/ace/OS.i
+            - Added ACE_UNUSED_ARG where warnings occurred.
+
 Mon Feb  3 16:33:02 2003  Heather Drury  <drury_h@ociweb.com>
 
 	* ace/config-freebsd.h: msgsnd() with const parameter was recently
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index c9c5438d75b..2052a327c8f 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,21 @@
+Tue Feb  4 11:21:13 MST 2003 Rob Andzik <andzik@rtlogic.com>
+
+         * ACE_wrappers/include/makeinclude/platform_vxworks5.x_g++.GNU
+            - Added three new variables
+		         GCC_VERSION (defaults to gcc-2.96)
+		         VXWORKS_VERSION_FLAG (defaults to -DACE_VXWORKS=0x542)
+		         VXWORKS_STDINC_FLAG (defaults to <null>)
+
+            - Modified all sets of GCCLIB_DIR to use GCC_VERSION
+            - Modified all references to ACE_VXWORKS to use VXWORKS_VERSION_FLAG
+            - replaced -nostdinc with VXWORKS_STDINC_FLAG
+
+         * ACE_wrappers/ace/config-vxworks5.x.h
+            - Added define ACE_LACKS_CLEARERR (wrapped in ACE_VXWORKS check)
+
+         * ACE_wrappers/ace/OS.i
+            - Added ACE_UNUSED_ARG where warnings occurred.
+
 Mon Feb  3 16:33:02 2003  Heather Drury  <drury_h@ociweb.com>
 
 	* ace/config-freebsd.h: msgsnd() with const parameter was recently
diff --git a/ace/OS.i b/ace/OS.i
index 0edd07e1b45..843036b03bf 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -2639,6 +2639,10 @@ ACE_OS::recursive_mutex_cond_unlock (ACE_recursive_thread_mutex_t *m,
         return -1;
       ++state.relock_count_;
     }
+#    else /* not ACE_WIN32 */
+    // prevent warnings for unused variables
+    ACE_UNUSED_ARG (state);
+    ACE_UNUSED_ARG (m);
 #    endif /* ACE_WIN32 */
   return 0;
 #  else /* ACE_HAS_RECURSIVE_MUTEXES */
@@ -2717,6 +2721,11 @@ ACE_OS::recursive_mutex_cond_relock (ACE_recursive_thread_mutex_t *m,
       --state.relock_count_;
     }
   return;
+#    else /* not ACE_WIN32 */
+    // prevent warnings for unused variables
+    ACE_UNUSED_ARG (state);
+    ACE_UNUSED_ARG (m);
+
 #    endif /* ACE_WIN32 */
 #  else
   // Without recursive mutex support, it's somewhat trickier. On entry,
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index e5713d6ab64..d4b42f231bc 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -46,6 +46,10 @@
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
 # define ACE_LACKS_SIGNED_CHAR
 
+# if defined (ACE_VXWORKS) && ACE_VXWORKS >= 0x542
+#   define ACE_LACKS_CLEARERR
+# endif /* ACE_VXWORKS >= 0x542 */
+
 #elif defined (ghs)
   // Processor type, if necessary.  Green Hills defines "ppc".
 # if defined (ppc)
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index f24d9ee79de..4452ebdc6ac 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -78,69 +78,91 @@ endif # ! PERL_PATH
 ####  WIND_BASE = /project/doc/pkg/wind
 ####  WIND_HOST_TYPE = sun4-solaris2
 ####  CPU = I80486
+####  GCC_VERSION = gcc-2.96
 ####
 ####  include $(ACE_ROOT)/include/makeinclude/platform_vxworks5.x_g++.GNU
 ####
+####  NOTE: VxWorks 5.4 uses cygnus-2.7.2-960126
+####        VxWorks 5.4.1 uses gcc-2.96
+####
 #### 2) modify the code below to set CPU, or
 #### 3) set CPU on the command line, e.g., "make CPU=I80486"
 ifeq ($(CPU),)
   CPU = PPC604
 endif # default CPU
 
+ifeq ($(GCC_VERSION),)
+  GCC_VERSION = gcc-2.96
+endif # default GCC Version
+
+# These variables may be set on the command line if a different ACE_VXWORKS
+# flag is desired.
+                                               
+ifeq ($(VXWORKS_VERSION_FLAG),)
+   ifeq ($(GCC_VERSION),gcc-2.96)
+       VXWORKS_VERSION_FLAG = -DACE_VXWORKS=0x542
+   else
+       VXWORKS_VERSION_FLAG = -DACE_VXWORKS=0x540
+       VXWORKS_STDINC_FLAG = -nostdinc
+   endif # GCC_VERSION
+endif # VXWORKS_VERSION_FLAG
+   
+
+
 ifeq ($(CPU),SH7700)
   BINXSYM_NAME = xsym
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=SH7700 -m3
   CCFLAGS += $(TEMPLATES_FLAG)
-  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/sh-wrs-vxworks/gcc-2.96
+  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/sh-wrs-vxworks/$(GCC_VERSION)
   TOOLENV = sh
 else
 ifeq ($(CPU),SH7700LE)
   BINXSYM_NAME = xsym
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=SH7700 -m3 -ml
   CCFLAGS += $(TEMPLATES_FLAG)
-  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/sh-wrs-vxworks/gcc-2.96
+  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/sh-wrs-vxworks/$(GCC_VERSION)
   TOOLENV = sh
 else
 ifeq ($(CPU),SH7750)
   BINXSYM_NAME = xsym
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=SH7750 -m4
   CCFLAGS += $(TEMPLATES_FLAG)
-  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/sh-wrs-vxworks/gcc-2.96
+  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/sh-wrs-vxworks/$(GCC_VERSION)
   TOOLENV = sh
 else
 ifeq ($(CPU),SH7750LE)
   BINXSYM_NAME = xsym
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=SH7750 -m4 -ml -mspace
   CCFLAGS += $(TEMPLATES_FLAG)
-  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/sh-wrs-vxworks/gcc-2.96
+  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/sh-wrs-vxworks/$(GCC_VERSION)
   TOOLENV = sh
 else
 ifeq ($(CPU),PPC403)
   BINXSYM_NAME = xsym
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=PPC403 -mcpu=403
   CCFLAGS += $(TEMPLATES_FLAG)
-  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126
+  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/$(GCC_VERSION)
   TOOLENV = ppc
 else
 ifeq ($(CPU),PPC604)
   BINXSYM_NAME = xsym
-  CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=PPC604
+  CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=PPC604 $(VXWORKS_VERSION_FLAG)
   CCFLAGS += $(TEMPLATES_FLAG) -mlongcall
-  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126
+  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/$(GCC_VERSION)
   TOOLENV = ppc
 else
 ifeq ($(CPU),PPC603)
   BINXSYM_NAME = xsym
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=PPC603
   CCFLAGS += $(TEMPLATES_FLAG) -mlongcall
-  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126
+  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/$(GCC_VERSION)
   TOOLENV = ppc
 else
 ifeq ($(CPU),PPC860)
   BINXSYM_NAME = xsym
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=PPC860 -mcpu=860
   CCFLAGS += $(TEMPLATES_FLAG) -mlongcall
-  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126
+  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/$(GCC_VERSION)
   TOOLENV = ppc
 else
 ifeq ($(CPU),SIMNT)
@@ -149,7 +171,7 @@ ifeq ($(CPU),SIMNT)
             -U__WIN32 -U__WIN32__ -U__WIN32 -B$(GCCLIB_DIR) -DCPU=SIMNT
   CCFLAGS += $(TEMPLATES_FLAG)
   GCCLIB_DIR = \
-    $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126
+    $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/$(GCC_VERSION)
   TOOLENV = simpc
 else
 ifeq ($(CPU),PENTIUMPRO)
@@ -182,41 +204,41 @@ ifeq ($(CPU),SIMSPARCSOLARIS)
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=SIMSPARCSOLARIS
   CCFLAGS += $(TEMPLATES_FLAG)
   GCCLIB_DIR = \
-    $(HOST_DIR)/lib/gcc-lib/sparc-sun-solaris2.5.1/cygnus-2.7.2-960126
+    $(HOST_DIR)/lib/gcc-lib/sparc-sun-solaris2.5.1/$(GCC_VERSION)
   TOOLENV = simso
 else
 ifeq ($(CPU),SPARC)
   BINXSYM_NAME = xsym
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=SPARC
   CCFLAGS += $(TEMPLATES_FLAG)
-  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/sparc-wrs-vxworks/cygnus-2.7.2-960126
+  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/sparc-wrs-vxworks/$(GCC_VERSION)
   TOOLENV = sparc
 else
 ifeq ($(CPU),MC68020)
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=MC68020 -m68020 -m68881
-  CCFLAGS += $(TEMPLATES_FLAG) -DACE_VXWORKS=0x540
-  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/m68k-wrs-vxworks/cygnus-2.7.2-960126
+  CCFLAGS += $(TEMPLATES_FLAG)  $(VXWORKS_VERSION_FLAG)
+  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/m68k-wrs-vxworks/$(GCC_VERSION)
   TOOLENV = 68k
 else
 ifeq ($(CPU),MC68030)
   BINXSYM_NAME = xsym
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=MC68030 -m68030 -m68881
-  CCFLAGS += $(TEMPLATES_FLAG) -DACE_VXWORKS=0x540
-  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/m68k-wrs-vxworks/cygnus-2.7.2-960126
+  CCFLAGS += $(TEMPLATES_FLAG)  $(VXWORKS_VERSION_FLAG)
+  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/m68k-wrs-vxworks/$(GCC_VERSION)
   TOOLENV = 68k
 else
 ifeq ($(CPU),MC68040)
   BINXSYM_NAME = xsym
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=MC68040 -m68040 -m68881
-  CCFLAGS += $(TEMPLATES_FLAG) -DACE_VXWORKS=0x540
-  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/m68k-wrs-vxworks/cygnus-2.7.2-960126
+  CCFLAGS += $(TEMPLATES_FLAG)  $(VXWORKS_VERSION_FLAG)
+  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/m68k-wrs-vxworks/$(GCC_VERSION)
   TOOLENV = 68k
 else
 ifeq ($(CPU),MC68060)
   BINXSYM_NAME = xsym
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=MC68060 -m68040 -m68881
-  CCFLAGS += $(TEMPLATES_FLAG) -DACE_VXWORKS=0x540
-  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/m68k-wrs-vxworks/cygnus-2.7.2-960126
+  CCFLAGS += $(TEMPLATES_FLAG)  $(VXWORKS_VERSION_FLAG)
+  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/m68k-wrs-vxworks/$(GCC_VERSION)
   TOOLENV = 68k
 else
   BINXSYM_NAME = xsym
@@ -304,7 +326,7 @@ ifndef ACE_CC_VERSION
 endif # ! ACE_CC_VERSION
 ifeq (egcs,$(findstring egcs,$(ACE_CC_VERSION)))
   ACE_HAS_GNUG_PRE_2_8 := 0
-  CFLAGS += -DACE_VXWORKS=0x540
+  CFLAGS +=  $(VXWORKS_VERSION_FLAG)
   ifeq ($(TOOLENV),386)
     #### Tornado II should support -fno-implicit-templates for pc486.
     CCFLAGS += $(TEMPLATES_FLAG)
@@ -317,7 +339,7 @@ ifeq (egcs,$(findstring egcs,$(ACE_CC_VERSION)))
 endif # egcs
 
 CFLAGS          += -D_REENTRANT -ansi -fno-builtin -fno-defer-pop \
-                   -fvolatile -nostdinc -nostdlib $(PIPE_OPT) -W -Wall
+                   -fvolatile $(VXWORKS_STDINC_FLAG) -nostdlib $(PIPE_OPT) -W -Wall
 CCFLAGS         += $(CFLAGS)
 ifeq (0,$(rtti))
   #### Don't use RTTI even with egcs, because Tornado 1.0.x libraries