[PATCH] ubsan: use a big if block in Kconfig

[PATCH] ubsan: use a big if block in Kconfig

[Uwe Kleine-König]

A side effect (which was the motivation for this change) is that the
config item CONFIG_UBSAN_ALIGNMENT doesn't appear in configurations that
have CONFIG_UBSAN disabled.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 lib/Kconfig.ubsan | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Kconfig.ubsan b/lib/Kconfig.ubsan
index 09f4a0ab8ab8..22958f48011e 100644
--- a/lib/Kconfig.ubsan
+++ b/lib/Kconfig.ubsan
@@ -9,9 +9,10 @@ config UBSAN
 	  Compile-time instrumentation is used to detect various undefined
 	  behaviours in runtime.
 
+if UBSAN
+
 config UBSAN_SANITIZE_ALL
 	bool "Enable instrumentation for all of barebox"
-	depends on UBSAN
 	depends on ARCH_HAS_UBSAN_SANITIZE_ALL
 	default y
 	help
@@ -23,7 +24,6 @@ config UBSAN_SANITIZE_ALL
 
 config UBSAN_NO_ALIGNMENT
 	bool "Disable checking of pointers alignment"
-	depends on UBSAN
 	default y if HAVE_EFFICIENT_UNALIGNED_ACCESS
 	help
 	  This option disables the check of unaligned memory accesses.
@@ -33,3 +33,5 @@ config UBSAN_NO_ALIGNMENT
 
 config UBSAN_ALIGNMENT
 	def_bool !UBSAN_NO_ALIGNMENT
+
+endif
-- 
2.24.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] ubsan: use a big if block in Kconfig

[Sascha Hauer]

On Wed, Jan 29, 2020 at 12:22:51PM +0100, Uwe Kleine-König wrote:
> A side effect (which was the motivation for this change) is that the
> config item CONFIG_UBSAN_ALIGNMENT doesn't appear in configurations that
> have CONFIG_UBSAN disabled.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  lib/Kconfig.ubsan | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/lib/Kconfig.ubsan b/lib/Kconfig.ubsan
> index 09f4a0ab8ab8..22958f48011e 100644
> --- a/lib/Kconfig.ubsan
> +++ b/lib/Kconfig.ubsan
> @@ -9,9 +9,10 @@ config UBSAN
>  	  Compile-time instrumentation is used to detect various undefined
>  	  behaviours in runtime.
>  
> +if UBSAN
> +
>  config UBSAN_SANITIZE_ALL
>  	bool "Enable instrumentation for all of barebox"
> -	depends on UBSAN
>  	depends on ARCH_HAS_UBSAN_SANITIZE_ALL
>  	default y
>  	help
> @@ -23,7 +24,6 @@ config UBSAN_SANITIZE_ALL
>  
>  config UBSAN_NO_ALIGNMENT
>  	bool "Disable checking of pointers alignment"
> -	depends on UBSAN
>  	default y if HAVE_EFFICIENT_UNALIGNED_ACCESS
>  	help
>  	  This option disables the check of unaligned memory accesses.
> @@ -33,3 +33,5 @@ config UBSAN_NO_ALIGNMENT
>  
>  config UBSAN_ALIGNMENT
>  	def_bool !UBSAN_NO_ALIGNMENT
> +
> +endif
> -- 
> 2.24.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox