Imported Upstream version 7u21-2.3.9upstream/7u21-2.3.9upstream

5 files changed, 173 insertions, 0 deletions

diff --git a/patches/cacao/arm-arch-defines.patch b/patches/cacao/arm-arch-defines.patch
new file mode 100644
index 0000000..5ec4f2f
--- /dev/null
+++ b/patches/cacao/arm-arch-defines.patch
@@ -0,0 +1,18 @@
+diff -Nru cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h
+--- cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h	2010-05-19 12:14:46.000000000 +0100
++++ cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h	2010-06-21 18:35:53.000000000 +0100
+@@ -33,7 +33,13 @@
+ 
+ /* NEC LE-IT: gcc has no way to easily check the arm architecture
+  * but defines only one of __ARM_ARCH_x__ to be true			*/
+-#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_7__)  
++#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
++	|| defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \
++	|| defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \
++	|| defined(__ARM_ARCH_6M__) \
++	|| defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
++	|| defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__)
++
+ AO_INLINE void
+ AO_nop_full()
+ {
diff --git a/patches/cacao/ignore-tests.patch b/patches/cacao/ignore-tests.patch
new file mode 100644
index 0000000..40d1d16
--- /dev/null
+++ b/patches/cacao/ignore-tests.patch
@@ -0,0 +1,11 @@
+diff -Nru openjdk.orig/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java openjdk/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java
+--- openjdk.orig/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java	2010-05-10 15:04:14.000000000 +0100
++++ openjdk/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java	2010-05-10 23:42:41.000000000 +0100
+@@ -37,6 +37,7 @@
+  * @compile -source 1.5 ProducerConsumerLoops.java
+  * @run main/timeout=3600 ProducerConsumerLoops
+  * @summary  multiple producers and consumers using blocking queues
++ * @ignore cacao test hog, ignore for the sake of buildds
+  */
+ 
+ import java.util.concurrent.*;
diff --git a/patches/cacao/jsig.patch b/patches/cacao/jsig.patch
new file mode 100644
index 0000000..933c099
--- /dev/null
+++ b/patches/cacao/jsig.patch
@@ -0,0 +1,18 @@
+diff -Nru cacao.orig/Makefile.am cacao/Makefile.am
+--- cacao.orig/cacao/src/cacao/Makefile.am	2008-08-04 17:51:28.000000000 +0100
++++ cacao/cacao/src/cacao/Makefile.am	2010-05-11 10:29:35.000000000 +0100
+@@ -96,12 +96,12 @@
+ 	$(mkdir_p) $(prefix)/jre/lib/$(JAVA_ARCH)/server
+ 	$(LN_S) -f $(libdir)/libjvm.so $(prefix)/jre/lib/$(JAVA_ARCH)/server
+ 	$(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
+-	$(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
++	$(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so
+ 
+ uninstall-local:
+ 	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjvm.so
+ 	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt
+-	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so
++	rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so
+ endif
+ 
+ 
diff --git a/patches/cacao/launcher.patch b/patches/cacao/launcher.patch
new file mode 100644
index 0000000..54d0a2b
--- /dev/null
+++ b/patches/cacao/launcher.patch
@@ -0,0 +1,40 @@
+diff -Nru openjdk.orig/jdk/src/share/bin/java.c openjdk/jdk/src/share/bin/java.c
+--- openjdk.orig/jdk/src/share/bin/java.c	2012-03-21 17:09:55.000000000 +0000
++++ openjdk/jdk/src/share/bin/java.c	2012-03-23 00:46:49.461847958 +0000
+@@ -164,6 +164,8 @@
+ static jlong maxHeapSize        = 0;  /* max heap size */
+ static jlong initialHeapSize    = 0;  /* inital heap size */
+ 
++#define JNI_VERSION_CACAO 0xcaca0000
++
+ /*
+  * Entry point.
+  */
+@@ -1848,6 +1850,8 @@
+ 
+     { /* Create a new thread to create JVM and invoke main method */
+       JavaMainArgs args;
++      struct JDK1_1InitArgs cacao_args;
++      int jvm_init_rv;
+       int rslt;
+ 
+       args.argc = argc;
+@@ -1856,7 +1860,17 @@
+       args.what = what;
+       args.ifn = *ifn;
+ 
+-      rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args);
++      memset((void*)&cacao_args, 0, sizeof(cacao_args));
++      cacao_args.version = JNI_VERSION_CACAO;
++
++      jvm_init_rv = ifn->GetDefaultJavaVMInitArgs(&cacao_args);
++      JLI_TraceLauncher("using cacao as VM: %s\n", (jvm_init_rv == 0) ? "yes" : "no");
++
++      if (jvm_init_rv == 0)
++          return JavaMain((void*)&args);
++      else
++          return ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args);
++
+       /* If the caller has deemed there is an error we
+        * simply return that, otherwise we return the value of
+        * the callee
diff --git a/patches/cacao/memory.patch b/patches/cacao/memory.patch
new file mode 100644
index 0000000..b84c346
--- /dev/null
+++ b/patches/cacao/memory.patch
@@ -0,0 +1,86 @@
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
+--- openjdk.orig/hotspot/make/linux/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/rules.make	2012-06-12 10:50:20.982290377 +0100
+@@ -128,7 +128,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION = 6
+ BOOT_TARGET_CLASS_VERSION = 6
+-JAVAC_FLAGS = -g -encoding ascii
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+ 
+ # With parallel makes, print a message at the end of compilation.
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
++++ openjdk/hotspot/make/solaris/makefiles/rules.make	2012-06-12 10:50:20.982290377 +0100
+@@ -120,7 +120,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION = 6
+ BOOT_TARGET_CLASS_VERSION = 6
+-JAVAC_FLAGS = -g -encoding ascii
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+ 
+ # With parallel makes, print a message at the end of compilation.
+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
+--- openjdk.orig/hotspot/make/windows/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
++++ openjdk/hotspot/make/windows/makefiles/rules.make	2012-06-12 10:50:20.982290377 +0100
+@@ -45,7 +45,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION=6
+ BOOT_TARGET_CLASS_VERSION=6
+-JAVAC_FLAGS=-g -encoding ascii
++JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+ 
+ ProjectFile=jvm.vcproj
+diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
+--- openjdk.orig/jdk/make/common/shared/Platform.gmk	2012-06-08 17:12:17.000000000 +0100
++++ openjdk/jdk/make/common/shared/Platform.gmk	2012-06-12 10:50:20.982290377 +0100
+@@ -537,7 +537,7 @@
+       else \
+         echo "false"; \
+       fi)
+-    MAX_VM_MEMORY := 512
++    MAX_VM_MEMORY := 1536
+     MIN_VM_MEMORY := $(MAX_VM_MEMORY)
+   else
+     MB_OF_MEMORY       := unknown
+diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
+--- openjdk.orig/jdk/make/docs/Makefile	2012-06-08 17:12:17.000000000 +0100
++++ openjdk/jdk/make/docs/Makefile	2012-06-12 11:09:31.616702981 +0100
+@@ -69,9 +69,9 @@
+ #    NOTE: javadoc will not complete without these larger settings.
+ #    WARNING: This could cause thrashing on low memory machines.
+ ifeq ($(ARCH_DATA_MODEL),64)
+-  MAX_VM_MEMORY = 1536
++  MAX_VM_MEMORY = 1792
+ else ifeq ($(ARCH),universal)
+-  MAX_VM_MEMORY = 1536
++  MAX_VM_MEMORY = 1792
+ else
+   MAX_VM_MEMORY = 768
+ endif
+diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
+--- openjdk.orig/langtools/make/build.xml	2012-06-08 17:12:36.000000000 +0100
++++ openjdk/langtools/make/build.xml	2012-06-12 10:50:20.974290246 +0100
+@@ -796,6 +796,7 @@
+                     <compilerarg value="-implicit:none"/>
+                     <compilerarg value="-Xprefer:source"/>
+                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
++		     <compilerarg value="-J-Xmx256M"/>
+                     <compilerarg line="@{bootclasspath.opt}"/>
+                     <compilerarg line="${javac.no.jdk.warnings}"/>
+                     <compilerarg line="${javac.version.opt}"/>
+diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/rules.make openjdk/hotspot/make/bsd/makefiles/rules.make
+--- openjdk.orig/hotspot/make/bsd/makefiles/rules.make	2012-06-08 17:13:09.000000000 +0100
++++ openjdk/hotspot/make/bsd/makefiles/rules.make	2012-06-12 10:50:20.974290246 +0100
+@@ -128,7 +128,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION = 6
+ BOOT_TARGET_CLASS_VERSION = 6
+-JAVAC_FLAGS = -g -encoding ascii
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+ 
+ # With parallel makes, print a message at the end of compilation.