diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-05 18:03:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-05 18:03:32 -0400 |
| commit | df3d0a3f95dd9109b889c5411204f133451b7a7e (patch) | |
| tree | 7d54c64d08db45d62e941e3697e1c691dec7ebba /include/linux/compiler-intel.h | |
| parent | 785195941b0746ac987a0ca501dae3e570b9f042 (diff) | |
| parent | c57383b0c22bd313c9511eeb2fd6702adbcfe030 (diff) | |
Merge branch '2020-07-01-kconfig-etc-updates' into next
- Resync Kconfiglib with the v14.1.0 release.
- Re-sync our <linux/compiler*h> files with v5.7-rc5 from upstream.
- Fully resync checkpatch.pl with v5.7 release.
To safely to all of the above, we have a few bugfixes about functions
that need a 'static inline' but weren't. We also stop setting
CROSS_COMPILE in arch/*/config.mk. Finally, with the above changes
boards can now opt-in to optimizing inlining and we do this for the
socfpga stratix10 platform for space savings.
Diffstat (limited to 'include/linux/compiler-intel.h')
| -rw-r--r-- | include/linux/compiler-intel.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h index d4c71132d07..b17f3cd1833 100644 --- a/include/linux/compiler-intel.h +++ b/include/linux/compiler-intel.h @@ -1,22 +1,17 @@ -#ifndef __LINUX_COMPILER_H +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LINUX_COMPILER_TYPES_H #error "Please don't include <linux/compiler-intel.h> directly, include <linux/compiler.h> instead." #endif #ifdef __ECC -/* Some compiler specific definitions are overwritten here - * for Intel ECC compiler - */ +/* Compiler specific definitions for Intel ECC compiler */ #include <asm/intrinsics.h> /* Intel ECC compiler doesn't support gcc specific asm stmts. * It uses intrinsics to do the equivalent things. */ -#undef barrier -#undef barrier_data -#undef RELOC_HIDE -#undef OPTIMIZER_HIDE_VAR #define barrier() __memory_barrier() #define barrier_data(ptr) barrier() @@ -32,14 +27,8 @@ */ #define OPTIMIZER_HIDE_VAR(var) barrier() -/* Intel ECC compiler doesn't support __builtin_types_compatible_p() */ -#define __must_be_array(a) 0 - #endif -#ifndef __HAVE_BUILTIN_BSWAP16__ /* icc has this, but it's called _bswap16 */ #define __HAVE_BUILTIN_BSWAP16__ #define __builtin_bswap16 _bswap16 -#endif - |