Mercurial > hg > release > icedtea6-1.5
changeset 565:c4653967115c cacao
* patches/icedtea-cacao-Compiler-gcc-gmk.patch: Removed.
* patches/icedtea-cacao-Defs-linux-gmk.patch: Likewise.
* patches/icedtea-cacao-Platform-gmk.patch: Likewise.
* patches/icedtea-cacao-Program-gmk.patch: Likewise.
* patches/icedtea-cacao-docs-Makefile.patch: Likewise.
* patches/icedtea-cacao-instrument-Makefile.patch: Likewise.
* patches/icedtea-cacao-java-c.patch: Likewise.
* patches/icedtea-cacao-jvm-cfg.patch: Likewise.
author | Christian Thalinger <twisti@complang.tuwien.ac.at> |
---|---|
date | Tue, 15 Jan 2008 16:09:54 +0100 |
parents | 3130b7dd604d |
children | 2171125bac73 |
files | patches/icedtea-cacao-Compiler-gcc-gmk.patch patches/icedtea-cacao-Defs-linux-gmk.patch patches/icedtea-cacao-Platform-gmk.patch patches/icedtea-cacao-Program-gmk.patch patches/icedtea-cacao-docs-Makefile.patch patches/icedtea-cacao-instrument-Makefile.patch patches/icedtea-cacao-java-c.patch patches/icedtea-cacao-jvm-cfg.patch |
diffstat | 8 files changed, 0 insertions(+), 256 deletions(-) [+] |
line wrap: on
line diff
--- a/patches/icedtea-cacao-Compiler-gcc-gmk.patch Mon Jan 14 00:41:35 2008 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -Index: j2se/make/common/shared/Compiler-gcc.gmk -=================================================================== ---- j2se/make/common/shared/Compiler-gcc.gmk (revision 250) -+++ openjdk/j2se/make/common/shared/Compiler-gcc.gmk (working copy) -@@ -75,22 +75,36 @@ ifeq ($(PLATFORM), linux) - REQUIRED_CC_VER = 4.0 - REQUIRED_GCC_VER = 4.0.* - else -- ifeq ($(ARCH_DATA_MODEL), 32) -- # i586 -+ ifeq ($(ARCH), alpha) -+ # alpha - REQUIRED_CC_VER = 3.2 -- REQUIRED_GCC_VER = 3.2.1* -- REQUIRED_GCC_VER_INT = 3.2.1-7a -- else -+ REQUIRED_GCC_VER = 3.2 -+ endif - ifeq ($(ARCH), amd64) - # amd64 - REQUIRED_CC_VER = 3.2 - REQUIRED_GCC_VER = 3.2.* - endif -+ ifeq ($(ARCH), i586) -+ # i586 -+ REQUIRED_CC_VER = 3.2 -+ REQUIRED_GCC_VER = 3.2.1* -+ REQUIRED_GCC_VER_INT = 3.2.1-7a -+ endif - ifeq ($(ARCH), ia64) - # ia64 - REQUIRED_CC_VER = 3.2 - REQUIRED_GCC_VER = 2.9[56789].* - endif -+ ifeq ($(ARCH), ppc) -+ # ppc -+ REQUIRED_CC_VER = 3.2 -+ REQUIRED_GCC_VER = 3.2 -+ endif -+ ifeq ($(ARCH), ppc64) -+ # ppc64 -+ REQUIRED_CC_VER = 3.2 -+ REQUIRED_GCC_VER = 3.2 - endif - endif - # Option used to create a shared library
--- a/patches/icedtea-cacao-Defs-linux-gmk.patch Mon Jan 14 00:41:35 2008 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -Index: j2se/make/common/Defs-linux.gmk -=================================================================== ---- openjdk/j2se/make/common/Defs-linux.gmk (revision 256) -+++ j2se/make/common/Defs-linux.gmk (working copy) -@@ -102,6 +102,7 @@ endif - # We need this frame pointer to make it easy to walk the stacks. - # This should be the default on X86, but ia64 and amd64 may not have this - # as the default. -+CFLAGS_REQUIRED_alpha += -mieee - CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN - CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN - CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN -@@ -206,7 +207,7 @@ endif - - EXTRA_LIBS += -lc - --LDFLAGS_DEFS_OPTION = -z defs -+LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker defs - LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) - - #
--- a/patches/icedtea-cacao-Platform-gmk.patch Mon Jan 14 00:41:35 2008 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -Index: j2se/make/common/shared/Platform.gmk -=================================================================== ---- openjdk/j2se/make/common/shared/Platform.gmk (revision 256) -+++ j2se/make/common/shared/Platform.gmk (working copy) -@@ -223,11 +223,25 @@ ifeq ($(SYSTEM_UNAME), Linux) - ARCH=sparcv9 - endif - else -- # i586 is 32-bit, amd64 is 64-bit - ifndef ARCH_DATA_MODEL -+ ifeq ($(ARCH), alpha) -+ # alpha is 64-bit -+ ARCH_DATA_MODEL=64 -+ endif -+ ifeq ($(ARCH), amd64) -+ # amd64 is 64-bit -+ ARCH_DATA_MODEL=64 -+ endif - ifeq ($(ARCH), i586) -+ # i586 is 32-bit - ARCH_DATA_MODEL=32 -- else -+ endif -+ ifeq ($(ARCH), ppc) -+ # ppc is 32-bit -+ ARCH_DATA_MODEL=32 -+ endif -+ ifeq ($(ARCH), ppc64) -+ # ppc64 is 64-bit - ARCH_DATA_MODEL=64 - endif - endif
--- a/patches/icedtea-cacao-Program-gmk.patch Mon Jan 14 00:41:35 2008 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -Index: j2se/make/common/Program.gmk -=================================================================== ---- j2se/make/common/Program.gmk (revision 250) -+++ openjdk/j2se/make/common/Program.gmk (working copy) -@@ -85,7 +85,7 @@ ifneq (,$(findstring $(PLATFORM), linux - endif - endif - ifeq ($(PLATFORM), linux) -- LDFLAGS += -z origin -+ LDFLAGS += -Xlinker -z -Xlinker origin - LDFLAGS += -Wl,--allow-shlib-undefined - LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli - LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
--- a/patches/icedtea-cacao-docs-Makefile.patch Mon Jan 14 00:41:35 2008 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -Index: j2se/make/docs/Makefile -=================================================================== ---- j2se/make/docs/Makefile (revision 250) -+++ openjdk/j2se/make/docs/Makefile (working copy) -@@ -39,16 +39,16 @@ DOCSTMPDIR = $(TEMPDIR)/doctmp - # Set heap memory max (Xmx) and initial value (Xms) depending on architecture. - # (Default initial value is 8 -- way too small for the platform APIs) - # --ifeq ($(ARCH_DATA_MODEL), 32) -- ifeq ($(ARCH), sparc) -- JAVADOC_VM_MEMORY_FLAGS = -J-Xms64M -J-Xmx512M -- else -- # Max of 256M is no longer enough. Increase to 256 + 128 -- JAVADOC_VM_MEMORY_FLAGS = -J-Xms32M -J-Xmx384M -- endif --else -+#ifeq ($(ARCH_DATA_MODEL), 32) -+# ifeq ($(ARCH), sparc) -+# JAVADOC_VM_MEMORY_FLAGS = -J-Xms64M -J-Xmx512M -+# else -+# # Max of 256M is no longer enough. Increase to 256 + 128 -+# JAVADOC_VM_MEMORY_FLAGS = -J-Xms32M -J-Xmx384M -+# endif -+#else - JAVADOC_VM_MEMORY_FLAGS = -J-Xms128M -J-Xmx1024M --endif -+#endif - - COMMON_JAVADOCFLAGS = \ - -source 1.5 \
--- a/patches/icedtea-cacao-instrument-Makefile.patch Mon Jan 14 00:41:35 2008 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -Index: j2se/make/java/instrument/Makefile -=================================================================== ---- j2se/make/java/instrument/Makefile (revision 250) -+++ openjdk/j2se/make/java/instrument/Makefile (working copy) -@@ -109,7 +109,7 @@ else - LDFLAGS += -R \$$ORIGIN/jli - endif - ifeq ($(PLATFORM), linux) -- LDFLAGS += -z origin -+ LDFLAGS += -Xlinker -z -Xlinker origin - LDFLAGS += -Wl,--allow-shlib-undefined - LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli - endif
--- a/patches/icedtea-cacao-java-c.patch Mon Jan 14 00:41:35 2008 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -Index: j2se/src/share/bin/java.c -=================================================================== ---- openjdk/j2se/src/share/bin/java.c (revision 256) -+++ j2se/src/share/bin/java.c (working copy) -@@ -1955,7 +1955,8 @@ ContinueInNewThread(InvocationFunctions* - args.classname = classname; - args.ifn = *ifn; - -- rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args); -+/* rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args); */ -+ rslt = JavaMain((void*)&args); - /* If the caller has deemed there is an error we - * simply return that, otherwise we return the value of - * the callee
--- a/patches/icedtea-cacao-jvm-cfg.patch Mon Jan 14 00:41:35 2008 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -Index: j2se/src/solaris/bin/ppc/jvm.cfg -=================================================================== ---- openjdk/j2se/src/solaris/bin/ppc/jvm.cfg (revision 0) -+++ openjdk/j2se/src/solaris/bin/ppc/jvm.cfg (revision 0) -@@ -0,0 +1,39 @@ -+# Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Sun designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Sun in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+# CA 95054 USA or visit www.sun.com if you need additional information or -+# have any questions. -+# -+# -+# List of JVMs that can be used as an option to java, javac, etc. -+# Order is important -- first in this list is the default JVM. -+# NOTE that this both this file and its format are UNSUPPORTED and -+# WILL GO AWAY in a future release. -+# -+# You may also select a JVM in an arbitrary location with the -+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported -+# and may not be available in a future release. -+# -+-server KNOWN -+-client IGNORE -+-hotspot ERROR -+-classic WARN -+-native ERROR -+-green ERROR -Index: j2se/src/solaris/bin/ppc64/jvm.cfg -=================================================================== ---- openjdk/j2se/src/solaris/bin/ppc64/jvm.cfg (revision 0) -+++ openjdk/j2se/src/solaris/bin/ppc64/jvm.cfg (revision 0) -@@ -0,0 +1,38 @@ -+# Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Sun designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Sun in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+# CA 95054 USA or visit www.sun.com if you need additional information or -+# have any questions. -+# -+# List of JVMs that can be used as an option to java, javac, etc. -+# Order is important -- first in this list is the default JVM. -+# NOTE that this both this file and its format are UNSUPPORTED and -+# WILL GO AWAY in a future release. -+# -+# You may also select a JVM in an arbitrary location with the -+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported -+# and may not be available in a future release. -+# -+-server KNOWN -+-hotspot ERROR -+-classic WARN -+-client IGNORE -+-native ERROR -+-green ERROR