--- openjdk/hotspot/build/linux/makefiles/vm.make.orig 2008-05-08 02:50:39.000000000 +0200 +++ openjdk/hotspot/build/linux/makefiles/vm.make 2008-05-07 22:21:03.000000000 +0200 @@ -181,7 +181,7 @@ LIBS_VM += $(LIBFFI_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/icedtea-static-libstdc++.patch.orig 2008-05-08 07:37:37.000000000 +0200 +++ patches/icedtea-static-libstdc++.patch 2008-05-08 07:38:25.000000000 +0200 @@ -8,7 +8,7 @@ +ifeq ($(ZERO_LIBARCH), ppc64) + STATIC_CXX = false +else -+ STATIC_CXX = true ++ STATIC_CXX = false +endif + ifeq ($(LINK_INTO),AOUT) @@ -24,10 +24,10 @@ + 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) --- patches/icedtea-zero-build.patch.orig 2008-05-08 07:42:38.000000000 +0200 +++ patches/icedtea-zero-build.patch 2008-05-08 07:42:55.000000000 +0200 @@ -128,7 +128,7 @@ +LIBS_VM += $(LIBFFI_LIBS) +endif - LINK_VM = $(LINK_LIB.c) + LINK_VM = $(LINK_LIB.cpp) diff -r c9fa8e3d5aa2 openjdk/jdk/make/common/Defs-linux.gmk --- openjdk/jdk/make/common/Defs-linux.gmk Thu Mar 20 13:42:48 2008 +0000