[src/trunk]: src/sys/external/bsd/gnu-efi/dist gnu-efi: riscv64 build fixes f...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c3c227723b89
branches:  trunk
changeset: 987528:c3c227723b89
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Sep 30 19:09:10 2021 +0000

description:
gnu-efi: riscv64 build fixes for NetBSD

diffstat:

 sys/external/bsd/gnu-efi/dist/gnuefi/reloc_riscv64.c |  9 ++++++++-
 sys/external/bsd/gnu-efi/dist/inc/riscv64/efibind.h  |  6 +++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r b123272338da -r c3c227723b89 sys/external/bsd/gnu-efi/dist/gnuefi/reloc_riscv64.c
--- a/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_riscv64.c      Thu Sep 30 19:02:47 2021 +0000
+++ b/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_riscv64.c      Thu Sep 30 19:09:10 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: reloc_riscv64.c,v 1.1.1.1 2021/09/30 18:50:09 jmcneill Exp $   */
+/*     $NetBSD: reloc_riscv64.c,v 1.2 2021/09/30 19:09:10 jmcneill Exp $       */
 
 // SPDX-License-Identifier: GPL-2.0+
 /* reloc_riscv.c - position independent ELF shared object relocator
@@ -40,12 +40,19 @@
 
 #include <efi.h>
 
+#ifdef __NetBSD__
+#include <sys/types.h>
+#include <sys/exec_elf.h>
+#else
 #include <elf.h>
+#endif
 
 #define Elf_Dyn                Elf64_Dyn
 #define Elf_Rela       Elf64_Rela
 #define ELF_R_TYPE     ELF64_R_TYPE
 
+EFI_STATUS EFIAPI _relocate(long, Elf_Dyn *);
+
 EFI_STATUS EFIAPI _relocate(long ldbase, Elf_Dyn *dyn)
 {
        long relsz = 0, relent = 0;
diff -r b123272338da -r c3c227723b89 sys/external/bsd/gnu-efi/dist/inc/riscv64/efibind.h
--- a/sys/external/bsd/gnu-efi/dist/inc/riscv64/efibind.h       Thu Sep 30 19:02:47 2021 +0000
+++ b/sys/external/bsd/gnu-efi/dist/inc/riscv64/efibind.h       Thu Sep 30 19:09:10 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: efibind.h,v 1.1.1.1 2021/09/30 18:50:09 jmcneill Exp $ */
+/*     $NetBSD: efibind.h,v 1.2 2021/09/30 19:09:10 jmcneill Exp $     */
 
 /*
  * Copright (C) 2014 - 2015 Linaro Ltd.
@@ -17,7 +17,11 @@
  * either version 2 of the License, or (at your option) any later version.
  */
 
+#if defined(__NetBSD__)
+#include <sys/stdint.h>
+#else
 #include <stdint.h>
+#endif
 
 //
 // Basic EFI types of various widths