diff options
author | AlmuHS <liberamenso10000@gmail.com> | 2018-12-31 02:13:08 +0100 |
---|---|---|
committer | AlmuHS <liberamenso10000@gmail.com> | 2018-12-31 02:13:08 +0100 |
commit | 46a6dc3a9b88d3cd7522c480384dad502c49227c (patch) | |
tree | 163021a3639f360c5605bcedd752d3b1ef6fdfd4 /linux | |
parent | 6216e74dd0d961915edee69098f6e8d27a4ba896 (diff) | |
parent | 70ddda0f41b3b13a5a3b5179447712f7af8fb574 (diff) |
fix conflict
Diffstat (limited to 'linux')
-rw-r--r-- | linux/Makefrag.am | 2 | ||||
-rw-r--r-- | linux/src/include/linux/compiler-gcc8.h | 67 |
2 files changed, 68 insertions, 1 deletions
diff --git a/linux/Makefrag.am b/linux/Makefrag.am index 1b690108..38718a3f 100644 --- a/linux/Makefrag.am +++ b/linux/Makefrag.am @@ -43,7 +43,7 @@ liblinux_a_CFLAGS += \ # TODO. Do we really need `-traditional'? liblinux_a_CCASFLAGS = $(AM_CCASFLAGS) \ - -D__ASSEMBLY__ -traditional \ + -traditional \ $(liblinux_a_CPPFLAGS) liblinux_a_SOURCES = \ diff --git a/linux/src/include/linux/compiler-gcc8.h b/linux/src/include/linux/compiler-gcc8.h new file mode 100644 index 00000000..d9fba09e --- /dev/null +++ b/linux/src/include/linux/compiler-gcc8.h @@ -0,0 +1,67 @@ +#ifndef __LINUX_COMPILER_H +#error "Please don't include <linux/compiler-gcc8.h> directly, include <linux/compiler.h> instead." +#endif + +#define __used __attribute__((__used__)) +#define __must_check __attribute__((warn_unused_result)) +#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) + +/* Mark functions as cold. gcc will assume any path leading to a call + to them will be unlikely. This means a lot of manual unlikely()s + are unnecessary now for any paths leading to the usual suspects + like BUG(), printk(), panic() etc. [but let's keep them for now for + older compilers] + + Early snapshots of gcc 4.3 don't support this and we can't detect this + in the preprocessor, but we can live with this because they're unreleased. + Maketime probing would be overkill here. + + gcc also has a __attribute__((__hot__)) to move hot functions into + a special section, but I don't see any sense in this right now in + the kernel context */ +#define __cold __attribute__((__cold__)) + +#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) + +#ifndef __CHECKER__ +# define __compiletime_warning(message) __attribute__((warning(message))) +# define __compiletime_error(message) __attribute__((error(message))) +#endif /* __CHECKER__ */ + +/* + * Mark a position in code as unreachable. This can be used to + * suppress control flow warnings after asm blocks that transfer + * control elsewhere. + * + * Early snapshots of gcc 4.5 don't support this and we can't detect + * this in the preprocessor, but we can live with this because they're + * unreleased. Really, we need to have autoconf for the kernel. + */ +#define unreachable() __builtin_unreachable() + +/* Mark a function definition as prohibited from being cloned. */ +#define __noclone __attribute__((__noclone__)) + +/* + * Tell the optimizer that something else uses this function or variable. + */ +#define __visible __attribute__((externally_visible)) + +/* + * GCC 'asm goto' miscompiles certain code sequences: + * + * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 + * + * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. + * + * (asm goto is automatically volatile - the naming reflects this.) + */ +#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) + +#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP +#define __HAVE_BUILTIN_BSWAP32__ +#define __HAVE_BUILTIN_BSWAP64__ +#define __HAVE_BUILTIN_BSWAP16__ +#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ + +#define KASAN_ABI_VERSION 4 |