Index: trunk/testcase/456/common.gmk
===================================================================
--- trunk/testcase/456/common.gmk	(revision 714)
+++ trunk/testcase/456/common.gmk	(revision 724)
@@ -14,6 +14,12 @@
 TARGET_SRCEXT   = c
 endif
+ifndef TARGET2_SRCEXT
+TARGET2_SRCEXT  = c
+endif
 ifndef TARGET_SOURCE
-TARGET_SOURCE = $(TARGET).$(TARGET_SRCEXT)
+TARGET_SOURCE   = $(TARGET).$(TARGET_SRCEXT)
+endif
+ifndef TARGET2_SOURCE
+TARGET2_SOURCE  = $(TARGET2).$(TARGET2_SRCEXT)
 endif
 
@@ -30,4 +36,12 @@
 endif
 
+ifndef GCC
+GCC = gcc
+endif
+ifndef GXX
+GXX = g++
+endif
+
+
 ifndef NOLINKING
 TARGET_LINKED_VAC = $(PATH_TARGET)/$(TARGET).vac.exe \
@@ -37,4 +51,16 @@
 				    $(PATH_TARGET)/$(TARGET).gcc.dump \
 				    $(PATH_TARGET)/$(TARGET).gcc.hlldump
+endif
+
+ifdef TARGET2
+TARGET2_VAC = $(PATH_TARGET)/$(TARGET2).vac.obj \
+			  $(PATH_TARGET)/$(TARGET2).vac.lst
+TARGET2_GCC = $(PATH_TARGET)/$(TARGET2).gcc.s   \
+			  $(PATH_TARGET)/$(TARGET2).gcc.o   \
+			  $(PATH_TARGET)/$(TARGET2).gcc.obj \
+			  $(PATH_TARGET)/$(TARGET2).gcc.lst
+
+TARGET2_LINK_VAC = $(PATH_TARGET)/$(TARGET2).vac.obj
+TARGET2_LINK_GCC = $(PATH_TARGET)/$(TARGET2).gcc.obj
 endif
 
@@ -52,4 +78,5 @@
 	$(PATH_TARGET)/$(TARGET).vac.obj \
 	$(PATH_TARGET)/$(TARGET).vac.lst \
+	$(TARGET2_VAC) \
 	$(TARGET_LINKED_VAC)
 	
@@ -59,4 +86,5 @@
 	$(PATH_TARGET)/$(TARGET).gcc.obj \
 	$(PATH_TARGET)/$(TARGET).gcc.lst \
+	$(TARGET2_GCC) \
 	$(TARGET_LINKED_GCC)
 
@@ -79,35 +107,48 @@
 								
 
-$(PATH_TARGET)/$(TARGET).vac.exe: $(PATH_TARGET)/$(TARGET).vac.obj
-	icc -Gd -Ti+ /Fm$(PATH_TARGET)/$(TARGET).vac.map /B/LINENUMBERS /B/DBGPACK -Fe$@ $<
+$(PATH_TARGET)/$(TARGET).vac.exe: $(PATH_TARGET)/$(TARGET).vac.obj $(TARGET2_LINK_VAC)
+	icc -Ti+ /Fm$(PATH_TARGET)/$(TARGET).vac.map /B/LINENUMBERS /B/DBGPACK -Fe$@ $< $(TARGET2_LINK_VAC)
 	
-$(PATH_TARGET)/$(TARGET).gcc.exe: $(PATH_TARGET)/$(TARGET).gcc.obj
+$(PATH_TARGET)/$(TARGET).gcc.exe: $(PATH_TARGET)/$(TARGET).gcc.obj $(TARGET2_LINK_GCC)
 ifeq "$(TARGET_SRCEXT)" ".c"
-	if gcc -g -Zomf -Zcrtdll -Zmap=$(PATH_TARGET)/$(TARGET).gcc.map -o $@ -Zlinker "/LINENUMBERS /MAP:FULL /PM:VIO" $<; then true; else rm -f $@; false; fi
+	if $(GCC) -g -Zomf -Zcrtdll -Zmap=$(PATH_TARGET)/$(TARGET).gcc.map -o $@ -Zlinker "/LINENUMBERS /MAP:FULL /PM:VIO" $< $(TARGET2_LINK_GCC); then true; else rm -f $@; false; fi
 else
-	if g++ -g -Zomf -Zcrtdll -Zmap=$(PATH_TARGET)/$(TARGET).gcc.map -o $@ -Zlinker "/LINENUMBERS /MAP:FULL /PM:VIO" $<; then true; else rm -f $@; false; fi
+	if $(GXX) -g -Zomf -Zcrtdll -Zmap=$(PATH_TARGET)/$(TARGET).gcc.map -o $@ -Zlinker "/LINENUMBERS /MAP:FULL /PM:VIO" $< $(TARGET2_LINK_GCC); then true; else rm -f $@; false; fi
 endif	
-
 
 	
 $(PATH_TARGET)/$(TARGET).vac.obj: $(TARGET_SOURCE)
 	icc -c -Gd -Ti+ -Fo$@ $<
+$(PATH_TARGET)/$(TARGET2).vac.obj: $(TARGET2_SOURCE)
+	icc -c -Gd -Ti+ -Fo$@ $<
+									
 								
 $(PATH_TARGET)/$(TARGET).gcc.obj: $(PATH_TARGET)/$(TARGET).gcc.o $(EMXOMF_DEP)
 	$(EMXOMF) -o $@ $< > $@.emxomf 2>&1
 	cat $@.emxomf
+$(PATH_TARGET)/$(TARGET2).gcc.obj: $(PATH_TARGET)/$(TARGET2).gcc.o $(EMXOMF_DEP)
+	$(EMXOMF) -o $@ $< > $@.emxomf 2>&1
+	cat $@.emxomf
 	
 $(PATH_TARGET)/$(TARGET).gcc.o:   $(TARGET_SOURCE)
-	gcc -c -g -o $@ $<
+	$(GCC) -c -g -o $@ $<
+$(PATH_TARGET)/$(TARGET2).gcc.o:  $(TARGET2_SOURCE)
+	$(GCC) -c -g -o $@ $<
 	
 $(PATH_TARGET)/$(TARGET).gcc.s:   $(TARGET_SOURCE)
-	gcc -S -g -o $@ $<
+	$(GCC) -S -g -o $@ $<
+$(PATH_TARGET)/$(TARGET2).gcc.s:  $(TARGET2_SOURCE)
+	$(GCC) -S -g -o $@ $<
 	
 	
 	
-$(PATH_TARGET)/$(TARGET).vac.lst: $(PATH_TARGET)/$(TARGET).vac.obj $(LISTOMF_DEP)
+$(PATH_TARGET)/$(TARGET).vac.lst:  $(PATH_TARGET)/$(TARGET).vac.obj $(LISTOMF_DEP)
+	-$(LISTOMF) -x $< > $@
+$(PATH_TARGET)/$(TARGET2).vac.lst: $(PATH_TARGET)/$(TARGET2).vac.obj $(LISTOMF_DEP)
 	-$(LISTOMF) -x $< > $@
 
-$(PATH_TARGET)/$(TARGET).gcc.lst: $(PATH_TARGET)/$(TARGET).gcc.obj $(LISTOMF_DEP)
+$(PATH_TARGET)/$(TARGET).gcc.lst:  $(PATH_TARGET)/$(TARGET).gcc.obj $(LISTOMF_DEP)
+	-$(LISTOMF) -x $< > $@
+$(PATH_TARGET)/$(TARGET2).gcc.lst: $(PATH_TARGET)/$(TARGET2).gcc.obj $(LISTOMF_DEP)
 	-$(LISTOMF) -x $< > $@
 
@@ -129,3 +170,13 @@
 	$(PATH_TARGET)/$(TARGET).gcc.dump \
 	$(PATH_TARGET)/$(TARGET).gcc.hlldump
+ifdef TARGET2_VAC
+	rm -f \
+	$(PATH_TARGET)/$(TARGET2).gcc.o \
+	$(PATH_TARGET)/$(TARGET2).gcc.s \
+	$(PATH_TARGET)/$(TARGET2).gcc.obj \
+	$(PATH_TARGET)/$(TARGET2).gcc.lst \
+	$(PATH_TARGET)/$(TARGET2).vac.obj \
+	$(PATH_TARGET)/$(TARGET2).vac.lst
+endif	
 	
+	
Index: trunk/testcase/456/globalstatic.cpp
===================================================================
--- trunk/testcase/456/globalstatic.cpp	(revision 714)
+++ trunk/testcase/456/globalstatic.cpp	(revision 724)
@@ -4,6 +4,6 @@
     virtual long GetJavaWrapper(void)
     {
-        static const char *pszFunction = __FUNCTION__;
-        return *pszFunction;
+        static const char *pszFunctionMethod = __FUNCTION__;
+        return *pszFunctionMethod;
     }
 };
@@ -12,7 +12,7 @@
 int main()
 {
-    static const char *pszFunction = __FUNCTION__;
+    static const char *pszFunctionMain = __FUNCTION__;
     foo obj;
-    int rc = obj.GetJavaWrapper() + *pszFunction;
+    int rc = obj.GetJavaWrapper() + *pszFunctionMain;
     return rc;
 }
