Merge tag 'clang-features-v5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / include / linux / compiler.h

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 099e529a5d254795a0a08a0438cfe8d3a87ca304..b67261a1e3e9cf382398befac327f7ec3108b4a3 100644 (file)
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -115,18 +115,24 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
  * The __COUNTER__ based labels are a hack to make each instance of the macros
  * unique, to convince GCC not to merge duplicate inline asm statements.
  */
-#define annotate_reachable() ({                                                \
-       asm volatile("%c0:\n\t"                                         \
+#define __stringify_label(n) #n
+
+#define __annotate_reachable(c) ({                                     \
+       asm volatile(__stringify_label(c) ":\n\t"                       \
                     ".pushsection .discard.reachable\n\t"              \
-                    ".long %c0b - .\n\t"                               \
-                    ".popsection\n\t" : : "i" (__COUNTER__));          \
+                    ".long " __stringify_label(c) "b - .\n\t"          \
+                    ".popsection\n\t");                                \
 })
-#define annotate_unreachable() ({                                      \
-       asm volatile("%c0:\n\t"                                         \
+#define annotate_reachable() __annotate_reachable(__COUNTER__)
+
+#define __annotate_unreachable(c) ({                                   \
+       asm volatile(__stringify_label(c) ":\n\t"                       \
                     ".pushsection .discard.unreachable\n\t"            \
-                    ".long %c0b - .\n\t"                               \
-                    ".popsection\n\t" : : "i" (__COUNTER__));          \
+                    ".long " __stringify_label(c) "b - .\n\t"          \
+                    ".popsection\n\t");                                \
 })
+#define annotate_unreachable() __annotate_unreachable(__COUNTER__)
+
 #define ASM_UNREACHABLE                                                        \
        "999:\n\t"                                                      \
        ".pushsection .discard.unreachable\n\t"                         \