--- openjdk/hotspot/build/linux/makefiles/vm.make.105	2008-11-25 10:11:51.000000000 +0100
+++ openjdk/hotspot/build/linux/makefiles/vm.make	2008-12-17 17:16:05.000000000 +0100
@@ -141,13 +141,13 @@
     LFLAGS_VM              += $(STATIC_LIBGCC)
     LIBS_VM                += $(STATIC_STDCXX)
   else
-    LIBS_VM                += -lstdc++
+    LIBS_VM                += 
   endif
 
   LIBS_VM                  += $(LIBS)
 endif
 
-LINK_VM = $(LINK_LIB.c)
+LINK_VM = $(LINK_LIB.cpp)
 
 # rule for building precompiled header
 $(PRECOMPILED_HEADER): $(Precompiled_Files)
--- openjdk/hotspot/build/linux/makefiles/launcher.make.orig	2008-04-11 10:25:11.000000000 +0200
+++ openjdk/hotspot/build/linux/makefiles/launcher.make	2008-05-08 07:35:50.000000000 +0200
@@ -48,7 +48,7 @@
   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)
--- patches/hotspot/14.0b08/icedtea-static-libstdc++.patch.orig	2008-12-17 17:03:23.000000000 +0100
+++ patches/hotspot/14.0b08/icedtea-static-libstdc++.patch	2008-12-17 17:04:08.000000000 +0100
@@ -8,7 +8,7 @@
 +ifeq ($(ZERO_LIBARCH), ppc64)
 +  STATIC_CXX = false
 +else
-+  STATIC_CXX = true
++  STATIC_CXX = false
 +endif
 +
  ifeq ($(LINK_INTO),AOUT)
--- patches/hotspot/original/icedtea-static-libstdc++.patch.orig	2008-12-17 17:03:31.000000000 +0100
+++ patches/hotspot/original/icedtea-static-libstdc++.patch	2008-12-17 17:04:27.000000000 +0100
@@ -8,7 +8,7 @@
 +ifeq ($(ZERO_LIBARCH), ppc64)
 +  STATIC_CXX = false
 +else
-+  STATIC_CXX = true
++  STATIC_CXX = false
 +endif
 +
  ifeq ($(LINK_INTO),AOUT)
--- patches/hotspot/original/icedtea-zero-build.patch.orig	2008-12-17 17:08:03.000000000 +0100
+++ patches/hotspot/original/icedtea-zero-build.patch	2008-12-17 17:08:10.000000000 +0100
@@ -128,6 +128,6 @@
 +LIBS_VM += $(LIBFFI_LIBS)
 +endif
  
- LINK_VM = $(LINK_LIB.c)
+ LINK_VM = $(LINK_LIB.cpp)