/hg/release/icedtea6-1.11: 6 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Wed Apr 17 01:37:44 PDT 2013


changeset 844ef6a4e570 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=844ef6a4e570
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 17 08:03:37 2013 +0100

	PR1362: Fedora 19 / rawhide FTBFS SIGILL

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

		* NEWS: Add PR1362 from last commit and
		OJ3 identifier to earlier backport.
		* ChangeLog: Add missing entry for last
		commit.

	2013-04-05  Chris Phillips  <chphilli at redhat.com>

		* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp:
		Fix failure in the register allocation logic,
		diagnosed by Andrew Haley to be an issue with
		PUSH/POP macro's and assumption of order of
		evaluation of arguments.  The fix includes
		detection of the condition and bailing from the
		compilation if a similar failure is detected.


changeset bff1ea798749 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=bff1ea798749
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Apr 16 17:01:34 2013 +0100

	PR1319: Use #if not #ifdef in giflib 5 patch.

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

		* patches/pr1319-support_giflib_5.patch,
		Use #if not #ifdef.


changeset a4f35810b04f in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=a4f35810b04f
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 17 08:13:18 2013 +0100

	Update NEWS from previous commit.

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

		* NEWS: Updated.


changeset 9faadf8e66b2 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=9faadf8e66b2
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 17 08:19:05 2013 +0100

	PR1339: Simplify the rewriter, avoiding concurrency.

	2013-03-11  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR1339: Simplify the rewriter, avoiding concurrency.
		* rewriter/com/redhat/rewriter/ClassRewriter.java:
		Always use the single threaded executor.
		* NEWS: Updated with this and PR1338, added silently
		for 1.11.5 but not HEAD.


changeset a4c7d55a2e77 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=a4c7d55a2e77
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 17 09:34:34 2013 +0100

	PR1380: Add AArch64 support to Zero

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

		* Makefile.am:
		(ICEDTEA_PATCHES): Add patch after SH patch.
		* NEWS: Updated.
		* AUTHORS: Add Andreas and merge in THANKYOU.
		* THANKYOU: Removed.

	2013-03-22  Andreas Schwab  <schwab at suse.cz>

		PR1380: Add AArch64 support to Zero
		* patches/aarch64.patch:
		Add Zero support for AArch64.


changeset ed783f8e0c51 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=ed783f8e0c51
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Apr 17 09:37:04 2013 +0100

	Prepare for 1.11.10 release.

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

		* NEWS: Add release date of 1.11.10.
		* configure.ac: Prepare for 1.11.10.


diffstat:

 AUTHORS                                         |   4 +
 ChangeLog                                       |  53 +++++++++++++++++++++++++
 Makefile.am                                     |   3 +-
 NEWS                                            |  10 +++-
 THANKYOU                                        |  10 ----
 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp     |  30 +++++++++++--
 configure.ac                                    |   2 +-
 patches/aarch64.patch                           |  21 +++++++++
 patches/pr1319-support_giflib_5.patch           |   2 +-
 rewriter/com/redhat/rewriter/ClassRewriter.java |   6 +-
 10 files changed, 118 insertions(+), 23 deletions(-)

diffs (315 lines):

diff -r 1a2df02fa23d -r ed783f8e0c51 AUTHORS
--- a/AUTHORS	Tue Apr 16 20:25:56 2013 +0100
+++ b/AUTHORS	Wed Apr 17 09:37:04 2013 +0100
@@ -2,6 +2,7 @@
 Please keep this list in alphabetical order.
 
 Lillian Angel <langel at redhat.com>
+Alexis Ballier <aballier at gentoo.org>
 Alon Bar-Lev <alon.barlev at gmail.com>
 Gary Benson <gbenson at redhat.com>
 Tania Bento <tbento at redhat.com>
@@ -18,6 +19,7 @@
 Andrew John Hughes <gnu_andrew at member.fsf.org, gnu.andrew at redhat.com>
 Tomas Hurka <tomas.hurka at sun.com>
 Ioana Ivan <iivan at redhat.com>
+C. K. Jester-Young (cky944 at gmail.com)
 Matthias Klose <doko at ubuntu.com>
 Francis Kung <fkung at redhat.com>
 Denis Lila <dlila at redhat.com>
@@ -32,6 +34,7 @@
 Mark Reinhold <mr at sun.com>
 Bernhard Rosenkränzer <bero at arklinux.org>
 Marc Schoenefeld <mschoene at redhat.com>
+Andreas Schwab <schwab at suse.cz>
 Keith Seitz <keiths at redhat.com>
 Andrew Su <asu at redhat.com, andrew.su at utoronto.ca>
 Joshua Sumali <jsumali at redhat.com>
@@ -39,6 +42,7 @@
 Christian Thalinger <twisti at complang.tuwien.ac.at>
 Dalibor Topic <robilad at kaffe.org>
 Arnaud Vandyck <avdyk at debian.org>
+Torsten Werner (mail.twerner at googlemail.com)
 Mark Wielaard <mark at klomp.org>
 Yi Zhan <yi.zhan at intel.com>
 
diff -r 1a2df02fa23d -r ed783f8e0c51 ChangeLog
--- a/ChangeLog	Tue Apr 16 20:25:56 2013 +0100
+++ b/ChangeLog	Wed Apr 17 09:37:04 2013 +0100
@@ -1,3 +1,56 @@
+2013-04-17  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS: Add release date of 1.11.10.
+	* configure.ac: Prepare for 1.11.10.
+
+2013-04-17  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add patch after SH patch.
+	* NEWS: Updated.
+	* AUTHORS: Add Andreas and merge in THANKYOU.
+	* THANKYOU: Removed.
+
+2013-03-22  Andreas Schwab  <schwab at suse.cz>
+
+	PR1380: Add AArch64 support to Zero
+	* patches/aarch64.patch:
+	Add Zero support for AArch64.
+
+2013-03-11  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR1339: Simplify the rewriter, avoiding concurrency.
+	* rewriter/com/redhat/rewriter/ClassRewriter.java:
+	Always use the single threaded executor.
+	* NEWS: Updated with this and PR1338, added silently
+	for 1.11.5 but not HEAD.
+
+2013-04-17  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS: Updated.
+
+2013-04-16  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/pr1319-support_giflib_5.patch,
+	Use #if not #ifdef.
+
+2013-04-12  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS: Add PR1362 from last commit and
+	OJ3 identifier to earlier backport.
+	* ChangeLog: Add missing entry for last
+	commit.
+
+2013-04-05  Chris Phillips  <chphilli at redhat.com>
+
+	* arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp:
+	Fix failure in the register allocation logic,
+	diagnosed by Andrew Haley to be an issue with
+	PUSH/POP macro's and assumption of order of
+	evaluation of arguments.  The fix includes
+	detection of the condition and bailing from the
+	compilation if a similar failure is detected.
+
 2013-04-17  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* patches/openjdk/6669869-Beans_isDesignTime_should_be_per-AppContext.patch:
diff -r 1a2df02fa23d -r ed783f8e0c51 Makefile.am
--- a/Makefile.am	Tue Apr 16 20:25:56 2013 +0100
+++ b/Makefile.am	Wed Apr 17 09:37:04 2013 +0100
@@ -535,7 +535,8 @@
 	patches/openjdk/8007393.patch \
 	patches/openjdk/8007611.patch \
 	patches/fix_get_stack_bounds_leak.patch \
-	patches/openjdk/7197906-handle_32_bit_shifts.patch
+	patches/openjdk/7197906-handle_32_bit_shifts.patch \
+	patches/aarch64.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 1a2df02fa23d -r ed783f8e0c51 NEWS
--- a/NEWS	Tue Apr 16 20:25:56 2013 +0100
+++ b/NEWS	Wed Apr 17 09:37:04 2013 +0100
@@ -7,13 +7,15 @@
 GX  - http://bugs.gentoo.org/show_bug.cgi?id=X
 CAX - http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=X
 LPX - https://bugs.launchpad.net/bugs/X 
+OJX - http://java.net/jira/browse/OPENJDK6-X
 
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
-New in release 1.11.10 (2013-04-XX):
+New in release 1.11.10 (2013-04-17):
 
 * New features
   - JAXP, JAXWS & JAF supplied as patches rather than drops to aid subsequent patching.
+  - PR1380: Add AArch64 support to Zero
 * Security fixes
   - S6657673, CVE-2013-1518: Issues with JAXP
   - S7200507: Refactor Introspector internals
@@ -56,7 +58,10 @@
   - S7064279: Introspector.getBeanInfo() should release some resources in timely manner
   - S8004302: javax/xml/soap/Test7013971.java fails since jdk6u39b01
 * Bug fixes
-  - Fix get_stack_bounds memory leak (alternate fix for S7197906)
+  - OJ3: Fix get_stack_bounds memory leak (alternate fix for S7197906)
+  - PR1362: Fedora 19 / rawhide FTBFS SIGILL
+  - PR1319: Correct #ifdef to #if
+  - PR1339: Simplify the rhino class rewriter to avoid use of concurrency
 
 New in release 1.11.9 (2013-03-04):
 
@@ -153,6 +158,7 @@
   - S7199153: TEST_BUG: try-with-resources syntax pushed to 6-open repo
 * Bug fixes
   - PR1194: IcedTea tries to build with /usr/lib/jvm/java-openjdk (now a 1.7 VM) by default
+  - PR1338: Remove dependence on libXp
 
 New in release 1.11.4 (2012-08-31):
 
diff -r 1a2df02fa23d -r ed783f8e0c51 THANKYOU
--- a/THANKYOU	Tue Apr 16 20:25:56 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-The following have made minor contributions to the IcedTea
-project, such as testing, bug submission, or minor patches. See also
-the AUTHORS file, which lists people who have submitted major
-patches. If your name does not appear on either list, but should, let
-us know. Please keep this list in alphabetic order.
-
-Alexis Ballier (aballier at gentoo.org)
-Alon Bar-Lev (alon.barlev at gmail.com)
-C. K. Jester-Young  (cky944 at gmail.com)
-Torsten Werner (mail.twerner at googlemail.com)
\ No newline at end of file
diff -r 1a2df02fa23d -r ed783f8e0c51 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Tue Apr 16 20:25:56 2013 +0100
+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp	Wed Apr 17 09:37:04 2013 +0100
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009, 2010 Edward Nevill
+ * Copyright 2013 Red Hat
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
@@ -399,6 +400,8 @@
 
 static jmp_buf compiler_error_env;
 
+#define J_BogusImplementation() longjmp(compiler_error_env, COMPILER_RESULT_FAILED)
+
 #ifdef PRODUCT
 
 #define JASSERT(cond, msg)	0
@@ -3472,8 +3475,6 @@
 #define TOSM2(jstack)	((jstack)->stack[(jstack)->depth-3])
 #define TOSM3(jstack)	((jstack)->stack[(jstack)->depth-4])
 
-#define POP(jstack)		((jstack)->stack[--(jstack)->depth])
-#define PUSH(jstack, r)		((jstack)->stack[(jstack)->depth++] = (r))
 #define SWAP(jstack) do { \
 		      Reg r = (jstack)->stack[(jstack)->depth-1]; \
 		      (jstack)->stack[(jstack)->depth-1] = (jstack)->stack[(jstack)->depth-2]; \
@@ -3483,6 +3484,17 @@
 #define JSTACK_REG(jstack)		jstack_reg(jstack)
 #define JSTACK_PREFER(jstack, prefer)	jstack_prefer(jstack, prefer)
 
+int PUSH(Thumb2_Stack *jstack, unsigned reg) {
+  jstack->stack[jstack->depth] = reg;
+  jstack->depth++;
+  return reg;
+}
+
+int POP(Thumb2_Stack *jstack) {
+  jstack->depth--;
+  return jstack->stack[jstack->depth];
+}
+
 static const unsigned last_clear_bit[] = {
 	3,	//	0000
 	3,	//	0001
@@ -3499,11 +3511,13 @@
 	1,	//	1100
 	1,	//	1101
 	0,	//	1110
-	0,	//	1111
+	0,	//	1111 // No registers available...
 };
 
 #define LAST_CLEAR_BIT(mask) last_clear_bit[mask]
 
+unsigned long thumb2_register_allocation_failures = 0;
+
 unsigned jstack_reg(Thumb2_Stack *jstack)
 {
   unsigned *stack = jstack->stack;
@@ -3514,7 +3528,10 @@
 
   for (i = 0; i < depth; i++) mask |= 1 << stack[i];
   mask &= (1 << STACK_REGS) - 1;
-  JASSERT(mask != (1 << STACK_REGS) - 1, "No free reg in push");
+  if (mask >= (1 << STACK_REGS) - 1)  { // No free registers
+    thumb2_register_allocation_failures++;
+    J_BogusImplementation();
+  }
   r = LAST_CLEAR_BIT(mask);
   return r;
 }
@@ -3530,7 +3547,10 @@
   for (i = 0; i < depth; i++) mask |= 1 << stack[i];
   mask &= (1 << STACK_REGS) - 1;
   if ((prefer & ~mask) & 0x0f) mask |= (~prefer & ((1 << STACK_REGS) - 1));
-  JASSERT(mask != (1 << STACK_REGS) - 1, "No free reg in push");
+  if (mask >= (1 << STACK_REGS) - 1)  { // No free registers
+    thumb2_register_allocation_failures++;
+    J_BogusImplementation();
+  }
   r = LAST_CLEAR_BIT(mask);
   return r;
 }
diff -r 1a2df02fa23d -r ed783f8e0c51 configure.ac
--- a/configure.ac	Tue Apr 16 20:25:56 2013 +0100
+++ b/configure.ac	Wed Apr 17 09:37:04 2013 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.11.10pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.11.10],[distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
diff -r 1a2df02fa23d -r ed783f8e0c51 patches/aarch64.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/aarch64.patch	Wed Apr 17 09:37:04 2013 +0100
@@ -0,0 +1,21 @@
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -1893,7 +1893,8 @@ void * os::dll_load(const char *filename
+     {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)
+@@ -1926,6 +1927,8 @@ void * os::dll_load(const char *filename
+     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 1a2df02fa23d -r ed783f8e0c51 patches/pr1319-support_giflib_5.patch
--- a/patches/pr1319-support_giflib_5.patch	Tue Apr 16 20:25:56 2013 +0100
+++ b/patches/pr1319-support_giflib_5.patch	Wed Apr 17 09:37:04 2013 +0100
@@ -12,7 +12,7 @@
  int
  SplashDecodeGifStream(Splash * splash, SplashStream * stream)
  {
-+#ifdef GIFLIB_MAJOR >= 5
++#if GIFLIB_MAJOR >= 5
 +    int error = 0;
 +    GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc, &error);
 +
diff -r 1a2df02fa23d -r ed783f8e0c51 rewriter/com/redhat/rewriter/ClassRewriter.java
--- a/rewriter/com/redhat/rewriter/ClassRewriter.java	Tue Apr 16 20:25:56 2013 +0100
+++ b/rewriter/com/redhat/rewriter/ClassRewriter.java	Wed Apr 17 09:37:04 2013 +0100
@@ -60,8 +60,8 @@
   /**
    * The executor for submitting rewriting jobs.
    */
-  private static final ExecutorService executor = DEBUG ?
-    Executors.newSingleThreadExecutor() : Executors.newCachedThreadPool();
+  private static final ExecutorService executor = 
+    Executors.newSingleThreadExecutor();
 
   /**
    * The source directory, set once by main.
@@ -290,4 +290,4 @@
     return null;
   }
 
-}
\ No newline at end of file
+}



More information about the distro-pkg-dev mailing list