diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2017-04-26 15:39:12 +0200 |
---|---|---|
committer | Maxin B. John <maxin.john@intel.com> | 2017-05-29 13:46:29 +0300 |
commit | f3d3a6231c664c7983501420e5fdc70f0f453f14 (patch) | |
tree | 6c8f9384b7c37b81726bde91d3046160f9db2d57 /recipes-core/openjdk/patches-openjdk-7/icedtea-specify-overloaded-variant-of-fmod.patch | |
parent | 086eb6a323e4c4a4a32feb173f98db802ea3b747 (diff) | |
download | meta-java-f3d3a6231c664c7983501420e5fdc70f0f453f14.tar.gz |
openjdk-7: fix compile errors with current poky master (gcc6)
Using the current poky master openjdk-7 wasn't buildable. This patch
fixes those problems by adding three more patches to openjdk-7.
These patches basically add/fix GCC6 support. Furthermore the
LDFLAGS_HASH_STYLE variable (which was removed by the
icedtea-crosscompile-fix.patch) is re-introduced and set to "both" for
compatibility reasons.
Following two patches were originally written by Abdur Rehman and taken
from meta-mentor [1]:
icedtea-flags-to-compile-with-GCC-6.patch
icedtea-specify-overloaded-variant-of-fmod.patch
[1] https://github.com/MentorEmbedded/meta-mentor
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-7/icedtea-specify-overloaded-variant-of-fmod.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-7/icedtea-specify-overloaded-variant-of-fmod.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-specify-overloaded-variant-of-fmod.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-specify-overloaded-variant-of-fmod.patch new file mode 100644 index 0000000..09fbffe --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-specify-overloaded-variant-of-fmod.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 64a8800cd4efa15bf625227b7cd3a2e15ebfa359 Mon Sep 17 00:00:00 2001 | ||
2 | From: Abdur Rehman <abdur_rehman@mentor.com> | ||
3 | Date: Tue, 25 Oct 2016 13:29:51 +0500 | ||
4 | Subject: [PATCH] arm32JIT.cpp: specify overloaded variant of fmod | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com> | ||
9 | --- | ||
10 | openjdk/hotspot/src/cpu/zero/vm/arm32JIT.cpp | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git openjdk/hotspot/src/cpu/zero/vm/arm32JIT.cpp openjdk/hotspot/src/cpu/zero/vm/arm32JIT.cpp | ||
14 | index 089a1c9..4482fd6 100644 | ||
15 | --- openjdk/hotspot/src/cpu/zero/vm/arm32JIT.cpp | ||
16 | +++ openjdk/hotspot/src/cpu/zero/vm/arm32JIT.cpp | ||
17 | @@ -8185,7 +8185,7 @@ handlers[H_INVOKEINTERFACE] = (unsigned)(cb->hp + INVOKEINTERFACE_STUB); | ||
18 | |||
19 | handlers[H_DREM] = out_pos(&codebuf); | ||
20 | stm(&codebuf, (1<<ARM_LR), ARM_SP, PUSH_FD, 1); | ||
21 | - mov_imm(&codebuf, ARM_IP, (u32)fmod); | ||
22 | + mov_imm(&codebuf, ARM_IP, (u32)(double (*)(double, double))fmod); | ||
23 | #ifdef __ARM_PCS_VFP | ||
24 | vmov_reg_d_toVFP(&codebuf, VFP_D0, ARM_R0, ARM_R1); | ||
25 | vmov_reg_d_toVFP(&codebuf, VFP_D1, ARM_R2, ARM_R3); | ||
26 | -- | ||
27 | 2.8.1 | ||
28 | |||