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-hotspot-fix-string-literal-marcos.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-hotspot-fix-string-literal-marcos.patch')
| -rw-r--r-- | recipes-core/openjdk/patches-openjdk-7/icedtea-hotspot-fix-string-literal-marcos.patch | 26 |
1 files changed, 26 insertions, 0 deletions
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 @@ | |||
| 1 | --- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp | ||
| 2 | +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp | ||
| 3 | @@ -4378,9 +4378,9 @@ | ||
| 4 | #define G1PPRL_DOUBLE_H_FORMAT " %14s" | ||
| 5 | |||
| 6 | // For summary info | ||
| 7 | -#define G1PPRL_SUM_ADDR_FORMAT(tag) " "tag":"G1PPRL_ADDR_BASE_FORMAT | ||
| 8 | -#define G1PPRL_SUM_BYTE_FORMAT(tag) " "tag": "SIZE_FORMAT | ||
| 9 | -#define G1PPRL_SUM_MB_FORMAT(tag) " "tag": %1.2f MB" | ||
| 10 | +#define G1PPRL_SUM_ADDR_FORMAT(tag) " " tag ":"G1PPRL_ADDR_BASE_FORMAT | ||
| 11 | +#define G1PPRL_SUM_BYTE_FORMAT(tag) " " tag ": "SIZE_FORMAT | ||
| 12 | +#define G1PPRL_SUM_MB_FORMAT(tag) " " tag ": %1.2f MB" | ||
| 13 | #define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag)" / %1.2f %%" | ||
| 14 | |||
| 15 | G1PrintRegionLivenessInfoClosure:: | ||
| 16 | --- openjdk/hotspot/src/share/vm/prims/unsafe.cpp | ||
| 17 | +++ openjdk/hotspot/src/share/vm/prims/unsafe.cpp | ||
| 18 | @@ -950,7 +950,7 @@ | ||
| 19 | } | ||
| 20 | UNSAFE_END | ||
| 21 | |||
| 22 | -#define DAC_Args CLS"[B["OBJ | ||
| 23 | +#define DAC_Args CLS "[B[" OBJ | ||
| 24 | // define a class but do not make it known to the class loader or system dictionary | ||
| 25 | // - host_class: supplies context for linkage, access control, protection domain, and class loader | ||
| 26 | // - data: bytes of a class file, a raw memory address (length gives the number of bytes) | ||