diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-30 14:33:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-30 14:33:25 -0700 |
| commit | 44b6ed4cfab8474061707b60e35afaf2c92a9dc3 (patch) | |
| tree | 349754b4648afa7a16b588646ea0a5074cf7ceb9 /kernel | |
| parent | Merge tag 'for-5.14/drivers-2021-06-29' of git://git.kernel.dk/linux-block (diff) | |
| parent | qemu_fw_cfg: Make fw_cfg_rev_attr a proper kobj_attribute (diff) | |
| download | linux-dev-44b6ed4cfab8474061707b60e35afaf2c92a9dc3.tar.xz linux-dev-44b6ed4cfab8474061707b60e35afaf2c92a9dc3.zip | |
Merge tag 'clang-features-v5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull clang feature updates from Kees Cook:
- Add CC_HAS_NO_PROFILE_FN_ATTR in preparation for PGO support in the
face of the noinstr attribute, paving the way for PGO and fixing
GCOV. (Nick Desaulniers)
- x86_64 LTO coverage is expanded to 32-bit x86. (Nathan Chancellor)
- Small fixes to CFI. (Mark Rutland, Nathan Chancellor)
* tag 'clang-features-v5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
qemu_fw_cfg: Make fw_cfg_rev_attr a proper kobj_attribute
Kconfig: Introduce ARCH_WANTS_NO_INSTR and CC_HAS_NO_PROFILE_FN_ATTR
compiler_attributes.h: cleanups for GCC 4.9+
compiler_attributes.h: define __no_profile, add to noinstr
x86, lto: Enable Clang LTO for 32-bit as well
CFI: Move function_nocfi() into compiler.h
MAINTAINERS: Add Clang CFI section
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/gcov/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/gcov/Kconfig b/kernel/gcov/Kconfig index 58f87a3092f3..053447183ac5 100644 --- a/kernel/gcov/Kconfig +++ b/kernel/gcov/Kconfig @@ -5,6 +5,7 @@ config GCOV_KERNEL bool "Enable gcov-based kernel profiling" depends on DEBUG_FS depends on !CC_IS_CLANG || CLANG_VERSION >= 110000 + depends on !ARCH_WANTS_NO_INSTR || CC_HAS_NO_PROFILE_FN_ATTR select CONSTRUCTORS default n help |