kernel: bump 5.4 to 5.4.59

[openwrt/openwrt.git] / config / Config-build.in

diff --git a/config/Config-build.in b/config/Config-build.in
index 61a9265ad78d68b2c713191369049b46b3956e01..499f84690f5f7a0657b7fd61f71e59432d3638b5 100644 (file)
--- a/config/Config-build.in
+++ b/config/Config-build.in
@@ -103,6 +103,15 @@ menu "Global build settings"
                help
                  If enabled, buildinfo files will be stored in /etc/build.* of firmware.
 
+       config REPRODUCIBLE_DEBUG_INFO
+               bool "Make debug information reproducible"
+               default BUILDBOT
+               help
+                 This strips the local build path out of debug information. This has the
+                 advantage of making it reproducible, but the disadvantage of making local
+                 debugging using ./scripts/remote-gdb harder, since the debug data will
+                 no longer point to the full path on the build host.
+
        config COLLECT_KERNEL_DEBUG
                bool
                prompt "Collect kernel debug information"
@@ -249,7 +258,6 @@ menu "Global build settings"
 
        choice
                prompt "User space Stack-Smashing Protection"
-               depends on USE_MUSL
                default PKG_CC_STACKPROTECTOR_REGULAR
                help
                  Enable GCC Stack Smashing Protection (SSP) for userspace applications
@@ -257,18 +265,13 @@ menu "Global build settings"
                        bool "None"
                config PKG_CC_STACKPROTECTOR_REGULAR
                        bool "Regular"
-                       select GCC_LIBSSP if !USE_MUSL
-                       depends on KERNEL_CC_STACKPROTECTOR_REGULAR
                config PKG_CC_STACKPROTECTOR_STRONG
                        bool "Strong"
-                       select GCC_LIBSSP if !USE_MUSL
-                       depends on KERNEL_CC_STACKPROTECTOR_STRONG
        endchoice
 
        choice
                prompt "Kernel space Stack-Smashing Protection"
                default KERNEL_CC_STACKPROTECTOR_REGULAR
-               depends on USE_MUSL || !(x86_64 || i386)
                help
                  Enable GCC Stack-Smashing Protection (SSP) for the kernel
                config KERNEL_CC_STACKPROTECTOR_NONE