Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/gnu-efi/dist Build fixes for NetBSD.



details:   https://anonhg.NetBSD.org/src/rev/fae49898ed0a
branches:  trunk
changeset: 997878:fae49898ed0a
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Mar 30 12:46:16 2019 +0000

description:
Build fixes for NetBSD.

diffstat:

 sys/external/bsd/gnu-efi/dist/gnuefi/reloc_arm.c |   9 ++++++++-
 sys/external/bsd/gnu-efi/dist/lib/arm/initplat.c |  10 +---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diffs (45 lines):

diff -r b35a13704c68 -r fae49898ed0a sys/external/bsd/gnu-efi/dist/gnuefi/reloc_arm.c
--- a/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_arm.c  Sat Mar 30 12:45:50 2019 +0000
+++ b/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_arm.c  Sat Mar 30 12:46:16 2019 +0000
@@ -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. <ard.biesheuvel%linaro.org@localhost>
@@ -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,
diff -r b35a13704c68 -r fae49898ed0a sys/external/bsd/gnu-efi/dist/lib/arm/initplat.c
--- a/sys/external/bsd/gnu-efi/dist/lib/arm/initplat.c  Sat Mar 30 12:45:50 2019 +0000
+++ b/sys/external/bsd/gnu-efi/dist/lib/arm/initplat.c  Sat Mar 30 12:46:16 2019 +0000
@@ -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 @@
     )
 {
 }
-
-#ifdef __GNUC__
-void __div0(void)
-{
-    // TODO handle divide by zero fault
-    while (1);
-}
-#endif



Home | Main Index | Thread Index | Old Index