Mercurial > hg > icedtea9

changeset 2552:7283a59ba41b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2347: Fix CACAO patches to apply again 2015-05-12 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2347: Fix CACAO patches to apply again * patches/cacao/memory.patch: Removed; needs a complete rewrite if still required. * Makefile.am: (ICEDTEA_PATCHES): Drop CACAO memory patch. * NEWS: Updated. * patches/cacao/launcher.patch: Regenerated.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Tue, 12 May 2015 20:27:44 +0100
parents 9b78b50a6207
children 2db89ffae8b6
files ChangeLog Makefile.am NEWS patches/cacao/launcher.patch patches/cacao/memory.patch
diffstat 5 files changed, 23 insertions(+), 96 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue May 12 03:16:51 2015 +0100
+++ b/ChangeLog	Tue May 12 20:27:44 2015 +0100
@@ -1,3 +1,16 @@
+2015-05-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2347: Fix CACAO patches to apply again
+	* patches/cacao/memory.patch:
+	Removed; needs a complete rewrite
+	if still required.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Drop CACAO memory
+	patch.
+	* NEWS: Updated.
+	* patches/cacao/launcher.patch:
+	Regenerated.
+
 2015-05-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR1369: Remove outdated bootstrap configure tests
--- a/Makefile.am	Tue May 12 03:16:51 2015 +0100
+++ b/Makefile.am	Tue May 12 20:27:44 2015 +0100
@@ -221,13 +221,11 @@
 if BUILD_CACAO
 ICEDTEA_PATCHES += \
 	patches/cacao/launcher.patch \
-	patches/cacao/memory.patch \
 	patches/cacao/armhf.patch \
 	patches/cacao/pr2032.patch
 else
 if USING_CACAO
-ICEDTEA_PATCHES += \
-	patches/cacao/memory.patch
+ICEDTEA_PATCHES +=
 endif
 endif
 
--- a/NEWS	Tue May 12 03:16:51 2015 +0100
+++ b/NEWS	Tue May 12 20:27:44 2015 +0100
@@ -60,6 +60,7 @@
   - PR2256: Add SystemTap tests
   - PR2257: clean-extract-nashorn rule is never run
   - PR2329: jamvm parallel unpack failures
+  - PR2347: Fix CACAO patches to apply again
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.
   - Remove jcheck
--- a/patches/cacao/launcher.patch	Tue May 12 03:16:51 2015 +0100
+++ b/patches/cacao/launcher.patch	Tue May 12 20:27:44 2015 +0100
@@ -1,15 +1,16 @@
---- openjdk/jdk/src/share/bin/java.c.orig	2010-09-07 05:24:49.307192201 +0200
-+++ openjdk/jdk/src/share/bin/java.c	2010-09-07 12:56:00.309691118 +0200
-@@ -174,6 +174,8 @@
-   InvocationFunctions ifn;
- } JavaMainArgs;
+diff -r a5c3d9643077 src/share/bin/java.c
+--- openjdk/jdk/src/share/bin/java.c	Tue Feb 10 16:24:28 2015 +0000
++++ openjdk/jdk/src/share/bin/java.c	Tue May 12 16:53:03 2015 +0100
+@@ -168,6 +168,8 @@
+ static jlong maxHeapSize        = 0;  /* max heap size */
+ static jlong initialHeapSize    = 0;  /* inital heap size */
  
 +#define JNI_VERSION_CACAO 0xcaca0000
 +
  /*
   * Entry point.
   */
-@@ -1923,6 +1925,8 @@
+@@ -1996,6 +1998,8 @@
  
      { /* Create a new thread to create JVM and invoke main method */
        JavaMainArgs args;
@@ -18,7 +19,7 @@
        int rslt;
  
        args.argc = argc;
-@@ -1931,7 +1935,17 @@
+@@ -2004,7 +2008,17 @@
        args.what = what;
        args.ifn = *ifn;
  
--- a/patches/cacao/memory.patch	Tue May 12 03:16:51 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-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.
-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}"/>