/hg/icedtea6: S7022999: Can't build with FORCE_TIERED=0 (bundled...

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Fri Apr 26 07:39:44 PDT 2013


changeset 485b2d3dfd09 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=485b2d3dfd09
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Apr 26 15:39:35 2013 +0100

	S7022999: Can't build with FORCE_TIERED=0 (bundled HotSpot only)

	2013-04-26  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(ICEDTEA_PATCHES): Fix naming of aarch64 patch
		and add new one.
		* NEWS: Updated.
		* patches/hotspot/original/7022999-fastlocking_compiler1_only.patch:
		Backport fix to make Zero build work following
		6840152.
		* patches/aarch64.patch: Moved to...
		* patches/hotspot/original/aarch64.patch: ...here.


diffstat:

 ChangeLog                                                         |  12 +++
 Makefile.am                                                       |   3 +-
 NEWS                                                              |   1 +
 patches/aarch64.patch                                             |  34 ----------
 patches/hotspot/original/7022999-fastlocking_compiler1_only.patch |  25 +++++++
 patches/hotspot/original/aarch64.patch                            |  34 ++++++++++
 6 files changed, 74 insertions(+), 35 deletions(-)

diffs (148 lines):

diff -r b08a2c95d268 -r 485b2d3dfd09 ChangeLog
--- a/ChangeLog	Fri Apr 26 13:13:40 2013 +0100
+++ b/ChangeLog	Fri Apr 26 15:39:35 2013 +0100
@@ -1,3 +1,15 @@
+2013-04-26  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Fix naming of aarch64 patch
+	and add new one.
+	* NEWS: Updated.
+	* patches/hotspot/original/7022999-fastlocking_compiler1_only.patch:
+	Backport fix to make Zero build work following
+	6840152.
+	* patches/aarch64.patch: Moved to...
+	* patches/hotspot/original/aarch64.patch: ...here.
+
 2013-04-26  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* NEWS: Add release notes for 1.11.10, 1.11.11
diff -r b08a2c95d268 -r 485b2d3dfd09 Makefile.am
--- a/Makefile.am	Fri Apr 26 13:13:40 2013 +0100
+++ b/Makefile.am	Fri Apr 26 15:39:35 2013 +0100
@@ -596,7 +596,8 @@
 	patches/hotspot/original/fix_get_stack_bounds_leak.patch \
 	patches/hotspot/original/jvmtiEnv.patch \
 	patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch \
-	patches/aarch64.patch
+	patches/hotspot/original/aarch64.patch \
+	patches/hotspot/original/7022999-fastlocking_compiler1_only.patch
 endif
 
 if WITH_RHINO
diff -r b08a2c95d268 -r 485b2d3dfd09 NEWS
--- a/NEWS	Fri Apr 26 13:13:40 2013 +0100
+++ b/NEWS	Fri Apr 26 15:39:35 2013 +0100
@@ -18,6 +18,7 @@
 * Backports
   - S8009641: OpenJDK 6 build broken via 8007675 fix
   - OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow Snappy to build
+  - S7022999: Can't build with FORCE_TIERED=0 (bundled HotSpot only)
 * Bug fixes
   - PR1318: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM.
   - RH902004: very bad performance with E-Porto Add-In für OpenOffice Writer installed (hs23 only)
diff -r b08a2c95d268 -r 485b2d3dfd09 patches/aarch64.patch
--- a/patches/aarch64.patch	Fri Apr 26 13:13:40 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2013-04-17 21:37:18.637869465 +0100
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2013-04-17 21:38:30.075026650 +0100
-@@ -127,6 +127,11 @@
- #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
- #define SEC_IN_NANOSECS  1000000000LL
- 
-+
-+#ifndef EM_AARCH64
-+#define EM_AARCH64	183		/* ARM AARCH64 */
-+#endif
-+
- ////////////////////////////////////////////////////////////////////////////////
- // global variables
- julong os::Linux::_physical_memory = 0;
-@@ -1860,7 +1865,8 @@
-     {EM_MIPS,        EM_MIPS,    ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
-     {EM_PARISC,      EM_PARISC,  ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
-     {EM_68K,         EM_68K,     ELFCLASS32, ELFDATA2MSB, (char*)"M68k"},
--    {EM_SH,          EM_SH,      ELFCLASS32, ELFDATA2LSB, (char*)"SH"} /* Support little endian only*/
-+    {EM_SH,          EM_SH,      ELFCLASS32, ELFDATA2LSB, (char*)"SH"}, /* Support little endian only*/
-+    {EM_AARCH64,     EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"AARCH64"} /* Support little endian only*/
-   };
- 
-   #if  (defined IA32)
-@@ -1893,6 +1899,8 @@
-     static  Elf32_Half running_arch_code=EM_68K;
-   #elif  (defined SH)
-     static  Elf32_Half running_arch_code=EM_SH;
-+  #elif  (defined AARCH64)
-+    static  Elf32_Half running_arch_code=EM_AARCH64;
-   #else
-     #error Method os::dll_load requires that one of following is defined:\
-          IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, SH
diff -r b08a2c95d268 -r 485b2d3dfd09 patches/hotspot/original/7022999-fastlocking_compiler1_only.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/original/7022999-fastlocking_compiler1_only.patch	Fri Apr 26 15:39:35 2013 +0100
@@ -0,0 +1,25 @@
+# HG changeset patch
+# User coleenp
+# Date 1299199896 18000
+# Node ID 9f44e9aad2d9528c6a7c59f29be7974685d6b629
+# Parent  a3c0ec0428a2564a70a33a0348553e9d4c994c63
+7022999: Can't build with FORCE_TIERED=0
+Summary: Put UseFastLocking test under #ifdef COMPILER1
+Reviewed-by: kvn, phh, never, dcubed
+
+diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -3114,7 +3114,11 @@
+   // Turn off biased locking for locking debug mode flags,
+   // which are subtlely different from each other but neither works with
+   // biased locking.
+-  if (!UseFastLocking || UseHeavyMonitors) {
++  if (UseHeavyMonitors
++#ifdef COMPILER1
++      || !UseFastLocking
++#endif // COMPILER1
++    ) {
+     if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) {
+       // flag set to true on command line; warn the user that they
+       // can't enable biased locking here
diff -r b08a2c95d268 -r 485b2d3dfd09 patches/hotspot/original/aarch64.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/original/aarch64.patch	Fri Apr 26 15:39:35 2013 +0100
@@ -0,0 +1,34 @@
+diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2013-04-17 21:37:18.637869465 +0100
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2013-04-17 21:38:30.075026650 +0100
+@@ -127,6 +127,11 @@
+ #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
+ #define SEC_IN_NANOSECS  1000000000LL
+ 
++
++#ifndef EM_AARCH64
++#define EM_AARCH64	183		/* ARM AARCH64 */
++#endif
++
+ ////////////////////////////////////////////////////////////////////////////////
+ // global variables
+ julong os::Linux::_physical_memory = 0;
+@@ -1860,7 +1865,8 @@
+     {EM_MIPS,        EM_MIPS,    ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
+     {EM_PARISC,      EM_PARISC,  ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
+     {EM_68K,         EM_68K,     ELFCLASS32, ELFDATA2MSB, (char*)"M68k"},
+-    {EM_SH,          EM_SH,      ELFCLASS32, ELFDATA2LSB, (char*)"SH"} /* Support little endian only*/
++    {EM_SH,          EM_SH,      ELFCLASS32, ELFDATA2LSB, (char*)"SH"}, /* Support little endian only*/
++    {EM_AARCH64,     EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"AARCH64"} /* Support little endian only*/
+   };
+ 
+   #if  (defined IA32)
+@@ -1893,6 +1899,8 @@
+     static  Elf32_Half running_arch_code=EM_68K;
+   #elif  (defined SH)
+     static  Elf32_Half running_arch_code=EM_SH;
++  #elif  (defined AARCH64)
++    static  Elf32_Half running_arch_code=EM_AARCH64;
+   #else
+     #error Method os::dll_load requires that one of following is defined:\
+          IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, SH



More information about the distro-pkg-dev mailing list