aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-8-common.inc
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2020-04-29 11:58:07 +0200
committerRichard Leitner <richard.leitner@skidata.com>2020-05-06 07:29:05 +0200
commit2cf52b0f32712a0bd567b34a4fbb8f998abac638 (patch)
tree6e482bc7500defc29f36a1738c321feab2ac85a1 /recipes-core/openjdk/openjdk-8-common.inc
parent840a581290d08ae48a577bda9e84363771ba6167 (diff)
downloadmeta-java-2cf52b0f32712a0bd567b34a4fbb8f998abac638.tar.gz
meta-java-2cf52b0f32712a0bd567b34a4fbb8f998abac638.tar.bz2
meta-java-2cf52b0f32712a0bd567b34a4fbb8f998abac638.zip
openjdk-8: require GCC >= v6
As nobody should use older versions of GCC anymore this patch drops all version dependent workarounds and requiers host gcc >=6 for building openjdk-8. Signed-off-by: Richard Leitner <richard.leitner@skidata.com> Tested-by: Jacob Kroon <jacob.kroon@gmail.com>
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-common.inc')
-rw-r--r--recipes-core/openjdk/openjdk-8-common.inc22
1 files changed, 8 insertions, 14 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index 5228338..c78bb2a 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -170,20 +170,14 @@ EXTRA_OECONF_append = "\
"
# Since v6, GCC sets the default C++ standard to C++14 and introduces
-# dead store elimination by default. OpenJDK 8 is not ready for either
-# of these changes.
-FLAGS_GCC6 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
-FLAGS_GCC7 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
-FLAGS_GCC8 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
-FLAGS_GCC9 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
-FLAGS_GCC10 = "-fno-lifetime-dse -fno-delete-null-pointer-checks"
-
-# GCC 10 defaults to -fno-common, but OpenJDK 8 is not ready for this.
-FLAGS_GCC10_append = " -fcommon"
+# dead store elimination by default.
+# Since v10, GCC defaults to -fno-common.
+# OpenJDK 8 is not ready for either of these changes.
+GLOBAL_FLAGS = "-fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon"
# flags for -native, and for bits that need a host-tool during -cross
-BUILD_CFLAGS_append = " ${@openjdk_build_helper_get_build_cflags(d)}"
-BUILD_CXXFLAGS_append = " ${@openjdk_build_helper_get_build_cflags(d)}"
+BUILD_CFLAGS_append = " ${GLOBAL_FLAGS}"
+BUILD_CXXFLAGS_append = " ${GLOBAL_FLAGS}"
# flags for -cross
-TARGET_CFLAGS_append = " ${@openjdk_build_helper_get_target_cflags(d)}"
-TARGET_CXXFLAGS_append = " ${@openjdk_build_helper_get_target_cflags(d)}"
+TARGET_CFLAGS_append = " ${GLOBAL_FLAGS}"
+TARGET_CXXFLAGS_append = " ${GLOBAL_FLAGS}"