From 65bd3d6eaa6ae4e06f1c04efb493f448cf6d619b Mon Sep 17 00:00:00 2001 From: Richard Leitner Date: Mon, 8 Jan 2018 12:49:17 +0100 Subject: 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 Signed-off-by: Maxin B. John Signed-off-by: Jose Diaz de Grenu --- recipes-core/openjdk/patches-openjdk-7/icedtea-crosscompile-fix.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'recipes-core/openjdk/patches-openjdk-7/icedtea-crosscompile-fix.patch') 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 # Hotspot uses very unstrict aliasing turn this optimization off OPT_CFLAGS += -fno-strict-aliasing -@@ -208,15 +208,7 @@ LFLAGS += -Wl,-relax +@@ -208,15 +208,8 @@ LFLAGS += -Wl,-relax endif # Enable linker optimization @@ -66,6 +66,7 @@ index 6fe5191..765fc6d 100644 - LDFLAGS_HASH_STYLE = -Wl,--hash-style=both -endif -LFLAGS += $(LDFLAGS_HASH_STYLE) ++LDFLAGS_HASH_STYLE = -Wl,--hash-style=both +LFLAGS += $(OE_LDFLAGS) # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file. -- cgit v1.2.3-54-g00ecf