changeset in /hg/icedtea6: 2008-03-17 Gary Benson <gbenson at red...

[Gary Benson]

changeset d7f8439ac6db in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d7f8439ac6db
description:
	2008-03-17  Gary Benson  <gbenson at redhat.com>

	        * patches/icedtea-static-libstdc++.patch: New file.

diffstat:

2 files changed, 37 insertions(+)
ChangeLog                              |    4 +++
patches/icedtea-static-libstdc++.patch |   33 ++++++++++++++++++++++++++++++++

diffs (48 lines):

diff -r 3748242d0fa1 -r d7f8439ac6db ChangeLog
--- a/ChangeLog	Mon Mar 17 07:03:05 2008 -0400
+++ b/ChangeLog	Mon Mar 17 08:48:42 2008 -0400
@@ -1,3 +1,7 @@ 2008-03-17  Gary Benson  <gbenson at redhat
+2008-03-17  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-static-libstdc++.patch: New file.
+
 2008-03-17  Gary Benson  <gbenson at redhat.com>
 
 	* platform_zero.in: New file.
diff -r 3748242d0fa1 -r d7f8439ac6db patches/icedtea-static-libstdc++.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-static-libstdc++.patch	Mon Mar 17 08:48:42 2008 -0400
@@ -0,0 +1,33 @@
+diff -r e95eb2395f60 openjdk-ecj/hotspot/build/linux/makefiles/vm.make
+--- openjdk/hotspot/build/linux/makefiles/vm.make	Fri Nov 09 16:35:08 2007 +0000
++++ openjdk/hotspot/build/linux/makefiles/vm.make	Mon Nov 12 09:09:28 2007 +0000
+@@ -149,6 +149,12 @@
+ 	rm -f $@
+ 	cat $^ > $@
+ 
++ifeq ($(ZERO_LIBARCH), ppc64)
++  STATIC_CXX = false
++else
++  STATIC_CXX = true
++endif
++
+ ifeq ($(LINK_INTO),AOUT)
+   LIBJVM.o                 =
+   LIBJVM_MAPFILE           =
+@@ -162,8 +168,14 @@
+   # JVM is statically linked with libgcc[_s] and libstdc++; this is needed to
+   # get around library dependency and compatibility issues. Must use gcc not
+   # g++ to link.
+-  LFLAGS_VM                += $(STATIC_LIBGCC)
+-  LIBS_VM                  += $(STATIC_STDCXX) $(LIBS)
++  ifeq ($(STATIC_CXX), true)
++    LFLAGS_VM              += $(STATIC_LIBGCC)
++    LIBS_VM                += $(STATIC_STDCXX)
++  else
++    LIBS_VM                += -lstdc++
++  endif
++
++  LIBS_VM                  += $(LIBS)
+ endif
+ 
+ LINK_VM = $(LINK_LIB.c)