1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
--- patches/cacao/memory.patch.orig 2015-04-15 01:08:12.571871465 +0100
+++ patches/cacao/memory.patch 2015-05-18 21:23:17.604748525 +0100
@@ -6,7 +6,7 @@
BOOT_SOURCE_LANGUAGE_VERSION = 6
BOOT_TARGET_CLASS_VERSION = 6
-JAVAC_FLAGS = -g -encoding ascii
-+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++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.
@@ -18,7 +18,7 @@
BOOT_SOURCE_LANGUAGE_VERSION = 6
BOOT_TARGET_CLASS_VERSION = 6
-JAVAC_FLAGS = -g -encoding ascii
-+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++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.
@@ -30,7 +30,7 @@
BOOT_SOURCE_LANGUAGE_VERSION=6
BOOT_TARGET_CLASS_VERSION=6
-JAVAC_FLAGS=-g -encoding ascii
-+JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
++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
@@ -42,14 +42,14 @@
echo "false"; \
fi)
- MAX_VM_MEMORY := 512
-+ MAX_VM_MEMORY := 1536
++ MAX_VM_MEMORY := 1792
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 @@
+@@ -69,11 +69,11 @@
# NOTE: javadoc will not complete without these larger settings.
# WARNING: This could cause thrashing on low memory machines.
ifeq ($(ARCH_DATA_MODEL),64)
@@ -59,8 +59,11 @@
- MAX_VM_MEMORY = 1536
+ MAX_VM_MEMORY = 1792
else
- MAX_VM_MEMORY = 768
+- MAX_VM_MEMORY = 768
++ MAX_VM_MEMORY = 2048
endif
+
+ # List of all possible directories for javadoc to look for sources
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
@@ -80,7 +83,7 @@
BOOT_SOURCE_LANGUAGE_VERSION = 6
BOOT_TARGET_CLASS_VERSION = 6
-JAVAC_FLAGS = -g -encoding ascii
-+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++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.
--- patches/boot/compile-for-7-cacao-mem.patch.orig 2015-04-15 01:08:12.519870970 +0100
+++ patches/boot/compile-for-7-cacao-mem.patch 2015-05-18 21:35:10.136903342 +0100
@@ -9,7 +9,7 @@
-BOOT_TARGET_CLASS_VERSION = 6
+BOOT_SOURCE_LANGUAGE_VERSION = 7
+BOOT_TARGET_CLASS_VERSION = 7
- JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
diff -Nru openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make openjdk-boot/hotspot/make/solaris/makefiles/rules.make
@@ -23,7 +23,7 @@
-BOOT_TARGET_CLASS_VERSION = 6
+BOOT_SOURCE_LANGUAGE_VERSION = 7
+BOOT_TARGET_CLASS_VERSION = 7
- JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
diff -Nru openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make openjdk-boot/hotspot/make/windows/makefiles/rules.make
@@ -37,6 +37,6 @@
-BOOT_TARGET_CLASS_VERSION=6
+BOOT_SOURCE_LANGUAGE_VERSION=7
+BOOT_TARGET_CLASS_VERSION=7
- JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
+ JAVAC_FLAGS=-g -encoding ascii -J-Xmx512m
BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
|
GitWeb