kconfig: unify cc-option and as-option

[platform/kernel/linux-starfive.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 7f9d384..6eb18f4 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1035,7 +1035,7 @@ config CC_HAVE_SHADOW_CALL_STACK
 
 config SECCOMP
        bool "Enable seccomp to safely compute untrusted bytecode"
-       ---help---
+       help
          This kernel feature is useful for number crunching applications
          that may need to compute untrusted bytecode during their
          execution. By using pipes or other transports made available to
@@ -1068,7 +1068,7 @@ config KEXEC
        depends on PM_SLEEP_SMP
        select KEXEC_CORE
        bool "kexec system call"
-       ---help---
+       help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot
          but it is independent of the system firmware.   And like a reboot
@@ -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
@@ -1556,7 +1564,7 @@ config CC_HAS_SIGN_RETURN_ADDRESS
        def_bool $(cc-option,-msign-return-address=all)
 
 config AS_HAS_PAC
-       def_bool $(as-option,-Wa$(comma)-march=armv8.3-a)
+       def_bool $(cc-option,-Wa$(comma)-march=armv8.3-a)
 
 config AS_HAS_CFI_NEGATE_RA_STATE
        def_bool $(as-instr,.cfi_startproc\n.cfi_negate_ra_state\n.cfi_endproc\n)
@@ -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