diff --git a/.pick_status.json b/.pick_status.json
index ceab3bbdb9c..d481718c59f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -202,7 +202,7 @@
         "description": "util: Add support for clang::fallthrough.",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/util/compiler.h b/src/util/compiler.h
index da602cfa33d..83f8e346a08 100644
--- a/src/util/compiler.h
+++ b/src/util/compiler.h
@@ -76,9 +76,20 @@
 #  define __has_attribute(x) 0
 #endif
 
+#if defined(__has_cpp_attribute) && defined(__clang__)
+/* We do not do the same trick as __has_attribute because parsing
+ * clang::fallthrough in the preprocessor fails in GCC. */
+#  define HAS_CLANG_FALLTHROUGH  __has_cpp_attribute(clang::fallthrough)
+#else
+#  define HAS_CLANG_FALLTHROUGH 0
+#endif
+
 #if __cplusplus >= 201703L || __STDC_VERSION__ > 201710L
 /* Standard C++17/C23 attribute */
 #define FALLTHROUGH [[fallthrough]]
+#elif HAS_CLANG_FALLTHROUGH
+/* Clang++ specific */
+#define FALLTHROUGH [[clang::fallthrough]]
 #elif __has_attribute(fallthrough)
 /* Non-standard but supported by at least gcc and clang */
 #define FALLTHROUGH __attribute__((fallthrough))