]> git.ipfire.org Git - thirdparty/grub.git/commit
lib/i386/relocator64: Build fixes for i386
authorJan (janneke) Nieuwenhuizen <janneke@gnu.org>
Wed, 26 May 2021 18:18:24 +0000 (20:18 +0200)
committerDaniel Kiper <daniel.kiper@oracle.com>
Tue, 1 Jun 2021 15:20:20 +0000 (17:20 +0200)
commit80948f532dac7aceecb5267931f3bfa0bae102e9
treecb05950cfbd9f5ff64bcfe040d811ffb6abe018e
parent777276063e2ec146d5bd0e379717c199967c65ed
lib/i386/relocator64: Build fixes for i386

This fixes cross-compiling to x86 (e.g., the Hurd) from x86-linux of

    grub-core/lib/i386/relocator64.S

This file has six sections that only build with a 64-bit assembler,
yet only the first two sections had support for a 32-bit assembler.
This patch completes this for the remaining sections.

To reproduce, update the GRUB source description in your local Guix
archive and run

   ./pre-inst-env guix build --system=i686-linux --target=i586-pc-gnu grub

or install an x86 cross-build environment on x86-linux (32-bit!) and
configure to cross build and make, e.g., do something like

    ./configure \
       CC_FOR_BUILD=gcc \
       --build=i686-unknown-linux-gnu \
       --host=i586-pc-gnu
    make

Additionally, remove a line with redundant spaces.

Signed-off-by: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
grub-core/lib/i386/relocator64.S