Remove obsolete GCC version checks

...after <https://gerrit.libreoffice.org/63951> "Bump (Linux) GCC baseline to
7.0.0".  (In some cases, those checks now need to check for __clang__, which was
implicitly covered in the past by Clang consistently reporting to be
GCC 4.2.1.)

Change-Id: I860fef8c4ca41c22a7541f0fb2d34b37d1d69bed
Reviewed-on: https://gerrit.libreoffice.org/63952
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

configure.ac

@@ -6258,13 +6258,13 @@ elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 
             #if defined SYSTEM_LIBCMIS
             // See ucb/source/ucp/cmis/auth_provider.hxx:
-            #if __GNUC__ >= 7
+            #if !defined __clang__
             #pragma GCC diagnostic push
             #pragma GCC diagnostic ignored "-Wdeprecated"
             #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
             #endif
             #include <libcmis/libcmis.hxx>
-            #if __GNUC__ >= 7
+            #if !defined __clang__
             #pragma GCC diagnostic pop
             #endif
             #endif

connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx

@@ -444,7 +444,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, co
                 break;
             }
 
-#if defined __GNUC__ && __GNUC__ >= 7
+#if defined __GNUC__ && !defined __clang__
             [[fallthrough]];
 #else
             BOOST_FALLTHROUGH;

cppu/qa/cppumaker/test_cppumaker.cxx

@@ -444,7 +444,7 @@ void Test::testBigStruct() {
     CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), guard.p->m23.getLength());
 
 //This is a very platform specific test.
-#if defined __GNUC__ && __GNUC__ >= 3 // see CPPU_GCC3_ALIGN
+#if defined __GNUC__ // see CPPU_GCC3_ALIGN
 #if defined(LINUX) && (defined (X86_64) || defined(X86) || defined(PPC))
     CPPUNIT_ASSERT_EQUAL(
 #if defined X86_64 || defined PPC

external/poppler/StaticLibrary_poppler.mk

@@ -33,22 +33,6 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\
 ))
 endif
 
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864
-# can't easily check for 4.8.2 exactly so just apply to GCC 4.8.x
-ifeq ($(COM),GCC)
-ifeq ($(COM_IS_CLANG),)
-ifeq ($(CPUNAME),INTEL)
-ifeq ($(shell expr '$(GCC_VERSION)' '<' 409),1)
-ifeq ($(shell expr '$(GCC_VERSION)' '>=' 408),1)
-$(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\
-	-march=i586 \
-))
-endif
-endif
-endif
-endif
-endif
-
 $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,poppler,cc))
 
 $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\

include/o3tl/safeint.hxx

@@ -112,7 +112,7 @@ template<typename T> inline bool checked_sub(T a, T b, T& result)
     return !msl::utilities::SafeSubtract(a, b, result);
 }
 
-#elif (defined __GNUC__ && __GNUC__ >= 5) || (__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined __clang__) && !(defined(__clang__) && defined(__i386__)))
+#elif (defined __GNUC__ && !defined __clang__) || (__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined __clang__) && !(defined(__clang__) && defined(__i386__)))
 // 32-bit clang fails with undefined reference to `__mulodi4'
 
 template<typename T> inline bool checked_multiply(T a, T b, T& result)

include/rtl/stringutils.hxx

@@ -229,12 +229,7 @@ struct ConstCharArrayDetector<sal_Unicode const [N], T> {
     { return literal; }
 };
 template<typename T> struct ConstCharArrayDetector<
-#if defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ <= 8 \
-        && !defined __clang__
-    OUStringLiteral1_ const,
-#else
     OUStringLiteral1,
-#endif
     T>
 {
     using TypeUtf16 = T;
@@ -260,12 +255,7 @@ struct ExceptConstCharArrayDetector< const char[ N ] >
 template<std::size_t N>
 struct ExceptConstCharArrayDetector<sal_Unicode const[N]> {};
 template<> struct ExceptConstCharArrayDetector<
-#if defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ <= 8 \
-        && !defined __clang__
-    OUStringLiteral1_ const
-#else
     OUStringLiteral1
-#endif
     >
 {};
 #endif

include/sal/types.h

@@ -678,7 +678,7 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) {
 #define __has_attribute(x) 0
 #endif
 
-#if defined LIBO_INTERNAL_ONLY && ((defined __GNUC__ && __GNUC__ > 4) || (defined __clang__ && __has_attribute(returns_nonnull)))
+#if defined LIBO_INTERNAL_ONLY && ((defined __GNUC__ && !defined __clang__) || (defined __clang__ && __has_attribute(returns_nonnull)))
 #define SAL_RETURNS_NONNULL  __attribute__((returns_nonnull))
 #else
 #define SAL_RETURNS_NONNULL

solenv/gbuild/platform/com_GCC_defs.mk

@@ -100,7 +100,9 @@ gb_CXXFLAGS_COMMON += -ffunction-sections -fdata-sections
 gb_LinkTarget_LDFLAGS += -Wl,--gc-sections
 endif
 
-ifeq ($(shell expr '$(GCC_VERSION)' '>=' 600),1)
+ifeq ($(COM_IS_CLANG),TRUE)
+gb_CXXFLAGS_COMMON += -Wimplicit-fallthrough
+else
 gb_CFLAGS_COMMON += \
     -Wduplicated-cond \
     -Wlogical-op \
@@ -119,16 +121,6 @@ gb_CXXFLAGS_COMMON += \
     -Wno-cast-function-type
 endif
 
-ifeq ($(COM_IS_CLANG),TRUE)
-gb_CXXFLAGS_COMMON += -Wimplicit-fallthrough
-else
-# GCC 4.8, at least, is confused by boost 1.66 optional assignments
-ifeq ($(shell expr '$(GCC_VERSION)' '<' 409),1)
-gb_CXXFLAGS_COMMON += -Wno-maybe-uninitialized
-endif
-endif
-
-
 # If CC or CXX already include -fvisibility=hidden, don't duplicate it
 ifeq (,$(filter -fvisibility=hidden,$(CC)))
 gb_VISIBILITY_FLAGS := -fvisibility=hidden

ucb/source/ucp/cmis/auth_provider.hxx

@@ -9,13 +9,13 @@
 #ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_AUTH_PROVIDER_HXX
 #define INCLUDED_UCB_SOURCE_UCP_CMIS_AUTH_PROVIDER_HXX
 
-#if defined __GNUC__ && __GNUC__ >= 7
+#if defined __GNUC__ && !defined __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
 #include <libcmis/libcmis.hxx>
-#if defined __GNUC__ && __GNUC__ >= 7
+#if defined __GNUC__ && !defined __clang__
 #pragma GCC diagnostic pop
 #endif
 

ucb/source/ucp/cmis/certvalidation_handler.hxx

@@ -12,13 +12,13 @@
 #ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CERTVALIDATION_HANDLER_HXX
 #define INCLUDED_UCB_SOURCE_UCP_CMIS_CERTVALIDATION_HANDLER_HXX
 
-#if defined __GNUC__ && __GNUC__ >= 7
+#if defined __GNUC__ && !defined __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
 #include <libcmis/libcmis.hxx>
-#if defined __GNUC__ && __GNUC__ >= 7
+#if defined __GNUC__ && !defined __clang__
 #pragma GCC diagnostic pop
 #endif
 

ucb/source/ucp/cmis/cmis_content.hxx

@@ -24,13 +24,13 @@
 #include <com/sun/star/document/CmisVersion.hpp>
 #include <ucbhelper/contenthelper.hxx>
 
-#if defined __GNUC__ && __GNUC__ >= 7
+#if defined __GNUC__ && !defined __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
 #include <libcmis/libcmis.hxx>
-#if defined __GNUC__ && __GNUC__ >= 7
+#if defined __GNUC__ && !defined __clang__
 #pragma GCC diagnostic pop
 #endif
 

ucb/source/ucp/cmis/cmis_url.cxx

@@ -7,13 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#if defined __GNUC__ && __GNUC__ >= 7
+#if defined __GNUC__ && !defined __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
 #include <libcmis/libcmis.hxx>
-#if defined __GNUC__ && __GNUC__ >= 7
+#if defined __GNUC__ && !defined __clang__
 #pragma GCC diagnostic pop
 #endif