enabled -fno-implicit-templates for targets other than Intel.

1 files changed, 25 insertions, 22 deletions

diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index ee7d0a02c1b..e111e4a1215 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -23,15 +23,15 @@ static_libs = 1
 
 ifeq (,$(WIND_BASE))
   default:
-        @ERROR: you must set your WIND_BASE environment variable
+	@ERROR: you must set your WIND_BASE environment variable
 endif # WIND_BASE
 
 ifeq (,$(WIND_HOST_TYPE))
   default:
-        @ERROR: you must set your WIND_HOST_TYPE environment variable
+	@ERROR: you must set your WIND_HOST_TYPE environment variable
 endif # WIND_HOST_TYPE
 
-HOST_DIR        = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
+HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
 
 ifeq (,$(findstring $(HOST_DIR)/bin,$PATH))
   #### Use := instead of += because += inserts a space.
@@ -47,11 +47,13 @@ else  # ! win32 host
   ACE_QUOTE ="
 endif # ! win32 host
 
+
 #### BEGIN target CPU-specific settings
 
-#### This is kind of messy so that it can support multiple
-#### targets.  You'll need to set CPU to a supported CPU
-#### using one of these methods (unless your CPU is a PowerPC 604):
+
+#### This is kind of messy so that it can support multiple targets.
+#### You'll need to set CPU to a supported CPU using one of these
+#### methods (unless your CPU is a PowerPC 604):
 #### 1) create a $ACE_ROOT/include/makeinclude/platform_macros.GNU
 ####    that contains something like:
 ####
@@ -68,16 +70,32 @@ ifeq ($(CPU),)
 endif # default CPU
 
 ifeq ($(CPU),PPC604)
+  BINXSYM_NAME = xsym
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=PPC604
+  CCFLAGS += -fno-implicit-templates
   GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126
   TOOLENV = ppc
 else
 ifeq ($(CPU),I80486)
+  #### Note: -fno-implicit-templates doesn't seem to work well with g++
+  #### cygnus-2.7.2-960126 for pc486 target.  Some member functions don't
+  #### get instantiated.  Wind River knows about this problem (SPR 8483).
+  BINXSYM_NAME = xsymDec
   CFLAGS += -DCPU=I80486 -m486
   TOOLENV = 386
+else
+ifeq ($(CPU),I80386)
+  BINXSYM_NAME = xsymDec
+  CFLAGS += -DCPU=I80386
+  TOOLENV = 386
+else
+  BINXSYM_NAME = xsym
+  CCFLAGS += -fno-implicit-templates
+endif # I80386
 endif # I80486
 endif # PPC604
 
+
 #### END target CPU-specific settings
 
 
@@ -93,11 +111,7 @@ endif # ! x86-win32
 CC              = cc$(TOOLENV)
 CFLAGS          += -D_REENTRANT -ansi -fno-builtin -fno-defer-pop \
                    -fvolatile -nostdinc -nostdlib $(PIPE_OPT) -Wall
-#### Note: -f-no-implicit-templates doesn't seem to work well with
-####       g++ cygnus-2.7.2-960126 for pc486 target.  Some
-####       member functions don't get instantiated.  Wind River knows
-####       about this problem (SPR 8483).
-CCFLAGS         += $(CFLAGS) #### -fno-implicit-templates
+CCFLAGS         += $(CFLAGS)
 DCFLAGS         += -g
 INCLDIRS        += -I$(WIND_BASE)/target/h
 LD              = $(PERL_PATH) $(ACE_ROOT)/bin/ace_ld -c \
@@ -121,17 +135,6 @@ LINK.cc          = override
 LINK.cc.override = $(LD)
 
 
-#### The symbol table extractor is target-dependent.
-ifeq ($(CPU),I80486)
-  BINXSYM_NAME = xsymDec
-else
-ifeq ($(CPU),I80386)
-  BINXSYM_NAME = xsymDec
-else
-  BINXSYM_NAME = xsym
-endif # I80486
-endif # I80386
-
 #### To extract the symbol table from each executable, uncomment the POSTLINK
 #### definition below.
 ## POSTLINK         = ; VX_CPU_FAMILY=$(TOOLENV) $(BINXSYM_NAME) < $@ > $@.sym