From e8bd027d70d448d8fc5dd90d1a94b4fa6cb937b2 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 13 May 2020 14:14:18 +0200 Subject: The -Wclobbered hack appears to be needed for all versions of GCC What apparently triggers it here is a combination of --enable-assert-always-abort --enable-optimized --enable-werror See "Unexpected -Wclobbered in bits/vector.tcc with -O2" for a stripped-down reproducer. Change-Id: Ic2cff0e402290cd9fd67790168dc1183799e3f14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94121 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'jvmfwk') diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index c754dbe7c9cb..cec0ce97ff6a 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -818,12 +818,12 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( #endif return errorcode; -#if defined __GNUC__ && (__GNUC__ == 7 || __GNUC__ == 10) && !defined __clang__ +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wclobbered" #endif } -#if defined __GNUC__ && (__GNUC__ == 7 || __GNUC__ == 10) && !defined __clang__ +#if defined __GNUC__ && !defined __clang__ #pragma GCC diagnostic pop #endif -- cgit