Module Name: src
Committed By: jmcneill
Date: Sat Mar 30 12:46:17 UTC 2019
Modified Files:
src/sys/external/bsd/gnu-efi/dist/gnuefi: reloc_arm.c
src/sys/external/bsd/gnu-efi/dist/lib/arm: initplat.c
Log Message:
Build fixes for NetBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_arm.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/lib/arm/initplat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_arm.c
diff -u src/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_arm.c:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_arm.c:1.2
--- src/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_arm.c:1.1.1.1 Thu Aug 16 18:17:47 2018
+++ src/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_arm.c Sat Mar 30 12:46:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: reloc_arm.c,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */
+/* $NetBSD: reloc_arm.c,v 1.2 2019/03/30 12:46:16 jmcneill Exp $ */
/* reloc_arm.c - position independent x86 ELF shared object relocator
Copyright (C) 2014 Linaro Ltd. <[email protected]>
@@ -39,7 +39,14 @@
#include <efi.h>
#include <efilib.h>
+#ifdef __NetBSD__
+#include <sys/types.h>
+#include <sys/exec_elf.h>
+#else
#include <elf.h>
+#endif
+
+EFI_STATUS _relocate (long, Elf32_Dyn *, EFI_HANDLE, EFI_SYSTEM_TABLE *);
EFI_STATUS _relocate (long ldbase, Elf32_Dyn *dyn,
EFI_HANDLE image EFI_UNUSED,
Index: src/sys/external/bsd/gnu-efi/dist/lib/arm/initplat.c
diff -u src/sys/external/bsd/gnu-efi/dist/lib/arm/initplat.c:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/lib/arm/initplat.c:1.2
--- src/sys/external/bsd/gnu-efi/dist/lib/arm/initplat.c:1.1.1.1 Thu Aug 16 18:17:47 2018
+++ src/sys/external/bsd/gnu-efi/dist/lib/arm/initplat.c Sat Mar 30 12:46:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: initplat.c,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */
+/* $NetBSD: initplat.c,v 1.2 2019/03/30 12:46:16 jmcneill Exp $ */
/*
* Copright (C) 2014 Linaro Ltd.
@@ -26,11 +26,3 @@ InitializeLibPlatform (
)
{
}
-
-#ifdef __GNUC__
-void __div0(void)
-{
- // TODO handle divide by zero fault
- while (1);
-}
-#endif
