--- openjdk/hotspot/build/linux/makefiles/gcc.make	2007-07-05 10:16:37.000000000 +0300
+++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-07-13 23:25:12.000000000 +0300
@@ -115,11 +115,11 @@ OPT_CFLAGS/NOOPT=-O0
 # Linker flags
 
 # statically link libstdc++.so, work with gcc but ignored by g++
-STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+STATIC_STDCXX = 
 
 # statically link libgcc and/or libgcc_s, libgcc does not exist before gcc-3.x.
 ifneq ("${CC_VER_MAJOR}", "2")
-STATIC_LIBGCC += -static-libgcc
+STATIC_LIBGCC += 
 endif
 
 ifeq ($(BUILDARCH), ia64)
--- openjdk/hotspot/build/linux/makefiles/launcher.make	2007-07-05 10:16:37.000000000 +0300
+++ openjdk/hotspot/build/linux/makefiles/launcher.make	2007-07-13 23:25:12.000000000 +0300
@@ -48,7 +48,7 @@ else
   LIBS_LAUNCHER             += -l$(JVM) $(LIBS)
 endif
 
-LINK_LAUNCHER = $(LINK.c)
+LINK_LAUNCHER = $(LINK.cpp)
 
 LINK_LAUNCHER/PRE_HOOK  = $(LINK_LIB.CC/PRE_HOOK)
 LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK)
--- openjdk/hotspot/build/linux/makefiles/vm.make	2007-07-05 10:16:37.000000000 +0300
+++ openjdk/hotspot/build/linux/makefiles/vm.make	2007-07-13 23:31:25.000000000 +0300
@@ -138,7 +138,7 @@ mapfile_reorder : mapfile $(REORDERFILE)
 	rm -f $@
 	cat $^ > $@
 
-STATIC_CXX = true
+STATIC_CXX = false
 
 ifeq ($(LINK_INTO),AOUT)
   LIBJVM.o                 =
@@ -163,7 +163,7 @@ else
   LIBS_VM                  += $(LIBS)
 endif
 
-LINK_VM = $(LINK_LIB.c)
+LINK_VM = $(LINK_LIB.cpp)
 
 # rule for building precompiled header
 $(PRECOMPILED_HEADER): $(Precompiled_Files)
--- openjdk/jdk/make/common/Defs-linux.gmk	2007-07-05 10:19:51.000000000 +0300
+++ openjdk/jdk/make/common/Defs-linux.gmk	2007-07-13 23:29:56.000000000 +0300
@@ -236,7 +236,7 @@ LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREF
 #
 CC_VER_MAJOR := $(shell $(CC) -dumpversion | $(SED) 's/egcs-//' | $(CUT) -d'.' -f1)
 ifeq ("$(CC_VER_MAJOR)", "3")
-OTHER_LDFLAGS  += -static-libgcc
+OTHER_LDFLAGS  +=
 endif
 
 # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
--- openjdk/jdk/make/common/shared/Compiler-gcc.gmk	2007-07-05 10:19:51.000000000 +0300
+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk	2007-07-13 23:25:12.000000000 +0300
@@ -61,7 +61,7 @@ ifeq ($(PLATFORM), linux)
   CC             = $(COMPILER_PATH)gcc
   CPP            = $(COMPILER_PATH)gcc -E
   # statically link libstdc++ before C++ ABI is stablized on Linux
-  STATIC_CXX     = true
+  STATIC_CXX     = false
   ifeq ($(STATIC_CXX),true)
     # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
     # We need to use gcc to statically link the C++ runtime. gcc and g++ use