[PATCH 1/2] build: Move TARGET_* assignments earlier

[PATCH 1/2] build: Move TARGET_* assignments earlier

[Matt Turner]

From: Mike Gilbert <floppym@gentoo.org>

On a 32-bit SPARC userland, configure fails to compile assembly and the
build fails:

    checking for options to compile assembly... configure: error: could not compile assembly

config.log shows:

    asm-tests/sparc64.S: Assembler messages:
    asm-tests/sparc64.S:5: Error: Architecture mismatch on "lduw [%o4+4],%o4".
    asm-tests/sparc64.S:5: (Requires v9|v9a|v9b|v9c|v9d|v9e|v9v|v9m|m8; requested architecture is sparclite.)
    asm-tests/sparc64.S:7: Error: Architecture mismatch on "stw %o5,[%o3]".
    asm-tests/sparc64.S:7: (Requires v9|v9a|v9b|v9c|v9d|v9e|v9v|v9m|m8; requested architecture is sparclite.)
    asm-tests/sparc64.S:8: Error: Architecture mismatch on "bne,pt %icc,1b ,pt %icc,1b".
    asm-tests/sparc64.S:8: (Requires v9|v9a|v9b|v9c|v9d|v9e|v9v|v9m|m8; requested architecture is sparclite.)

Simply moving these blocks earlier in configure.ac is sufficient to
ensure that the tests are executed with the appropriate flags
(specifically -m64 in this case).

Bug: https://bugs.gentoo.org/667850
---
 configure.ac | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index e07ba4b56..b5e31c787 100644
--- a/configure.ac
+++ b/configure.ac
@@ -562,6 +562,24 @@ CPPFLAGS="$TARGET_CPPFLAGS"
 LDFLAGS="$TARGET_LDFLAGS"
 LIBS=""
 
+if test "x$target_m32" = x1; then
+  # Force 32-bit mode.
+  TARGET_CFLAGS="$TARGET_CFLAGS -m32"
+  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m32"
+  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m32"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
+  TARGET_MODULE_FORMAT="elf32"
+fi
+
+if test "x$target_m64" = x1; then
+  # Force 64-bit mode.
+  TARGET_CFLAGS="$TARGET_CFLAGS -m64"
+  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m64"
+  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m64"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
+  TARGET_MODULE_FORMAT="elf64"
+fi
+
 # debug flags.
 TARGET_CFLAGS="$TARGET_CFLAGS $WARN_FLAGS -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations"
 TARGET_CCASFLAGS="$TARGET_CCASFLAGS -g"
@@ -750,24 +768,6 @@ if test "x$target_cpu" = xi386 && test "x$platform" != xemu; then
   TARGET_CFLAGS="$TARGET_CFLAGS -march=i386"
 fi
 
-if test "x$target_m32" = x1; then
-  # Force 32-bit mode.
-  TARGET_CFLAGS="$TARGET_CFLAGS -m32"
-  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m32"
-  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m32"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
-  TARGET_MODULE_FORMAT="elf32"
-fi
-
-if test "x$target_m64" = x1; then
-  # Force 64-bit mode.
-  TARGET_CFLAGS="$TARGET_CFLAGS -m64"
-  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m64"
-  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m64"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
-  TARGET_MODULE_FORMAT="elf64"
-fi
-
 if test "x$grub_cv_cc_target_clang" = xno && test "x$target_cpu" = xi386 && test "x$platform" != xemu && test "x$platform" != xefi; then
    TARGET_CFLAGS="$TARGET_CFLAGS -mrtd -mregparm=3"
 fi
-- 
2.24.1

[PATCH 2/2] build: Disable PIE in TARGET_CCASFLAGS if needed

[Matt Turner]

From: Mike Gilbert <floppym@gentoo.org>

PIE should be disabled in assembly sources as well, or else grub will
fail to boot.

Bug: https://bugs.gentoo.org/667852
---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index b5e31c787..e2c783652 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1263,6 +1263,7 @@ grub_CHECK_LINK_PIE
 # `-fPIE' or '-fpie' and '-pie' in the default specs.
 if [ x"$pie_possible" = xyes ]; then
   TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE -fno-pie"
+  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -fno-PIE -fno-pie"
 fi
 
 if [ x"$link_nopie_needed" = xyes ] || [ x"$pie_possible" = xyes ]; then
-- 
2.24.1

Re: [PATCH 2/2] build: Disable PIE in TARGET_CCASFLAGS if needed

[John Paul Adrian Glaubitz]

Hi Mike!

On 2/20/20 7:51 AM, Matt Turner wrote:
> PIE should be disabled in assembly sources as well, or else grub will
> fail to boot.

Indeed. We have always passed -fno-PIE on Debian/sparc64 in the debian/rules
file to TARGET_CCASFLAGS, but it makes more sense to fix the issue in the
configure.ac.

> Bug: https://bugs.gentoo.org/667852
> ---
>  configure.ac | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/configure.ac b/configure.ac
> index b5e31c787..e2c783652 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1263,6 +1263,7 @@ grub_CHECK_LINK_PIE
>  # `-fPIE' or '-fpie' and '-pie' in the default specs.
>  if [ x"$pie_possible" = xyes ]; then
>    TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE -fno-pie"
> +  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -fno-PIE -fno-pie"
>  fi
>  
>  if [ x"$link_nopie_needed" = xyes ] || [ x"$pie_possible" = xyes ]; then

I have not verified yet that fix yet but it makes sense for
the aforementioned reasons.

Thanks for fixing this.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@debian.org
`. `'   Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Re: [PATCH 2/2] build: Disable PIE in TARGET_CCASFLAGS if needed

[John Paul Adrian Glaubitz]

On 2/20/20 7:51 AM, Matt Turner wrote:
> From: Mike Gilbert <floppym@gentoo.org>
> 
> PIE should be disabled in assembly sources as well, or else grub will
> fail to boot.
> 
> Bug: https://bugs.gentoo.org/667852
> ---
>  configure.ac | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/configure.ac b/configure.ac
> index b5e31c787..e2c783652 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1263,6 +1263,7 @@ grub_CHECK_LINK_PIE
>  # `-fPIE' or '-fpie' and '-pie' in the default specs.
>  if [ x"$pie_possible" = xyes ]; then
>    TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE -fno-pie"
> +  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -fno-PIE -fno-pie"
>  fi
>  
>  if [ x"$link_nopie_needed" = xyes ] || [ x"$pie_possible" = xyes ]; then
> 

This fixes the issue for me on sparc64 (Debian unstable).

Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

Thanks,
Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@debian.org
`. `'   Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Re: [PATCH 2/2] build: Disable PIE in TARGET_CCASFLAGS if needed

[Paul Menzel]

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

Dear Matt,


Thank you for upstreaming the patches.

On 2020-02-20 07:51, Matt Turner wrote:
> From: Mike Gilbert <floppym@gentoo.org>
> 
> PIE should be disabled in assembly sources as well, or else grub will
> fail to boot.

Could you please extend this with the list, on what architectures it
fails to boot? It seems to work on x86, doesn’t it?

> Bug: https://bugs.gentoo.org/667852
> ---
>  configure.ac | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/configure.ac b/configure.ac
> index b5e31c787..e2c783652 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1263,6 +1263,7 @@ grub_CHECK_LINK_PIE
>  # `-fPIE' or '-fpie' and '-pie' in the default specs.
>  if [ x"$pie_possible" = xyes ]; then
>    TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE -fno-pie"
> +  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -fno-PIE -fno-pie"
>  fi
>  
>  if [ x"$link_nopie_needed" = xyes ] || [ x"$pie_possible" = xyes ]; then


Kind regards,

Paul


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 5174 bytes --]

Re: [PATCH 2/2] build: Disable PIE in TARGET_CCASFLAGS if needed

[John Paul Adrian Glaubitz]

On 2/25/20 11:58 AM, Paul Menzel wrote:
>> PIE should be disabled in assembly sources as well, or else grub will
>> fail to boot.
> 
> Could you please extend this with the list, on what architectures it
> fails to boot? It seems to work on x86, doesn’t it?
This issue has been observed on SPARC only, correct. But it generally sense
to include the no-PIE/no-pie flags in ASFLAGS as well.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@debian.org
`. `'   Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

Re: [PATCH 1/2] build: Move TARGET_* assignments earlier

[Daniel Kiper]

Adding John and Eric...

On Wed, Feb 19, 2020 at 10:51:41PM -0800, Matt Turner wrote:
> From: Mike Gilbert <floppym@gentoo.org>
>
> On a 32-bit SPARC userland, configure fails to compile assembly and the
> build fails:
>
>     checking for options to compile assembly... configure: error: could not compile assembly
>
> config.log shows:
>
>     asm-tests/sparc64.S: Assembler messages:
>     asm-tests/sparc64.S:5: Error: Architecture mismatch on "lduw [%o4+4],%o4".
>     asm-tests/sparc64.S:5: (Requires v9|v9a|v9b|v9c|v9d|v9e|v9v|v9m|m8; requested architecture is sparclite.)
>     asm-tests/sparc64.S:7: Error: Architecture mismatch on "stw %o5,[%o3]".
>     asm-tests/sparc64.S:7: (Requires v9|v9a|v9b|v9c|v9d|v9e|v9v|v9m|m8; requested architecture is sparclite.)
>     asm-tests/sparc64.S:8: Error: Architecture mismatch on "bne,pt %icc,1b ,pt %icc,1b".
>     asm-tests/sparc64.S:8: (Requires v9|v9a|v9b|v9c|v9d|v9e|v9v|v9m|m8; requested architecture is sparclite.)
>
> Simply moving these blocks earlier in configure.ac is sufficient to
> ensure that the tests are executed with the appropriate flags
> (specifically -m64 in this case).
>
> Bug: https://bugs.gentoo.org/667850

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

If there are no objections I will push these patches next week.

Daniel

> ---
>  configure.ac | 36 ++++++++++++++++++------------------
>  1 file changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index e07ba4b56..b5e31c787 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -562,6 +562,24 @@ CPPFLAGS="$TARGET_CPPFLAGS"
>  LDFLAGS="$TARGET_LDFLAGS"
>  LIBS=""
>
> +if test "x$target_m32" = x1; then
> +  # Force 32-bit mode.
> +  TARGET_CFLAGS="$TARGET_CFLAGS -m32"
> +  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m32"
> +  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m32"
> +  TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
> +  TARGET_MODULE_FORMAT="elf32"
> +fi
> +
> +if test "x$target_m64" = x1; then
> +  # Force 64-bit mode.
> +  TARGET_CFLAGS="$TARGET_CFLAGS -m64"
> +  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m64"
> +  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m64"
> +  TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
> +  TARGET_MODULE_FORMAT="elf64"
> +fi
> +
>  # debug flags.
>  TARGET_CFLAGS="$TARGET_CFLAGS $WARN_FLAGS -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations"
>  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -g"
> @@ -750,24 +768,6 @@ if test "x$target_cpu" = xi386 && test "x$platform" != xemu; then
>    TARGET_CFLAGS="$TARGET_CFLAGS -march=i386"
>  fi
>
> -if test "x$target_m32" = x1; then
> -  # Force 32-bit mode.
> -  TARGET_CFLAGS="$TARGET_CFLAGS -m32"
> -  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m32"
> -  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m32"
> -  TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
> -  TARGET_MODULE_FORMAT="elf32"
> -fi
> -
> -if test "x$target_m64" = x1; then
> -  # Force 64-bit mode.
> -  TARGET_CFLAGS="$TARGET_CFLAGS -m64"
> -  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m64"
> -  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m64"
> -  TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
> -  TARGET_MODULE_FORMAT="elf64"
> -fi
> -
>  if test "x$grub_cv_cc_target_clang" = xno && test "x$target_cpu" = xi386 && test "x$platform" != xemu && test "x$platform" != xefi; then
>     TARGET_CFLAGS="$TARGET_CFLAGS -mrtd -mregparm=3"
>  fi
> --
> 2.24.1

Re: [PATCH 1/2] build: Move TARGET_* assignments earlier

[John Paul Adrian Glaubitz]

On 2/20/20 7:51 AM, Matt Turner wrote:
> From: Mike Gilbert <floppym@gentoo.org>
> 
> On a 32-bit SPARC userland, configure fails to compile assembly and the
> build fails:
> 
>     checking for options to compile assembly... configure: error: could not compile assembly
> 
> config.log shows:
> 
>     asm-tests/sparc64.S: Assembler messages:
>     asm-tests/sparc64.S:5: Error: Architecture mismatch on "lduw [%o4+4],%o4".
>     asm-tests/sparc64.S:5: (Requires v9|v9a|v9b|v9c|v9d|v9e|v9v|v9m|m8; requested architecture is sparclite.)
>     asm-tests/sparc64.S:7: Error: Architecture mismatch on "stw %o5,[%o3]".
>     asm-tests/sparc64.S:7: (Requires v9|v9a|v9b|v9c|v9d|v9e|v9v|v9m|m8; requested architecture is sparclite.)
>     asm-tests/sparc64.S:8: Error: Architecture mismatch on "bne,pt %icc,1b ,pt %icc,1b".
>     asm-tests/sparc64.S:8: (Requires v9|v9a|v9b|v9c|v9d|v9e|v9v|v9m|m8; requested architecture is sparclite.)
> 
> Simply moving these blocks earlier in configure.ac is sufficient to
> ensure that the tests are executed with the appropriate flags
> (specifically -m64 in this case).
> 
> Bug: https://bugs.gentoo.org/667850
> ---
>  configure.ac | 36 ++++++++++++++++++------------------
>  1 file changed, 18 insertions(+), 18 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index e07ba4b56..b5e31c787 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -562,6 +562,24 @@ CPPFLAGS="$TARGET_CPPFLAGS"
>  LDFLAGS="$TARGET_LDFLAGS"
>  LIBS=""
>  
> +if test "x$target_m32" = x1; then
> +  # Force 32-bit mode.
> +  TARGET_CFLAGS="$TARGET_CFLAGS -m32"
> +  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m32"
> +  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m32"
> +  TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
> +  TARGET_MODULE_FORMAT="elf32"
> +fi
> +
> +if test "x$target_m64" = x1; then
> +  # Force 64-bit mode.
> +  TARGET_CFLAGS="$TARGET_CFLAGS -m64"
> +  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m64"
> +  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m64"
> +  TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
> +  TARGET_MODULE_FORMAT="elf64"
> +fi
> +
>  # debug flags.
>  TARGET_CFLAGS="$TARGET_CFLAGS $WARN_FLAGS -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations"
>  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -g"
> @@ -750,24 +768,6 @@ if test "x$target_cpu" = xi386 && test "x$platform" != xemu; then
>    TARGET_CFLAGS="$TARGET_CFLAGS -march=i386"
>  fi
>  
> -if test "x$target_m32" = x1; then
> -  # Force 32-bit mode.
> -  TARGET_CFLAGS="$TARGET_CFLAGS -m32"
> -  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m32"
> -  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m32"
> -  TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
> -  TARGET_MODULE_FORMAT="elf32"
> -fi
> -
> -if test "x$target_m64" = x1; then
> -  # Force 64-bit mode.
> -  TARGET_CFLAGS="$TARGET_CFLAGS -m64"
> -  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m64"
> -  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -m64"
> -  TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
> -  TARGET_MODULE_FORMAT="elf64"
> -fi
> -
>  if test "x$grub_cv_cc_target_clang" = xno && test "x$target_cpu" = xi386 && test "x$platform" != xemu && test "x$platform" != xefi; then
>     TARGET_CFLAGS="$TARGET_CFLAGS -mrtd -mregparm=3"
>  fi
> 

While I cannot say whether this fixes the issue reported as we are building grub with
a 64-bit SPARC userland, I can confirm that these changes don't break the build on
sparc64.

Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@debian.org
`. `'   Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913