A recent fix that made appears to have broken the ability to create an
aarch64 boot image on a x86-based host.
This was due to an overzealous testing of the architecture when building
grub-mkimage and removing the code that build an Arm image when not
built on Arm.
Fixes: 8541f319 ("grub-mkimage: Only check aarch64 relocations when built for
aarch64")
Signed-off-by: Darren Kenny <darren.ke...@oracle.com>
Tested-by: Selva Ganesan <selvaganesa...@gmail.com>
---
util/grub-mkimagexx.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
index 1e29e255e8d2..a1927e786928 100644
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -1631,7 +1631,7 @@ translate_relocation_pe (struct translate_context *ctx,
}
break;
case EM_AARCH64:
-#if defined(MKIMAGE_ELF64) && defined(__arm__)
+#if defined(MKIMAGE_ELF64)
switch (ELF_R_TYPE (info))
{
case R_AARCH64_ABS64:
@@ -1667,8 +1667,7 @@ translate_relocation_pe (struct translate_context *ctx,
(unsigned int) ELF_R_TYPE (info));
break;
}
-#endif /* defined(MKIMAGE_ELF64) && define(__arm__) */
- break;
+#endif /* defined(MKIMAGE_ELF64) */
break;
#if defined(MKIMAGE_ELF32)
case EM_ARM:
--
2.27.0
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
