summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-core/icedtea/icedtea7-native.inc5
-rw-r--r--recipes-core/openjdk/openjdk-7-common.inc3
-rw-r--r--recipes-core/openjdk/openjdk-8-common.inc3
3 files changed, 8 insertions, 3 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
index 0f317bb..d6f8fd7 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -21,9 +21,8 @@ CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=t
21# Disable dead store elimination and set C++ standard to C++98. 21# Disable dead store elimination and set C++ standard to C++98.
22# There are dead stores in the JVM that would be pretty hard to 22# There are dead stores in the JVM that would be pretty hard to
23# remove, so disable the optimisation in the compiler. 23# remove, so disable the optimisation in the compiler.
24CFLAGS:append = " -fno-tree-dse" 24CFLAGS:append = " -std=gnu++98 -fno-tree-dse -fno-tree-vectorize"
25CXXFLAGS:append = " -fno-tree-dse" 25CXXFLAGS:append = " -std=gnu++98 -fno-tree-dse"
26CXX:append = " -std=gnu++98"
27 26
28# WORKAROUND: ignore errors from new compilers 27# WORKAROUND: ignore errors from new compilers
29CFLAGS:append = " -Wno-error=stringop-overflow -Wno-error=return-type" 28CFLAGS:append = " -Wno-error=stringop-overflow -Wno-error=return-type"
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 0435233..cba1ea6 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -459,3 +459,6 @@ ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac"
459ALTERNATIVE_LINK_NAME[keytool] = "${bindir}/keytool" 459ALTERNATIVE_LINK_NAME[keytool] = "${bindir}/keytool"
460 460
461ALTERNATIVE_PRIORITY = "50" 461ALTERNATIVE_PRIORITY = "50"
462
463# canon-prefix-map doesn't exist in gcc 12.x
464DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map"
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index 16e3816..82bf31e 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -194,3 +194,6 @@ BUILD_CXXFLAGS:append = " ${GLOBAL_FLAGS}"
194# flags for -cross 194# flags for -cross
195TARGET_CFLAGS:append = " ${GLOBAL_FLAGS}" 195TARGET_CFLAGS:append = " ${GLOBAL_FLAGS}"
196TARGET_CXXFLAGS:append = " ${GLOBAL_FLAGS}" 196TARGET_CXXFLAGS:append = " ${GLOBAL_FLAGS}"
197
198# canon-prefix-map doesn't exist in gcc 12.x
199DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map"