From 65041a6c16a11ca187734323177591e8fd09f2af Mon Sep 17 00:00:00 2001 From: Richard Leitner Date: Wed, 26 Apr 2017 15:39:12 +0200 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 --- ...icedtea-hotspot-fix-string-literal-marcos.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 recipes-core/openjdk/patches-openjdk-7/icedtea-hotspot-fix-string-literal-marcos.patch (limited to 'recipes-core/openjdk/patches-openjdk-7/icedtea-hotspot-fix-string-literal-marcos.patch') diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-hotspot-fix-string-literal-marcos.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-hotspot-fix-string-literal-marcos.patch new file mode 100644 index 0000000..533a04a --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-hotspot-fix-string-literal-marcos.patch @@ -0,0 +1,26 @@ +--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp ++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp +@@ -4378,9 +4378,9 @@ + #define G1PPRL_DOUBLE_H_FORMAT " %14s" + + // For summary info +-#define G1PPRL_SUM_ADDR_FORMAT(tag) " "tag":"G1PPRL_ADDR_BASE_FORMAT +-#define G1PPRL_SUM_BYTE_FORMAT(tag) " "tag": "SIZE_FORMAT +-#define G1PPRL_SUM_MB_FORMAT(tag) " "tag": %1.2f MB" ++#define G1PPRL_SUM_ADDR_FORMAT(tag) " " tag ":"G1PPRL_ADDR_BASE_FORMAT ++#define G1PPRL_SUM_BYTE_FORMAT(tag) " " tag ": "SIZE_FORMAT ++#define G1PPRL_SUM_MB_FORMAT(tag) " " tag ": %1.2f MB" + #define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag)" / %1.2f %%" + + G1PrintRegionLivenessInfoClosure:: +--- openjdk/hotspot/src/share/vm/prims/unsafe.cpp ++++ openjdk/hotspot/src/share/vm/prims/unsafe.cpp +@@ -950,7 +950,7 @@ + } + UNSAFE_END + +-#define DAC_Args CLS"[B["OBJ ++#define DAC_Args CLS "[B[" OBJ + // define a class but do not make it known to the class loader or system dictionary + // - host_class: supplies context for linkage, access control, protection domain, and class loader + // - data: bytes of a class file, a raw memory address (length gives the number of bytes) -- cgit v1.2.3-54-g00ecf