diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | recipes-core/openjdk/openjdk-6-6b27/arm-thumb2-fix.patch | 95 | ||||
| -rw-r--r-- | recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch | 21 | ||||
| -rw-r--r-- | recipes-core/openjdk/openjdk-6-release-6b27.inc | 5 | ||||
| -rw-r--r-- | recipes-core/openjdk/openjdk-6_6b27-1.12.4.bb | 12 | ||||
| -rw-r--r-- | recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb | 6 |
6 files changed, 11 insertions, 130 deletions
@@ -16,7 +16,7 @@ PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" For openjdk6: PREFERRED_VERSION_openjdk-6-jre = "6b24-1.11.9" or -PREFERRED_VERSION_openjdk-6-jre = "6b27-1.12.4" +PREFERRED_VERSION_openjdk-6-jre = "6b27-1.12.5" PREFERRED_VERSION_icedtea6-native = "1.8.11" For openjdk7: diff --git a/recipes-core/openjdk/openjdk-6-6b27/arm-thumb2-fix.patch b/recipes-core/openjdk/openjdk-6-6b27/arm-thumb2-fix.patch deleted file mode 100644 index 54b8b7b..0000000 --- a/recipes-core/openjdk/openjdk-6-6b27/arm-thumb2-fix.patch +++ /dev/null @@ -1,95 +0,0 @@ - -# HG changeset patch -# User chrisphi -# Date 1365166908 14400 -# Node ID 623621d29d04d87dc17f376b3917464e59026248 -# Parent 12f5fe9e85d373261c29be3bbd37ffc364678978 -Bug 1362: Fedora 19 / rawhide FTBFS SIGILL -Summary: Fix reg alloc problem in thumb2.cpp compiler. - -diff -r 12f5fe9e85d3 -r 623621d29d04 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp ---- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Wed Mar 20 11:00:45 2013 +0000 -+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Apr 05 09:01:48 2013 -0400 -@@ -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 -@@ -3505,8 +3508,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]; \ -@@ -3516,6 +3517,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 -@@ -3532,11 +3544,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; -@@ -3547,7 +3561,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; - } -@@ -3563,7 +3580,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 --git a/recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch b/recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch deleted file mode 100644 index 7161b75..0000000 --- a/recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: icedtea6-1.12.4/configure.ac -=================================================================== ---- icedtea6-1.12.4.orig/configure.ac 2013-03-10 14:04:34.072354787 +0100 -+++ icedtea6-1.12.4/configure.ac 2013-03-10 14:07:48.201849004 +0100 -@@ -283,16 +283,6 @@ - AC_SUBST(XT_CFLAGS) - AC_SUBST(XT_LIBS) - --dnl Check for libXp headers and libraries. --PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) --if test "x${XP_FOUND}" = xno --then -- AC_MSG_ERROR([Could not find Xp - \ -- Try installing libXp-devel.]) --fi --AC_SUBST(XP_CFLAGS) --AC_SUBST(XP_LIBS) -- - dnl Check for libX11 headers and libraries. - PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no]) - if test "x${X11_FOUND}" = xno diff --git a/recipes-core/openjdk/openjdk-6-release-6b27.inc b/recipes-core/openjdk/openjdk-6-release-6b27.inc index 32212df..59b36d9 100644 --- a/recipes-core/openjdk/openjdk-6-release-6b27.inc +++ b/recipes-core/openjdk/openjdk-6-release-6b27.inc @@ -2,7 +2,7 @@ require openjdk-6-release-6b24.inc FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b27:" -OEPATCHES += "file://remove_libxp.patch" +EXTRA_OECONF += "--disable-downloading" OPENJDK_VERSION = "b27" OPENJDK_DATE = "26_oct_2012" @@ -22,3 +22,6 @@ SRC_URI[jaxp.md5sum] = "0ace787aa12177d201947e8ba0ba9bdd" SRC_URI[jaxp.sha256sum] = "490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c" +ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no" + +DISTRIBUTION_PATCHES += "patches/icedtea-jdk-rmi-crosscompile.patch" diff --git a/recipes-core/openjdk/openjdk-6_6b27-1.12.4.bb b/recipes-core/openjdk/openjdk-6_6b27-1.12.4.bb deleted file mode 100644 index d368abe..0000000 --- a/recipes-core/openjdk/openjdk-6_6b27-1.12.4.bb +++ /dev/null @@ -1,12 +0,0 @@ -require openjdk-6-release-6b27.inc - -PR = "${INC_PR}.1" - -SRC_URI[iced.md5sum] = "85bfc656c20fb762b72b71d3492a326c" -SRC_URI[iced.sha256sum] = "eb326c6ae0147ca4abe4bd79e52c1edc2ef08e5e008230e24bee3abb39e14dda" - -OEPATCHES += "file://arm-thumb2-fix.patch" - -ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no" - -DISTRIBUTION_PATCHES += "patches/icedtea-jdk-rmi-crosscompile.patch" diff --git a/recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb b/recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb new file mode 100644 index 0000000..d2ec757 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb @@ -0,0 +1,6 @@ +require openjdk-6-release-6b27.inc + +PR = "${INC_PR}.1" + +SRC_URI[iced.md5sum] = "2299fde9f315c7feb561c2975aa232b1" +SRC_URI[iced.sha256sum] = "c61d6eb2f98d5c4059bb6eb6d808dd0954cf7d35c14290e5c77c3d7db75d2b35" |