aboutsummaryrefslogtreecommitdiffstats
path: root/tools/include/linux/compiler-gcc.h
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2021-10-04 16:44:16 -0600
committerJonathan Corbet <corbet@lwn.net>2021-10-04 16:44:16 -0600
commitb718f9d919d16fb7b97a890f74d34593d9cecd20 (patch)
treeed38d58283ae36e0478bac2e0d244e06dbcc2f1c /tools/include/linux/compiler-gcc.h
parentdocs: checkpatch: add multiline, do/while, and multiple-assignment messages (diff)
parentLinux 5.15-rc4 (diff)
downloadlinux-dev-b718f9d919d16fb7b97a890f74d34593d9cecd20.tar.xz
linux-dev-b718f9d919d16fb7b97a890f74d34593d9cecd20.zip
Merge tag 'v5.15-rc4' into docs-next
This is needed to get a docs fix that entered via the DRM tree; testers have requested it so that PDF builds in docs-next work again.
Diffstat (limited to 'tools/include/linux/compiler-gcc.h')
-rw-r--r--tools/include/linux/compiler-gcc.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/include/linux/compiler-gcc.h b/tools/include/linux/compiler-gcc.h
index 95c072b70d0e..8816f06fc6c7 100644
--- a/tools/include/linux/compiler-gcc.h
+++ b/tools/include/linux/compiler-gcc.h
@@ -16,9 +16,9 @@
# define __fallthrough __attribute__ ((fallthrough))
#endif
-#if GCC_VERSION >= 40300
+#if __has_attribute(__error__)
# define __compiletime_error(message) __attribute__((error(message)))
-#endif /* GCC_VERSION >= 40300 */
+#endif
/* &a[0] degrades to a pointer: a different type from an array */
#define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
@@ -38,7 +38,3 @@
#endif
#define __printf(a, b) __attribute__((format(printf, a, b)))
#define __scanf(a, b) __attribute__((format(scanf, a, b)))
-
-#if GCC_VERSION >= 50100
-#define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
-#endif