← Back to branch summary

~ubuntu-branches/ubuntu/precise/openjdk-7/precise-security

« back to all changes in this revision

Viewing changes to patches/boot/compile-for-7.patch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose, Damien Raude-Morvan, Matthias Klose
  • Date: 2011-07-10 14:28:17 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110710142817-tl5xz1zv1aejnbi1
Tags: 7~b143-2.0~pre1-1
[ Damien Raude-Morvan ]
* New b143 code drop.
* Drop d/patches/7031385.diff: Merged upstream.
* Drop d/patches/jamvm-oj7.patch: Merged upstream.
* Manpages are now ja_JP.UTF-8 instead of ja_JP.eucJP

[ Matthias Klose ]
* Apply fix for IcedTea issue #753, #757.
* Update s390 hotspot build fixes.
* Re-enable zero on i386.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/boot/compile-for-7.patch
 
1
diff -r f7e8b10f51c6 make/linux/makefiles/rules.make
 
2
--- openjdk-boot/hotspot/make/linux/makefiles/rules.make        Tue Jun 28 00:25:25 2011 +0100
 
3
+++ openjdk-boot/hotspot/make/linux/makefiles/rules.make        Tue Jul 05 11:59:08 2011 +0100
 
4
@@ -139,8 +139,8 @@
 
5
 RUN.JAR$(MAKE_VERBOSE) += >/dev/null
 
6
 
 
7
 # Settings for javac
 
8
-BOOT_SOURCE_LANGUAGE_VERSION = 6
 
9
-BOOT_TARGET_CLASS_VERSION = 6
 
10
+BOOT_SOURCE_LANGUAGE_VERSION = 7
 
11
+BOOT_TARGET_CLASS_VERSION = 7
 
12
 JAVAC_FLAGS = -g -encoding ascii
 
13
 BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
 
14
 
 
15
diff -r f7e8b10f51c6 make/solaris/makefiles/rules.make
 
16
--- openjdk-boot/hotspot/make/solaris/makefiles/rules.make      Tue Jun 28 00:25:25 2011 +0100
 
17
+++ openjdk-boot/hotspot/make/solaris/makefiles/rules.make      Tue Jul 05 11:59:08 2011 +0100
 
18
@@ -131,8 +131,8 @@
 
19
 RUN.JAR$(MAKE_VERBOSE) += >/dev/null
 
20
 
 
21
 # Settings for javac
 
22
-BOOT_SOURCE_LANGUAGE_VERSION = 6
 
23
-BOOT_TARGET_CLASS_VERSION = 6
 
24
+BOOT_SOURCE_LANGUAGE_VERSION = 7
 
25
+BOOT_TARGET_CLASS_VERSION = 7
 
26
 JAVAC_FLAGS = -g -encoding ascii
 
27
 BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
 
28
 
 
29
diff -r f7e8b10f51c6 make/windows/makefiles/rules.make
 
30
--- openjdk-boot/hotspot/make/windows/makefiles/rules.make      Tue Jun 28 00:25:25 2011 +0100
 
31
+++ openjdk-boot/hotspot/make/windows/makefiles/rules.make      Tue Jul 05 11:59:08 2011 +0100
 
32
@@ -43,8 +43,8 @@
 
33
 !endif
 
34
 
 
35
 # Settings for javac
 
36
-BOOT_SOURCE_LANGUAGE_VERSION=6
 
37
-BOOT_TARGET_CLASS_VERSION=6
 
38
+BOOT_SOURCE_LANGUAGE_VERSION=7
 
39
+BOOT_TARGET_CLASS_VERSION=7
 
40
 JAVAC_FLAGS=-g -encoding ascii
 
41
 BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
 
42