Mercurial > hg > release > icedtea6-1.13

changeset 2962:9b60104392f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix .hgignore not to hide patches and add missing ones. 2013-02-17 Andrew John Hughes <gnu.andrew@redhat.com> * .hgignore: Fix so the cacao patches directory isn't hidden. * patches/cacao/hotspot/hs23/memory.patch, * patches/cacao/hotspot/original/memory.patch: Add patches missed from last commit.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Sun, 17 Feb 2013 16:27:54 +0000
parents 8b08136ed5c1
children ed710bbd6305
files .hgignore ChangeLog patches/cacao/hotspot/hs23/memory.patch patches/cacao/hotspot/original/memory.patch
diffstat 4 files changed, 83 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Sat Feb 16 14:49:07 2013 +0000
+++ b/.hgignore	Sun Feb 17 16:27:54 2013 +0000
@@ -4,10 +4,6 @@
 missing
 aclocal.m4
 autom4te.cache
-cacao
-netbeans
-visualvm
-bootstrap
 build
 debian
 lib
@@ -52,3 +48,6 @@
 
 syntax: regexp
 ^openjdk
+^cacao
+^bootstrap
+^jamvm
--- a/ChangeLog	Sat Feb 16 14:49:07 2013 +0000
+++ b/ChangeLog	Sun Feb 17 16:27:54 2013 +0000
@@ -1,3 +1,11 @@
+2013-02-17  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* .hgignore: Fix so the cacao patches directory
+	isn't hidden.
+	* patches/cacao/hotspot/hs23/memory.patch,
+	* patches/cacao/hotspot/original/memory.patch:
+	Add patches missed from last commit.
+
 2013-02-15  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* Makefile.am:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/hotspot/hs23/memory.patch	Sun Feb 17 16:27:54 2013 +0000
@@ -0,0 +1,36 @@
+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	2013-02-11 23:08:47.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/rules.make	2013-02-15 14:53:43.564311236 +0000
+@@ -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-Xmx512m
+ 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	2013-02-11 23:08:47.000000000 +0000
++++ openjdk/hotspot/make/solaris/makefiles/rules.make	2013-02-15 14:54:13.620795503 +0000
+@@ -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-Xmx512m
+ 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	2013-02-11 23:08:47.000000000 +0000
++++ openjdk/hotspot/make/windows/makefiles/rules.make	2013-02-15 14:53:58.300548666 +0000
+@@ -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-Xmx512m
+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+ 
+ ProjectFile=jvm.vcproj
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/hotspot/original/memory.patch	Sun Feb 17 16:27:54 2013 +0000
@@ -0,0 +1,36 @@
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk-ecj/hotspot/make/linux/makefiles/rules.make
+--- openjdk.orig/hotspot/make/linux/makefiles/rules.make	2013-01-26 13:32:42.117831617 +0000
++++ openjdk/hotspot/make/linux/makefiles/rules.make	2013-01-26 13:33:29.934595340 +0000
+@@ -133,7 +133,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION = 5
+ BOOT_TARGET_CLASS_VERSION = 5
+-JAVAC_FLAGS = -g -encoding ascii
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
+ 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-ecj/hotspot/make/solaris/makefiles/rules.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/rules.make	2013-01-26 13:32:42.137831936 +0000
++++ openjdk/hotspot/make/solaris/makefiles/rules.make	2013-01-26 13:33:41.934787007 +0000
+@@ -133,7 +133,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION = 5
+ BOOT_TARGET_CLASS_VERSION = 5
+-JAVAC_FLAGS = -g -encoding ascii
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
+ 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-ecj/hotspot/make/windows/makefiles/rules.make
+--- openjdk.orig/hotspot/make/windows/makefiles/rules.make	2013-01-26 13:32:42.153832191 +0000
++++ openjdk/hotspot/make/windows/makefiles/rules.make	2013-01-26 13:34:12.419273915 +0000
+@@ -45,7 +45,7 @@
+ # Settings for javac
+ BOOT_SOURCE_LANGUAGE_VERSION=5
+ BOOT_TARGET_CLASS_VERSION=5
+-JAVAC_FLAGS=-g -encoding ascii
++JAVAC_FLAGS=-g -encoding ascii -J-Xmx512m
+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+ 
+ ProjectFile=jvm.vcproj