mirror: Update "fallthrough" keyword definition

To align on the rest of the kernel code, we updated the "__fallthrough" keyword into simply "fallthrough". The change needs the corresponding definition in the headers. Signed-off-by: Quentin Monnet <[email protected]>
libbpf · Aug 29, 2023 · 654895b · 654895b
1 parent 5dc1ec5
commit 654895b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
@@ -13,8 +13,10 @@
 		     + __GNUC_PATCHLEVEL__)
 #endif
 
-#if GCC_VERSION >= 70000 && !defined(__CHECKER__)
-# define __fallthrough __attribute__ ((fallthrough))
+#if __has_attribute(__fallthrough__)
+# define fallthrough                    __attribute__((__fallthrough__))
+#else
+# define fallthrough                    do {} while (0)  /* fallthrough */
 #endif
 
 #if __has_attribute(__error__)

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
@@ -44,8 +44,4 @@
 # define __weak			__attribute__((weak))
 #endif
 
-#ifndef __fallthrough
-# define __fallthrough
-#endif
-
 #endif