aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2021-09-15 16:03:17 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2021-09-15 16:03:17 +0000
commit9553c6af881e1f869cecb11b4476279e0ed6c4e0 (patch)
treec2393b7cae7491f2ae633f2781d98e40b80fcfc7
parentb14cd3a8339ea72cf39df4ccc53c830875c5d866 (diff)
downloadsrc-9553c6af881e1f869cecb11b4476279e0ed6c4e0.tar.gz
src-9553c6af881e1f869cecb11b4476279e0ed6c4e0.zip
<linux/overflow.h>: Don't use __has_builtin().
GCC only added support for __has_builtin in GCC 10. However, all supported versions of GCC and clang include these builtins so just use them unconditionally. This fixes the build with GCC 9. Reviewed by: manu, hselasky, imp Differential Revision: https://reviews.freebsd.org/D31942
-rw-r--r--sys/compat/linuxkpi/common/include/linux/overflow.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/sys/compat/linuxkpi/common/include/linux/overflow.h b/sys/compat/linuxkpi/common/include/linux/overflow.h
index 6f53f0b59384..2d540796cd43 100644
--- a/sys/compat/linuxkpi/common/include/linux/overflow.h
+++ b/sys/compat/linuxkpi/common/include/linux/overflow.h
@@ -34,18 +34,9 @@
#include <sys/stdint.h>
#include <sys/types.h>
-#ifndef __has_builtin
-#define __has_builtin(x) 0
-#endif
-
-#if __has_builtin(__builtin_add_overflow)
#define check_add_overflow(a, b, c) \
__builtin_add_overflow(a, b, c)
-#else
-#error "Compiler does not support __builtin_add_overflow"
-#endif
-#if __has_builtin(__builtin_mul_overflow)
#define check_mul_overflow(a, b, c) \
__builtin_mul_overflow(a, b, c)
@@ -58,8 +49,5 @@ array_size(size_t x, size_t y)
retval = SIZE_MAX;
return (retval);
}
-#else
-#error "Compiler does not support __builtin_mul_overflow"
-#endif
#endif /* __LINUX_OVERFLOW_H__ */