Merge pull request #4690 from MidnightCommander/feature/use-compiler-attribute-detection

Use compiler attribute detection

Author: zyv

acinclude.m4

@@ -13,7 +13,6 @@ m4_include([m4.include/ax_append_flag.m4])
 m4_include([m4.include/ax_append_compile_flags.m4])
 m4_include([m4.include/mc-cflags.m4])
 m4_include([m4.include/mc-stdckdint.m4])
-m4_include([m4.include/ax_gcc_func_attribute.m4])
 m4_include([m4.include/mc-get-fs-info.m4])
 m4_include([m4.include/mc-with-x.m4])
 m4_include([m4.include/mc-use-termcap.m4])

configure.ac

@@ -64,16 +64,6 @@ if test "x$enable_werror" = xyes; then
     AX_APPEND_COMPILE_FLAGS([-Werror], [mc_configured_cflags])
 fi
 
-dnl Compiler can generate warnings for unrecognized flags added to CFLAGS
-dnl which causes attribute checks to fail
-ax_gcc_func_attribute_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
-_AC_LANG_PREFIX[]FLAGS=
-AX_GCC_FUNC_ATTRIBUTE([fallthrough])
-AX_GCC_FUNC_ATTRIBUTE([weak])
-AX_GCC_FUNC_ATTRIBUTE([unused])
-_AC_LANG_PREFIX[]FLAGS=$ax_gcc_func_attribute_save_flags
-unset ax_gcc_func_attribute_save_flags
-
 LT_INIT
 
 

lib/global.h

@@ -9,7 +9,13 @@
 
 #include <glib.h>
 
-#if defined(HAVE_FUNC_ATTRIBUTE_WEAK) && defined(HAVE_TESTS)
+#if defined(__has_attribute)
+#define MC_HAS_ATTRIBUTE(ATTR) __has_attribute (ATTR)
+#else
+#define MC_HAS_ATTRIBUTE(ATTR) 0
+#endif
+
+#if MC_HAS_ATTRIBUTE(weak) && defined(HAVE_TESTS)
 #define MC_MOCKABLE __attribute__ ((weak))
 #else
 #define MC_MOCKABLE
@@ -44,18 +50,24 @@
 #define N_(String)                        (String)
 #endif
 
-#ifdef HAVE_FUNC_ATTRIBUTE_FALLTHROUGH
+#if MC_HAS_ATTRIBUTE(fallthrough)
 #define MC_FALLTHROUGH __attribute__ ((fallthrough))
 #else
 #define MC_FALLTHROUGH
 #endif
 
-#ifdef HAVE_FUNC_ATTRIBUTE_UNUSED
+#if MC_HAS_ATTRIBUTE(unused)
 #define MC_UNUSED __attribute__ ((unused))
 #else
 #define MC_UNUSED
 #endif
 
+#if MC_HAS_ATTRIBUTE(nonstring)
+#define MC_NONSTRING __attribute__ ((nonstring))
+#else
+#define MC_NONSTRING
+#endif
+
 #ifdef USE_MAINTAINER_MODE
 #include "lib/logging.h"
 #endif

m4.include/ax_gcc_func_attribute.m4

@@ -1220,7 +1220,7 @@ static void
 find_rotate_dash (const WDialog *h, gboolean show)
 {
     static size_t pos = 0;
-    static const char rotating_dash[4] = "|/-\\";
+    static const char rotating_dash[4] MC_NONSTRING = "|/-\\";
     const Widget *w = CONST_WIDGET (h);
     const int *colors;
 

src/filemanager/find.c

@@ -1066,7 +1066,7 @@ rotate_dash (gboolean show)
         tty_print_alt_char (ACS_URCORNER, FALSE);
     else
     {
-        static const char rotating_dash[4] = "|/-\\";
+        static const char rotating_dash[4] MC_NONSTRING = "|/-\\";
         static size_t pos = 0;
 
         tty_print_char (rotating_dash[pos]);