diff options
author | Miquel Raynal <miquel.raynal@bootlin.com> | 2021-11-07 17:38:36 +0100 |
---|---|---|
committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2021-11-07 17:38:36 +0100 |
commit | e269d7caf9e0dbd95fac9991991298f74930c2c0 (patch) | |
tree | 5fc1a69a0a54cdfc7f3a0be247f6658d3d7ed3c1 /tools/include/linux/compiler-gcc.h | |
parent | bca20e6a73863f37eb5e04c505be219a65f26a38 (diff) | |
parent | df872ab1ffe4bd865dfb5956cae4901429004ab6 (diff) |
Merge tag 'spi-nor/for-5.16' into mtd/next
SPI NOR core changes:
- Add spi-nor device tree binding under SPI NOR maintainers
SPI NOR manufacturer drivers changes:
- Enable locking for n25q128a13
SPI NOR controller drivers changes:
- Use devm_platform_ioremap_resource_byname()
Diffstat (limited to 'tools/include/linux/compiler-gcc.h')
-rw-r--r-- | tools/include/linux/compiler-gcc.h | 8 |
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 |