diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2018-01-08 12:49:17 +0100 |
---|---|---|
committer | Maxin B. John <maxin.john@intel.com> | 2018-01-08 14:59:02 +0200 |
commit | 65bd3d6eaa6ae4e06f1c04efb493f448cf6d619b (patch) | |
tree | 89d6c8b2a9d159d486b76e6fed90f0c4ee25dc47 /recipes-core/openjdk/patches-openjdk-7/icedtea-crosscompile-fix.patch | |
parent | 67e48693501bddb80745b9735b7b3d4d28dce9a1 (diff) | |
download | meta-java-65bd3d6eaa6ae4e06f1c04efb493f448cf6d619b.tar.gz |
openjdk-7: fix compile errors with current poky master (gcc6)morty
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>
Signed-off-by: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-7/icedtea-crosscompile-fix.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-7/icedtea-crosscompile-fix.patch | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-crosscompile-fix.patch index e957d1e..5d93dbd 100644 --- a/recipes-core/openjdk/patches-openjdk-7/icedtea-crosscompile-fix.patch +++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-crosscompile-fix.patch | |||
@@ -53,7 +53,7 @@ index 6fe5191..765fc6d 100644 | |||
53 | 53 | ||
54 | # Hotspot uses very unstrict aliasing turn this optimization off | 54 | # Hotspot uses very unstrict aliasing turn this optimization off |
55 | OPT_CFLAGS += -fno-strict-aliasing | 55 | OPT_CFLAGS += -fno-strict-aliasing |
56 | @@ -208,15 +208,7 @@ LFLAGS += -Wl,-relax | 56 | @@ -208,15 +208,8 @@ LFLAGS += -Wl,-relax |
57 | endif | 57 | endif |
58 | 58 | ||
59 | # Enable linker optimization | 59 | # Enable linker optimization |
@@ -66,6 +66,7 @@ index 6fe5191..765fc6d 100644 | |||
66 | - LDFLAGS_HASH_STYLE = -Wl,--hash-style=both | 66 | - LDFLAGS_HASH_STYLE = -Wl,--hash-style=both |
67 | -endif | 67 | -endif |
68 | -LFLAGS += $(LDFLAGS_HASH_STYLE) | 68 | -LFLAGS += $(LDFLAGS_HASH_STYLE) |
69 | +LDFLAGS_HASH_STYLE = -Wl,--hash-style=both | ||
69 | +LFLAGS += $(OE_LDFLAGS) | 70 | +LFLAGS += $(OE_LDFLAGS) |
70 | 71 | ||
71 | # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file. | 72 | # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file. |