Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[linux-2.6-microblaze.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index fdca571..31380da 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1299,6 +1299,14 @@ config COMPAT_VDSO
          You must have a 32-bit build of glibc 2.22 or later for programs
          to seamlessly take advantage of this.
 
+config THUMB2_COMPAT_VDSO
+       bool "Compile the 32-bit vDSO for Thumb-2 mode" if EXPERT
+       depends on COMPAT_VDSO
+       default y
+       help
+         Compile the compat vDSO with '-mthumb -fomit-frame-pointer' if y,
+         otherwise with '-marm'.
+
 menuconfig ARMV8_DEPRECATED
        bool "Emulate deprecated/obsolete ARMv8 instructions"
        depends on SYSCTL
@@ -1740,8 +1748,9 @@ config ARM64_DEBUG_PRIORITY_MASKING
 endif
 
 config RELOCATABLE
-       bool
+       bool "Build a relocatable kernel image" if EXPERT
        select ARCH_HAS_RELR
+       default y
        help
          This builds the kernel as a Position Independent Executable (PIE),
          which retains all relocation metadata required to relocate the