gprofng: Define ATTRIBUTE_FALLTHROUGH

Define ATTRIBUTE_FALLTHROUGH to __attribute__ ((fallthrough)) only for
GCC 7 or above.

	PR gprof/28969
	* common/gp-defs.h (ATTRIBUTE_FALLTHROUGH): New.
	* src/gp-collect-app.cc (collect::check_args): Replace
	/* FALLTHROUGH */ with ATTRIBUTE_FALLTHROUGH.

diff --git a/gprofng/common/gp-defs.h b/gprofng/common/gp-defs.h
index 440bfb1c5e278362d6cd2e0eaed148fdb50231cb..e92c33e101b8489ec684f6af7a701e39f051fc17 100644 (file)
--- a/gprofng/common/gp-defs.h
+++ b/gprofng/common/gp-defs.h
@@ -55,4 +55,12 @@
 #define WSIZE_32            1
 #endif
 
+#ifndef ATTRIBUTE_FALLTHROUGH
+# if (GCC_VERSION >= 7000)
+#  define ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__))
+# else
+#  define ATTRIBUTE_FALLTHROUGH        /* Fall through */
+# endif
+#endif
+
 #endif

diff --git a/gprofng/src/gp-collect-app.cc b/gprofng/src/gp-collect-app.cc
index a40cf8fb9bea5306ab40523f63fb02df33ca1f5a..34874b8c2965f7f7bd5ebf23769656cdc8487846 100644 (file)
--- a/gprofng/src/gp-collect-app.cc
+++ b/gprofng/src/gp-collect-app.cc
@@ -848,7 +848,7 @@ collect::check_args (int argc, char *argv[])
          }
        case 'O':
          overwriteExp = true;
-          /* FALLTHROUGH */
+         ATTRIBUTE_FALLTHROUGH
        case 'o':
          if (precheck == 1)
            {