bug#31380: grub fails to build on i686-linux

[Mark H Weaver]

retitle 31380 grub fails to build on i686-linux
severity 31380 serious
thanks

Mark H Weaver <address@hidden> writes:
> On the 'core-updates' branch, both 'grub' and 'grub-efi' fail to build
> on i686-linux.  See below for the relevant excerpt from the build log
> of 'grub-efi', but the error is the same for both.

core-updates has since been merged to master, so this is now a serious
problem for i686 users.  It prevents building any system, and therefore
prevents i686 users from applying security updates.

> gcc -DHAVE_CONFIG_H -I. -I..  -Wall -W  -DGRUB_MACHINE_EFI=1 
> -DGRUB_MACHINE=I386_EFI -m32 -nostdinc -isystem 
> /gnu/store/w55k6qc17s6nf7rv4agap9lsas4hb50l-gcc-5.5.0-lib/lib/gcc/i686-unknown-linux-gnu/5.5.0/include
>  -I../include -I../include -DGRUB_FILE=\"lib/i386/relocator.c\" -I. -I. -I.. 
> -I.. -I../include -I../include -I../grub-core/lib/libgcrypt-grub/src/    
> -D_FILE_OFFSET_BITS=64 -Os -Wall -W -Wshadow -Wpointer-arith -Wundef 
> -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization 
> -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security 
> -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain 
> -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses 
> -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs 
> -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label 
> -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings 
> -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls 
> -Wmissing-prototypes -Wmissing-declarations  -Wextra -Wattributes 
> -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch 
> -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast 
> -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign 
> -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 
> -march=i386 -m32 -falign-jumps=1 -falign-loops=1 -falign-functions=1 
> -freg-struct-return -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow 
> -msoft-float -fno-dwarf2-cfi-asm -mno-stack-arg-probe 
> -fno-asynchronous-unwind-tables -fno-unwind-tables -Qn -fno-stack-protector 
> -Wtrampolines -Werror   -ffreestanding   -MT 
> lib/i386/relocator_module-relocator.o -MD -MP -MF 
> lib/i386/.deps-core/relocator_module-relocator.Tpo -c -o 
> lib/i386/relocator_module-relocator.o `test -f 'lib/i386/relocator.c' || echo 
> './'`lib/i386/relocator.c
> lib/i386/relocator64.S: Assembler messages:
> lib/i386/relocator64.S:66: Error: unknown pseudo-op: `.code64'
> lib/i386/relocator64.S:74: Error: bad register name `%rax'
> lib/i386/relocator64.S:88: Error: bad register name `%rsp'
> lib/i386/relocator64.S:98: Error: bad register name `%rax'
> lib/i386/relocator64.S:132: Error: bad register name `%rip)'

I looked into this, and the problem is that our 'binutils' package on
i686-linux is not configured to support 64-bit instructions.

Here's a proposed patch that I hope will fix the problem, although I'm
unable to easily test it because I no longer use binary substitutes, and
I have not yet built the core packages for i686-linux.

However, I've applied this patch to my x86_64 system, and verified that
it does not cause any problems there.

Would someone be willing to test it and report back?

       Mark

>From 6fb0495569846b6399583a6c32ee341dde2e1785 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <address@hidden>
Date: Mon, 11 Jun 2018 19:21:39 -0400
Subject: [PATCH] UNTESTED: gnu: grub: Fix build on 32-bit x86.

---
 gnu/packages/bootloaders.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index a86c73731..8c8588973 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -61,7 +61,8 @@
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (srfi srfi-1)
-  #:use-module (srfi srfi-26))
+  #:use-module (srfi srfi-26)
+  #:use-module (ice-9 regex))
 
 (define unifont
   ;; GNU Unifont, <http://gnu.org/s/unifont>.
@@ -144,6 +145,19 @@
        ("texinfo" ,texinfo)
        ("help2man" ,help2man)
 
+       ;; FIXME: When building GRUB 2.02 on 32-bit x86, we need a binutils
+       ;; capable of assembling 64-bit instructions.  However, our default
+       ;; binutils on 32-bit x86 is not 64-bit capable.
+       ,@(if (string-match "^i[3456]86-" (%current-system))
+             `(("binutils"
+                ,(package/inherit
+                  binutils
+                  (arguments
+                   (substitute-keyword-arguments (package-arguments binutils)
+                     ((#:configure-flags flags ''())
+                      `(cons "--enable-64-bit-bfd" ,flags)))))))
+             '())
+
        ;; Dependencies for the test suite.  The "real" QEMU is needed here,
        ;; because several targets are used.
        ("parted" ,parted)
-- 
2.17.1