[RFC,v1,1/2] Makeconfig: Use one line per token

Message ID 20230711131105.19203-2-alx@kernel.org
State New
Headers
Series Use -fno-delete-null-pointer-checks to build glibc |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 fail Testing failed
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Testing passed

Commit Message

Alejandro Colomar July 11, 2023, 1:11 p.m. UTC
  After this change, patches will be more clear about what they change, as
they won't need to reflow lines.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
 Makeconfig | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
  

Comments

Adhemerval Zanella Netto July 11, 2023, 6:05 p.m. UTC | #1
On 11/07/23 10:11, Alejandro Colomar via Libc-alpha wrote:
> After this change, patches will be more clear about what they change, as
> they won't need to reflow lines.
> 
> Signed-off-by: Alejandro Colomar <alx@kernel.org>

I think this can be installed independently of the rest of the patchset.

> ---
>  Makeconfig | 17 ++++++++++++-----
>  1 file changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/Makeconfig b/Makeconfig
> index 77d7fd14df..369a596e79 100644
> --- a/Makeconfig
> +++ b/Makeconfig
> @@ -1043,11 +1043,18 @@ CPPFLAGS = $(config-extra-cppflags) $(CPPFLAGS-config) \
>  	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F))) \
>  	   -DTOP_NAMESPACE=glibc
>  
> -override CFLAGS	= -std=gnu11 -fgnu89-inline $(config-extra-cflags) \
> -		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
> -		  $(+extra-math-flags) $(+extra-time-flags) \
> -		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
> -		  $(CFLAGS-$(@F)) $(tls-model) \
> +override CFLAGS	= -std=gnu11 \

Maybe move '-std=gnu11' to next line as well.

> +		  -fgnu89-inline \
> +		  $(config-extra-cflags) \
> +		  $(filter-out %frame-pointer,$(+cflags)) \
> +		  $(+gccwarn-c) \
> +		  $(+extra-math-flags) \
> +		  $(+extra-time-flags) \
> +		  $(sysdep-CFLAGS) \
> +		  $(CFLAGS-$(suffix $@)) \
> +		  $(CFLAGS-$(<F)) \
> +		  $(CFLAGS-$(@F)) \
> +		  $(tls-model) \
>  		  $(foreach lib,$(libof-$(basename $(@F))) \
>  				$(libof-$(<F)) $(libof-$(@F)),$(CFLAGS-$(lib)))
>  # Use our copies of cstdlib and cmath.
  

Patch

diff --git a/Makeconfig b/Makeconfig
index 77d7fd14df..369a596e79 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1043,11 +1043,18 @@  CPPFLAGS = $(config-extra-cppflags) $(CPPFLAGS-config) \
 	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F))) \
 	   -DTOP_NAMESPACE=glibc
 
-override CFLAGS	= -std=gnu11 -fgnu89-inline $(config-extra-cflags) \
-		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
-		  $(+extra-math-flags) $(+extra-time-flags) \
-		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
-		  $(CFLAGS-$(@F)) $(tls-model) \
+override CFLAGS	= -std=gnu11 \
+		  -fgnu89-inline \
+		  $(config-extra-cflags) \
+		  $(filter-out %frame-pointer,$(+cflags)) \
+		  $(+gccwarn-c) \
+		  $(+extra-math-flags) \
+		  $(+extra-time-flags) \
+		  $(sysdep-CFLAGS) \
+		  $(CFLAGS-$(suffix $@)) \
+		  $(CFLAGS-$(<F)) \
+		  $(CFLAGS-$(@F)) \
+		  $(tls-model) \
 		  $(foreach lib,$(libof-$(basename $(@F))) \
 				$(libof-$(<F)) $(libof-$(@F)),$(CFLAGS-$(lib)))
 # Use our copies of cstdlib and cmath.