[PATCH 0/2] configure: Remove -malign-* and fix Clang 14 breakage

[PATCH 0/2] configure: Remove -malign-* and fix Clang 14 breakage

[Fangrui Song]

This replaces
https://lists.gnu.org/archive/html/grub-devel/2021-08/threads.html
("[PATCH v2] configure: Check -falign-jumps=1 -falign-functions=1 beside -")

Fangrui Song (2):
  configure: Remove obsoleted -malign-{jumps,loops,functions}
  configure: Check -falign-jumps=1 -falign-functions=1 beside
    -falign-loops=1

 configure.ac | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

-- 
2.33.0.rc2.250.ged5fa647cd-goog

[PATCH 1/2] configure: Remove obsoleted -malign-{jumps, loops, functions}

[Fangrui Song]

GCC warns `cc1: warning: ‘-malign-loops’ is obsolete, use ‘-falign-loops’`.
Clang silently ignores -malign-{jumps,loops,functions}.

The preferred -falign-* forms have been supported since GCC 3.2, so just
remove -malign-{jumps,loops,functions}.

Signed-off-by: Fangrui Song <maskray@google.com>
---
 configure.ac | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index bee28dbeb..9a12151bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -805,17 +805,8 @@ if test "x$target_cpu" = xi386; then
 	[grub_cv_cc_falign_loop=no])
   ])
 
-  AC_CACHE_CHECK([whether -malign-loops works], [grub_cv_cc_malign_loop], [
-    CFLAGS="$TARGET_CFLAGS -malign-loops=1 -Werror"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-        [grub_cv_cc_malign_loop=yes],
-	[grub_cv_cc_malign_loop=no])
-  ])
-
   if test "x$grub_cv_cc_falign_loop" = xyes; then
     TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"
-  elif test "x$grub_cv_cc_malign_loop" = xyes; then
-    TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1"
   fi
 fi
 
-- 
2.33.0.rc2.250.ged5fa647cd-goog

Re: [PATCH 1/2] configure: Remove obsoleted -malign-{jumps, loops, functions}

[Paul Menzel]

Dear Fāng-ruì,


Am 24.08.21 um 08:18 schrieb Fangrui Song via Grub-devel:
> GCC warns `cc1: warning: ‘-malign-loops’ is obsolete, use ‘-falign-loops’`.
> Clang silently ignores -malign-{jumps,loops,functions}.
> 
> The preferred -falign-* forms have been supported since GCC 3.2, so just
> remove -malign-{jumps,loops,functions}.

In `INSTALL` under *The Requirements* at least GCC 5.1 is required.

> * GCC 5.1.0 or later
>   Experimental support for clang 3.8.0 or later (results in much bigger binaries)
>   for i386, x86_64, arm (including thumb), arm64, mips(el), powerpc, sparc64

So, this works.

> Signed-off-by: Fangrui Song <maskray@google.com>
> ---
>   configure.ac | 9 ---------
>   1 file changed, 9 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index bee28dbeb..9a12151bd 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -805,17 +805,8 @@ if test "x$target_cpu" = xi386; then
>   	[grub_cv_cc_falign_loop=no])
>     ])
>   
> -  AC_CACHE_CHECK([whether -malign-loops works], [grub_cv_cc_malign_loop], [
> -    CFLAGS="$TARGET_CFLAGS -malign-loops=1 -Werror"
> -    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
> -        [grub_cv_cc_malign_loop=yes],
> -	[grub_cv_cc_malign_loop=no])
> -  ])
> -
>     if test "x$grub_cv_cc_falign_loop" = xyes; then
>       TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"
> -  elif test "x$grub_cv_cc_malign_loop" = xyes; then
> -    TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1"
>     fi
>   fi
>   

Acked-by: Paul Menzel <pmenzel@molgen.mpg.de>


Kind regards,

Paul

Re: [PATCH 1/2] configure: Remove obsoleted -malign-{jumps, loops, functions}

[Daniel Kiper]

On Tue, Aug 24, 2021 at 08:24:14AM +0200, Paul Menzel wrote:
> Dear Fāng-ruì,
>
> Am 24.08.21 um 08:18 schrieb Fangrui Song via Grub-devel:
> > GCC warns `cc1: warning: ‘-malign-loops’ is obsolete, use ‘-falign-loops’`.
> > Clang silently ignores -malign-{jumps,loops,functions}.
> >
> > The preferred -falign-* forms have been supported since GCC 3.2, so just
> > remove -malign-{jumps,loops,functions}.
>
> In `INSTALL` under *The Requirements* at least GCC 5.1 is required.
>
> > * GCC 5.1.0 or later
> >   Experimental support for clang 3.8.0 or later (results in much bigger binaries)
> >   for i386, x86_64, arm (including thumb), arm64, mips(el), powerpc, sparc64
>
> So, this works.
>
> > Signed-off-by: Fangrui Song <maskray@google.com>
> > ---
> >   configure.ac | 9 ---------
> >   1 file changed, 9 deletions(-)
> >
> > diff --git a/configure.ac b/configure.ac
> > index bee28dbeb..9a12151bd 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -805,17 +805,8 @@ if test "x$target_cpu" = xi386; then
> >   	[grub_cv_cc_falign_loop=no])
> >     ])
> > -  AC_CACHE_CHECK([whether -malign-loops works], [grub_cv_cc_malign_loop], [
> > -    CFLAGS="$TARGET_CFLAGS -malign-loops=1 -Werror"
> > -    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
> > -        [grub_cv_cc_malign_loop=yes],
> > -	[grub_cv_cc_malign_loop=no])
> > -  ])
> > -
> >     if test "x$grub_cv_cc_falign_loop" = xyes; then
> >       TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"
> > -  elif test "x$grub_cv_cc_malign_loop" = xyes; then
> > -    TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1"
> >     fi
> >   fi
>
> Acked-by: Paul Menzel <pmenzel@molgen.mpg.de>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel

[PATCH 2/2] configure: Check -falign-jumps=1 -falign-functions=1 beside -falign-loops=1

[Fangrui Song]

Clang does not support -falign-jumps and only recently gained support
for -falign-loops. Test all the alignment options to avoid passing
unrecognized options to Clang:

    clang-14: error: optimization flag '-falign-jumps=1' is not supported [-Werror,-Wignored-optimization-argument]

When compiled with older Clang, the alignment options are not added, so
just avoid the complexity for each option.

Signed-off-by: Fangrui Song <maskray@google.com>
---
 configure.ac | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9a12151bd..8625e6776 100644
--- a/configure.ac
+++ b/configure.ac
@@ -798,8 +798,9 @@ fi
 
 # Force no alignment to save space on i386.
 if test "x$target_cpu" = xi386; then
-  AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
-    CFLAGS="$TARGET_CFLAGS -falign-loops=1 -Werror"
+  AC_CACHE_CHECK([whether -falign-jumps=1 -falign-loops=1 -falign-functions=1 works],
+    [grub_cv_cc_falign_loop], [
+    CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1 -Werror"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
         [grub_cv_cc_falign_loop=yes],
 	[grub_cv_cc_falign_loop=no])
-- 
2.33.0.rc2.250.ged5fa647cd-goog

Re: [PATCH 2/2] configure: Check -falign-jumps=1 -falign-functions=1 beside -falign-loops=1

[Paul Menzel]

Dear Fāng-ruì,


Am 24.08.21 um 08:18 schrieb Fangrui Song via Grub-devel:
> Clang does not support -falign-jumps and only recently gained support
> for -falign-loops. Test all the alignment options to avoid passing
> unrecognized options to Clang:
> 
>      clang-14: error: optimization flag '-falign-jumps=1' is not supported [-Werror,-Wignored-optimization-argument]
> 
> When compiled with older Clang, the alignment options are not added, so
> just avoid the complexity for each option.
> 
> Signed-off-by: Fangrui Song <maskray@google.com>
> ---
>   configure.ac | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 9a12151bd..8625e6776 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -798,8 +798,9 @@ fi
>   
>   # Force no alignment to save space on i386.
>   if test "x$target_cpu" = xi386; then
> -  AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
> -    CFLAGS="$TARGET_CFLAGS -falign-loops=1 -Werror"
> +  AC_CACHE_CHECK([whether -falign-jumps=1 -falign-loops=1 -falign-functions=1 works],
> +    [grub_cv_cc_falign_loop], [
> +    CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1 -Werror"
>       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
>           [grub_cv_cc_falign_loop=yes],
>   	[grub_cv_cc_falign_loop=no])
> 

Acked-by: Paul Menzel <pmenzel@molgen.mpg.de>


Kind regards,

Paul

Re: [PATCH 2/2] configure: Check -falign-jumps=1 -falign-functions=1 beside -falign-loops=1

[Daniel Kiper]

On Mon, Aug 23, 2021 at 11:18:38PM -0700, Fangrui Song wrote:
> Clang does not support -falign-jumps and only recently gained support
> for -falign-loops. Test all the alignment options to avoid passing
> unrecognized options to Clang:
>
>     clang-14: error: optimization flag '-falign-jumps=1' is not supported [-Werror,-Wignored-optimization-argument]
>
> When compiled with older Clang, the alignment options are not added, so
> just avoid the complexity for each option.
>
> Signed-off-by: Fangrui Song <maskray@google.com>
> ---
>  configure.ac | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 9a12151bd..8625e6776 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -798,8 +798,9 @@ fi
>
>  # Force no alignment to save space on i386.
>  if test "x$target_cpu" = xi386; then
> -  AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
> -    CFLAGS="$TARGET_CFLAGS -falign-loops=1 -Werror"
> +  AC_CACHE_CHECK([whether -falign-jumps=1 -falign-loops=1 -falign-functions=1 works],
> +    [grub_cv_cc_falign_loop], [
> +    CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1 -Werror"

I would prefer if you add a separate check for every -falign-* option.

Daniel

Re: [PATCH 2/2] configure: Check -falign-jumps=1 -falign-functions=1 beside -falign-loops=1

[Fangrui Song]

[-- Attachment #1: Type: text/plain, Size: 1414 bytes --]

On 2021-08-25, Daniel Kiper wrote:
>On Mon, Aug 23, 2021 at 11:18:38PM -0700, Fangrui Song wrote:
>> Clang does not support -falign-jumps and only recently gained support
>> for -falign-loops. Test all the alignment options to avoid passing
>> unrecognized options to Clang:
>>
>>     clang-14: error: optimization flag '-falign-jumps=1' is not supported [-Werror,-Wignored-optimization-argument]
>>
>> When compiled with older Clang, the alignment options are not added, so
>> just avoid the complexity for each option.
>>
>> Signed-off-by: Fangrui Song <maskray@google.com>
>> ---
>>  configure.ac | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 9a12151bd..8625e6776 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -798,8 +798,9 @@ fi
>>
>>  # Force no alignment to save space on i386.
>>  if test "x$target_cpu" = xi386; then
>> -  AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
>> -    CFLAGS="$TARGET_CFLAGS -falign-loops=1 -Werror"
>> +  AC_CACHE_CHECK([whether -falign-jumps=1 -falign-loops=1 -falign-functions=1 works],
>> +    [grub_cv_cc_falign_loop], [
>> +    CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1 -Werror"
>
>I would prefer if you add a separate check for every -falign-* option.
>
>Daniel

The attached patch checks both -falign-jumps=1 and -falign-loops=1

[-- Attachment #2: 0001-configure-Check-falign-jumps-1-beside-falign-loops-1.patch --]
[-- Type: text/x-diff, Size: 1916 bytes --]

From fbef8198d26babeb402b480d333a4a5212069afb Mon Sep 17 00:00:00 2001
From: Fangrui Song <maskray@google.com>
Date: Wed, 25 Aug 2021 09:28:46 -0700
Subject: [PATCH] configure: Check -falign-jumps=1 beside -falign-loops=1

Clang does not support -falign-jumps and only recently gained support
for -falign-loops. -falign-jumps=1 should be tested beside
-fliang-loops=1 to avoid passing unrecognized options to Clang:

    clang-14: error: optimization flag '-falign-jumps=1' is not supported [-Werror,-Wignored-optimization-argument]

-falign-functions=1 is supported by GCC 5.1.0/Clang 3.8.0, so just add
the option unconditionally.

Signed-off-by: Fangrui Song <maskray@google.com>
---
 configure.ac | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9a12151bd..91a6ef128 100644
--- a/configure.ac
+++ b/configure.ac
@@ -798,6 +798,8 @@ fi
 
 # Force no alignment to save space on i386.
 if test "x$target_cpu" = xi386; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -falign-functions=1"
+
   AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
     CFLAGS="$TARGET_CFLAGS -falign-loops=1 -Werror"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
@@ -806,7 +808,18 @@ if test "x$target_cpu" = xi386; then
   ])
 
   if test "x$grub_cv_cc_falign_loop" = xyes; then
-    TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"
+    TARGET_CFLAGS="$TARGET_CFLAGS -falign-loops=1"
+  fi
+
+  AC_CACHE_CHECK([whether -falign-jumps works], [grub_cv_cc_falign_jumps], [
+    CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -Werror"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+        [grub_cv_cc_falign_jumps=yes],
+	[grub_cv_cc_falign_jumps=no])
+  ])
+
+  if test "x$grub_cv_cc_falign_jumps" = xyes; then
+    TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1"
   fi
 fi
 
-- 
2.33.0.rc2.250.ged5fa647cd-goog

Re: [PATCH 2/2] configure: Check -falign-jumps=1 -falign-functions=1 beside -falign-loops=1

[Daniel Kiper]

On Wed, Aug 25, 2021 at 09:34:41AM -0700, Fangrui Song wrote:
> On 2021-08-25, Daniel Kiper wrote:
> > On Mon, Aug 23, 2021 at 11:18:38PM -0700, Fangrui Song wrote:
> > > Clang does not support -falign-jumps and only recently gained support
> > > for -falign-loops. Test all the alignment options to avoid passing
> > > unrecognized options to Clang:
> > >
> > >     clang-14: error: optimization flag '-falign-jumps=1' is not supported [-Werror,-Wignored-optimization-argument]
> > >
> > > When compiled with older Clang, the alignment options are not added, so
> > > just avoid the complexity for each option.
> > >
> > > Signed-off-by: Fangrui Song <maskray@google.com>
> > > ---
> > >  configure.ac | 5 +++--
> > >  1 file changed, 3 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/configure.ac b/configure.ac
> > > index 9a12151bd..8625e6776 100644
> > > --- a/configure.ac
> > > +++ b/configure.ac
> > > @@ -798,8 +798,9 @@ fi
> > >
> > >  # Force no alignment to save space on i386.
> > >  if test "x$target_cpu" = xi386; then
> > > -  AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
> > > -    CFLAGS="$TARGET_CFLAGS -falign-loops=1 -Werror"
> > > +  AC_CACHE_CHECK([whether -falign-jumps=1 -falign-loops=1 -falign-functions=1 works],
> > > +    [grub_cv_cc_falign_loop], [
> > > +    CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1 -Werror"
> >
> > I would prefer if you add a separate check for every -falign-* option.
> >
> > Daniel
>
> The attached patch checks both -falign-jumps=1 and -falign-loops=1

> From fbef8198d26babeb402b480d333a4a5212069afb Mon Sep 17 00:00:00 2001
> From: Fangrui Song <maskray@google.com>
> Date: Wed, 25 Aug 2021 09:28:46 -0700
> Subject: [PATCH] configure: Check -falign-jumps=1 beside -falign-loops=1
>
> Clang does not support -falign-jumps and only recently gained support
> for -falign-loops. -falign-jumps=1 should be tested beside
> -fliang-loops=1 to avoid passing unrecognized options to Clang:
>
>     clang-14: error: optimization flag '-falign-jumps=1' is not supported [-Werror,-Wignored-optimization-argument]
>
> -falign-functions=1 is supported by GCC 5.1.0/Clang 3.8.0, so just add
> the option unconditionally.
>
> Signed-off-by: Fangrui Song <maskray@google.com>
> ---
>  configure.ac | 15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index 9a12151bd..91a6ef128 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -798,6 +798,8 @@ fi
>
>  # Force no alignment to save space on i386.
>  if test "x$target_cpu" = xi386; then
> +  TARGET_CFLAGS="$TARGET_CFLAGS -falign-functions=1"
> +
>    AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
>      CFLAGS="$TARGET_CFLAGS -falign-loops=1 -Werror"
>      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
> @@ -806,7 +808,18 @@ if test "x$target_cpu" = xi386; then
>    ])
>
>    if test "x$grub_cv_cc_falign_loop" = xyes; then
> -    TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"
> +    TARGET_CFLAGS="$TARGET_CFLAGS -falign-loops=1"
> +  fi
> +
> +  AC_CACHE_CHECK([whether -falign-jumps works], [grub_cv_cc_falign_jumps], [
> +    CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -Werror"
> +    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
> +        [grub_cv_cc_falign_jumps=yes],
> +	[grub_cv_cc_falign_jumps=no])

It seems to me formatting is broken somehow here. It should be the same
like for -falign-loops detection.

Otherwise LGTM...

Please repost both patches using "git send-email" as v3.

You can add Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> and
Paul's Acked-by to the patches before posting. If there are no
objections I will merge them and other reviewed patches next week...

Daniel