diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-09 11:04:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-09 11:04:16 -0700 |
| commit | 87ebc45d2d32936fb1c8242032eb0b9bcd058858 (patch) | |
| tree | d5f32252db7a56da284f22a2837ebfa13f78bbd7 /init | |
| parent | e4da01d8333e500e15a674d75885a9dfcfd31e77 (diff) | |
| parent | fc2266011accd5aeb8ebc335c381991f20e26e33 (diff) | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas:
- Ensure that the compiler and linker versions are aligned so that ld
doesn't complain about not understanding a .note.gnu.property section
(emitted when pointer authentication is enabled).
- Force -mbranch-protection=none when the feature is not enabled, in
case a compiler may choose a different default value.
- Remove CONFIG_DEBUG_ALIGN_RODATA. It was never in defconfig and
rarely enabled.
- Fix checking 16-bit Thumb-2 instructions checking mask in the
emulation of the SETEND instruction (it could match the bottom half
of a 32-bit Thumb-2 instruction).
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: armv8_deprecated: Fix undef_hook mask for thumb setend
arm64: remove CONFIG_DEBUG_ALIGN_RODATA feature
arm64: Always force a branch protection mode when the compiler has one
arm64: Kconfig: ptrauth: Add binutils version check to fix mismatch
init/kconfig: Add LD_VERSION Kconfig
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 574b7215aa6a..9e22ee8fbd75 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -16,6 +16,10 @@ config GCC_VERSION default $(shell,$(srctree)/scripts/gcc-version.sh $(CC)) if CC_IS_GCC default 0 +config LD_VERSION + int + default $(shell,$(LD) --version | $(srctree)/scripts/ld-version.sh) + config CC_IS_CLANG def_bool $(success,$(CC) --version | head -n 1 | grep -q clang) |