From a00ff2e1b596f0d08d32b8ca9cefe8aca1212604 Mon Sep 17 00:00:00 2001 From: Emil Renner Berthing Date: Thu, 22 Apr 2021 09:33:51 +0200 Subject: [PATCH] boot/efi: compile on riscv64 This makes systemd-boot compile against the latest gnu-efi which just added support for riscv64. --- meson.build | 3 +++ src/boot/efi/meson.build | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index cc312b2de46..81db2d27ab7 100644 --- a/meson.build +++ b/meson.build @@ -1585,6 +1585,9 @@ if get_option('efi') elif efi_arch == 'aarch64' EFI_MACHINE_TYPE_NAME = 'aa64' gnu_efi_arch = 'aarch64' + elif efi_arch == 'riscv64' + EFI_MACHINE_TYPE_NAME = 'riscv64' + gnu_efi_arch = 'riscv64' else EFI_MACHINE_TYPE_NAME = '' gnu_efi_arch = '' diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build index 2a37b0a9ac6..574feedb98d 100644 --- a/src/boot/efi/meson.build +++ b/src/boot/efi/meson.build @@ -190,9 +190,9 @@ if have_gnu_efi '-znocombreloc', '-L', efi_libdir, efi_crt0] - if efi_arch == 'aarch64' or efi_arch == 'arm' - # Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary' - # instead, and add required symbols manually. + if efi_arch == 'aarch64' or efi_arch == 'arm' or efi_arch == 'riscv64' + # Aarch64, ARM32 and 64bit RISC-V don't have an EFI capable objcopy. + # Use 'binary' instead, and add required symbols manually. efi_ldflags += ['--defsym=EFI_SUBSYSTEM=0xa'] efi_format = ['-O', 'binary'] else -- 2.47.3