summaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2013-04-30 17:46:53 +0200
committerHenning Heinold <heinold@inf.fu-berlin.de>2013-04-30 23:42:17 +0200
commit30ff1715cd95f9a0f20d12891f3ea390e0bbe4b1 (patch)
tree8d0b45f186755d45e396755fb3103a616f2e3810 /recipes-core
parente20269243f8725949eb0124d6dded1f4ce78dfa1 (diff)
downloadmeta-java-30ff1715cd95f9a0f20d12891f3ea390e0bbe4b1.tar.gz
openjdk6: update version 1.12 to 1.12.5
* move some directivies to the included release file * remove patches which are applied upstream now
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/openjdk/openjdk-6-6b27/arm-thumb2-fix.patch95
-rw-r--r--recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch21
-rw-r--r--recipes-core/openjdk/openjdk-6-release-6b27.inc5
-rw-r--r--recipes-core/openjdk/openjdk-6_6b27-1.12.4.bb12
-rw-r--r--recipes-core/openjdk/openjdk-6_6b27-1.12.5.bb6
5 files changed, 10 insertions, 129 deletions
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 @@
1
2# HG changeset patch
3# User chrisphi
4# Date 1365166908 14400
5# Node ID 623621d29d04d87dc17f376b3917464e59026248
6# Parent 12f5fe9e85d373261c29be3bbd37ffc364678978
7Bug 1362: Fedora 19 / rawhide FTBFS SIGILL
8Summary: Fix reg alloc problem in thumb2.cpp compiler.
9
10diff -r 12f5fe9e85d3 -r 623621d29d04 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp
11--- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Wed Mar 20 11:00:45 2013 +0000
12+++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Fri Apr 05 09:01:48 2013 -0400
13@@ -1,5 +1,6 @@
14 /*
15 * Copyright 2009, 2010 Edward Nevill
16+ * Copyright 2013 Red Hat
17 *
18 * This code is free software; you can redistribute it and/or modify it
19 * under the terms of the GNU General Public License version 2 only, as
20@@ -399,6 +400,8 @@
21
22 static jmp_buf compiler_error_env;
23
24+#define J_BogusImplementation() longjmp(compiler_error_env, COMPILER_RESULT_FAILED)
25+
26 #ifdef PRODUCT
27
28 #define JASSERT(cond, msg) 0
29@@ -3505,8 +3508,6 @@
30 #define TOSM2(jstack) ((jstack)->stack[(jstack)->depth-3])
31 #define TOSM3(jstack) ((jstack)->stack[(jstack)->depth-4])
32
33-#define POP(jstack) ((jstack)->stack[--(jstack)->depth])
34-#define PUSH(jstack, r) ((jstack)->stack[(jstack)->depth++] = (r))
35 #define SWAP(jstack) do { \
36 Reg r = (jstack)->stack[(jstack)->depth-1]; \
37 (jstack)->stack[(jstack)->depth-1] = (jstack)->stack[(jstack)->depth-2]; \
38@@ -3516,6 +3517,17 @@
39 #define JSTACK_REG(jstack) jstack_reg(jstack)
40 #define JSTACK_PREFER(jstack, prefer) jstack_prefer(jstack, prefer)
41
42+int PUSH(Thumb2_Stack *jstack, unsigned reg) {
43+ jstack->stack[jstack->depth] = reg;
44+ jstack->depth++;
45+ return reg;
46+}
47+
48+int POP(Thumb2_Stack *jstack) {
49+ jstack->depth--;
50+ return jstack->stack[jstack->depth];
51+}
52+
53 static const unsigned last_clear_bit[] = {
54 3, // 0000
55 3, // 0001
56@@ -3532,11 +3544,13 @@
57 1, // 1100
58 1, // 1101
59 0, // 1110
60- 0, // 1111
61+ 0, // 1111 // No registers available...
62 };
63
64 #define LAST_CLEAR_BIT(mask) last_clear_bit[mask]
65
66+unsigned long thumb2_register_allocation_failures = 0;
67+
68 unsigned jstack_reg(Thumb2_Stack *jstack)
69 {
70 unsigned *stack = jstack->stack;
71@@ -3547,7 +3561,10 @@
72
73 for (i = 0; i < depth; i++) mask |= 1 << stack[i];
74 mask &= (1 << STACK_REGS) - 1;
75- JASSERT(mask != (1 << STACK_REGS) - 1, "No free reg in push");
76+ if (mask >= (1 << STACK_REGS) - 1) { // No free registers
77+ thumb2_register_allocation_failures++;
78+ J_BogusImplementation();
79+ }
80 r = LAST_CLEAR_BIT(mask);
81 return r;
82 }
83@@ -3563,7 +3580,10 @@
84 for (i = 0; i < depth; i++) mask |= 1 << stack[i];
85 mask &= (1 << STACK_REGS) - 1;
86 if ((prefer & ~mask) & 0x0f) mask |= (~prefer & ((1 << STACK_REGS) - 1));
87- JASSERT(mask != (1 << STACK_REGS) - 1, "No free reg in push");
88+ if (mask >= (1 << STACK_REGS) - 1) { // No free registers
89+ thumb2_register_allocation_failures++;
90+ J_BogusImplementation();
91+ }
92 r = LAST_CLEAR_BIT(mask);
93 return r;
94 }
95
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 @@
1Index: icedtea6-1.12.4/configure.ac
2===================================================================
3--- icedtea6-1.12.4.orig/configure.ac 2013-03-10 14:04:34.072354787 +0100
4+++ icedtea6-1.12.4/configure.ac 2013-03-10 14:07:48.201849004 +0100
5@@ -283,16 +283,6 @@
6 AC_SUBST(XT_CFLAGS)
7 AC_SUBST(XT_LIBS)
8
9-dnl Check for libXp headers and libraries.
10-PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no])
11-if test "x${XP_FOUND}" = xno
12-then
13- AC_MSG_ERROR([Could not find Xp - \
14- Try installing libXp-devel.])
15-fi
16-AC_SUBST(XP_CFLAGS)
17-AC_SUBST(XP_LIBS)
18-
19 dnl Check for libX11 headers and libraries.
20 PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no])
21 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
2 2
3FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b27:" 3FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b27:"
4 4
5OEPATCHES += "file://remove_libxp.patch" 5EXTRA_OECONF += "--disable-downloading"
6 6
7OPENJDK_VERSION = "b27" 7OPENJDK_VERSION = "b27"
8OPENJDK_DATE = "26_oct_2012" 8OPENJDK_DATE = "26_oct_2012"
@@ -22,3 +22,6 @@ SRC_URI[jaxp.md5sum] = "0ace787aa12177d201947e8ba0ba9bdd"
22SRC_URI[jaxp.sha256sum] = "490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c" 22SRC_URI[jaxp.sha256sum] = "490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c"
23 23
24 24
25ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no"
26
27DISTRIBUTION_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 @@
1require openjdk-6-release-6b27.inc
2
3PR = "${INC_PR}.1"
4
5SRC_URI[iced.md5sum] = "85bfc656c20fb762b72b71d3492a326c"
6SRC_URI[iced.sha256sum] = "eb326c6ae0147ca4abe4bd79e52c1edc2ef08e5e008230e24bee3abb39e14dda"
7
8OEPATCHES += "file://arm-thumb2-fix.patch"
9
10ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no"
11
12DISTRIBUTION_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 @@
1require openjdk-6-release-6b27.inc
2
3PR = "${INC_PR}.1"
4
5SRC_URI[iced.md5sum] = "2299fde9f315c7feb561c2975aa232b1"
6SRC_URI[iced.sha256sum] = "c61d6eb2f98d5c4059bb6eb6d808dd0954cf7d35c14290e5c77c3d7db75d2b35"