[src/trunk]: src/libexec/ld.elf_so Don't provide __gnu_Unwind_Find_exidx if _...

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

details:   https://anonhg.NetBSD.org/src/rev/b7fd6ad63438
branches:  trunk
changeset: 798206:b7fd6ad63438
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Aug 10 23:35:26 2014 +0000

description:
Don't provide __gnu_Unwind_Find_exidx if __ARM_DWARF_EH__ is defined

diffstat:

 libexec/ld.elf_so/arch/arm/find_exidx.c |  6 +++++-
 libexec/ld.elf_so/rtld.h                |  6 +++---
 libexec/ld.elf_so/symbol.c              |  6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diffs (79 lines):

diff -r eaba3d1dc832 -r b7fd6ad63438 libexec/ld.elf_so/arch/arm/find_exidx.c
--- a/libexec/ld.elf_so/arch/arm/find_exidx.c   Sun Aug 10 23:31:41 2014 +0000
+++ b/libexec/ld.elf_so/arch/arm/find_exidx.c   Sun Aug 10 23:35:26 2014 +0000
@@ -29,12 +29,14 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: find_exidx.c,v 1.3 2013/05/03 10:27:06 skrll Exp $");
+__RCSID("$NetBSD: find_exidx.c,v 1.4 2014/08/10 23:35:27 matt Exp $");
 #endif /* not lint */
 
 #include "debug.h"
 #include "rtld.h"
 
+#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
+
 _Unwind_Ptr
 __gnu_Unwind_Find_exidx(_Unwind_Ptr pc, int * pcount)
 {
@@ -84,3 +86,5 @@
        *pcount = count;
        return start;
 }
+
+#endif
diff -r eaba3d1dc832 -r b7fd6ad63438 libexec/ld.elf_so/rtld.h
--- a/libexec/ld.elf_so/rtld.h  Sun Aug 10 23:31:41 2014 +0000
+++ b/libexec/ld.elf_so/rtld.h  Sun Aug 10 23:35:26 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtld.h,v 1.117 2014/03/06 19:19:40 matt Exp $   */
+/*     $NetBSD: rtld.h,v 1.118 2014/08/10 23:35:26 matt Exp $   */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -48,7 +48,7 @@
 
 #if defined(_RTLD_SOURCE)
 
-#ifdef __ARM_EABI__
+#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
 #include "unwind.h"
 #endif
 
@@ -352,7 +352,7 @@
 
 __dso_public void *_dlauxinfo(void) __pure;
 
-#ifdef __ARM_EABI__
+#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
 /*
  * This is used by libgcc to find the start and length of the exception table
  * associated with a PC.
diff -r eaba3d1dc832 -r b7fd6ad63438 libexec/ld.elf_so/symbol.c
--- a/libexec/ld.elf_so/symbol.c        Sun Aug 10 23:31:41 2014 +0000
+++ b/libexec/ld.elf_so/symbol.c        Sun Aug 10 23:35:26 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: symbol.c,v 1.64 2014/03/21 01:40:41 matt Exp $  */
+/*     $NetBSD: symbol.c,v 1.65 2014/08/10 23:35:26 matt Exp $  */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: symbol.c,v 1.64 2014/03/21 01:40:41 matt Exp $");
+__RCSID("$NetBSD: symbol.c,v 1.65 2014/08/10 23:35:26 matt Exp $");
 #endif /* not lint */
 
 #include <err.h>
@@ -101,7 +101,7 @@
                (fptr_t)___tls_get_addr,
 #endif
 #endif
-#ifdef __ARM_EABI__
+#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
                (fptr_t)__gnu_Unwind_Find_exidx,        /* for gcc EHABI */
 #endif
                NULL