From d2f7902af0e5fc2affa5e0b9f38786f116ad8d58 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 25 Nov 2013 13:06:56 +0100 Subject: [PATCH] Make arm64 compileable with clang --- grub-core/kern/arm64/efi/startup.S | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/grub-core/kern/arm64/efi/startup.S b/grub-core/kern/arm64/efi/startup.S index 781c2b099..666a7ee3c 100644 --- a/grub-core/kern/arm64/efi/startup.S +++ b/grub-core/kern/arm64/efi/startup.S @@ -24,11 +24,16 @@ FUNCTION(_start) /* * EFI_SYSTEM_TABLE and EFI_HANDLE are passed in x1/x0. */ - ldr x2, =EXT_C(grub_efi_image_handle) + ldr x2, efi_image_handle_val str x0, [x2] - ldr x2, =EXT_C(grub_efi_system_table) + ldr x2, efi_system_table_val str x1, [x2] - ldr x2, =EXT_C(grub_main) + ldr x2, grub_main_val br x2 +grub_main_val: + .quad EXT_C(grub_main) +efi_system_table_val: + .quad EXT_C(grub_efi_system_table) +efi_image_handle_val: + .quad EXT_C(grub_efi_image_handle) - .end