[PATCH 1/3] sandbox: fix link error when UBSAN is selected without ASAN

Ahmad Fatoum a.fatoum at pengutronix.de
Thu Oct 15 05:00:54 EDT 2020


dc7f1fce6747 ("sandbox: fix SANDBOX_UNWIND dependency to be KASAN
only") already restricted ARCH_HAS_STACK_DUMP to be dependent
only on AddressSanitizer being available.

This change got lost by an erroneous merge conflict resolution in
39bdcdfb814a ("Merge branch 'for-next/misc' into master"). Fix it up.

Fixes: 39bdcdfb814a ("Merge branch 'for-next/misc' into master")
Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 arch/sandbox/Kconfig | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index bced81f25e9b..113b619fc35b 100644
--- a/arch/sandbox/Kconfig
+++ b/arch/sandbox/Kconfig
@@ -10,6 +10,7 @@ config SANDBOX
 	select BLOCK
 	select BLOCK_WRITE
 	select PARTITION_DISK
+	select ARCH_HAS_STACK_DUMP if ASAN
 	default y
 
 config ARCH_TEXT_BASE
@@ -21,12 +22,6 @@ config LINUX
 	default y
 	select GENERIC_FIND_NEXT_BIT
 
-config SANDBOX_UNWIND
-	bool
-	default y
-	select ARCH_HAS_STACK_DUMP
-	depends on UBSAN || ASAN
-
 config SANDBOX_REEXEC
 	prompt "exec(2) reset handler"
 	def_bool y
-- 
2.28.0




More information about the barebox mailing list