[src/trunk]: src - don't use arm unwind code for netbsd/earm. conflicts with...

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

details:   https://anonhg.NetBSD.org/src/rev/1c2055bcc91e
branches:  trunk
changeset: 448702:1c2055bcc91e
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Feb 07 10:45:48 2019 +0000

description:
- don't use arm unwind code for netbsd/earm.  conflicts with native unwind.

diffstat:

 distrib/sets/lists/comp/ad.arm                         |  4 ++--
 external/gpl3/gcc/dist/gcc/config.gcc                  |  4 +++-
 external/gpl3/gcc/dist/libgcc/config.host              |  3 ++-
 external/gpl3/gcc/dist/libgcc/config/arm/t-netbsd-eabi |  8 +++++---
 4 files changed, 12 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r bac9e1b0f142 -r 1c2055bcc91e distrib/sets/lists/comp/ad.arm
--- a/distrib/sets/lists/comp/ad.arm    Thu Feb 07 10:45:17 2019 +0000
+++ b/distrib/sets/lists/comp/ad.arm    Thu Feb 07 10:45:48 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.94 2019/02/05 10:54:14 mrg Exp $
+# $NetBSD: ad.arm,v 1.95 2019/02/07 10:45:48 mrg Exp $
 ./usr/bin/elf2aout                             comp-sysutil-bin
 ./usr/include/acorn26                          comp-obsolete           obsolete
 ./usr/include/acorn26/ansi.h                   comp-obsolete           obsolete
@@ -424,7 +424,7 @@
 ./usr/include/gcc-7/arm_neon.h                 comp-c-include          gcc=7
 ./usr/include/gcc-7/mmintrin.h                 comp-c-include          gcc=7
 ./usr/include/gcc-7/tgmath.h                   comp-c-include          gcc=7
-./usr/include/gcc-7/unwind-arm-common.h                comp-c-include          gcc=7,eabi
+./usr/include/gcc-7/unwind-arm-common.h                comp-c-include          obsolete,gcc=7,eabi
 ./usr/include/hpcarm                           comp-c-include
 ./usr/include/hpcarm/ansi.h                    comp-obsolete           obsolete
 ./usr/include/hpcarm/aout_machdep.h            comp-obsolete           obsolete
diff -r bac9e1b0f142 -r 1c2055bcc91e external/gpl3/gcc/dist/gcc/config.gcc
--- a/external/gpl3/gcc/dist/gcc/config.gcc     Thu Feb 07 10:45:17 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/config.gcc     Thu Feb 07 10:45:48 2019 +0000
@@ -1125,7 +1125,9 @@
        case ${target} in
        arm*-*-netbsdelf-*eabi*)
            tm_file="$tm_file arm/bpabi.h arm/netbsd-elf.h arm/netbsd-eabi.h"
-           tmake_file="$tmake_file arm/t-bpabi arm/t-netbsdeabi"
+           # GCC 7 vs NetBSD/eabi -> avoid arm unwinder
+           #tmake_file="$tmake_file arm/t-bpabi"
+           tmake_file="$tmake_file arm/t-netbsdeabi"
            # The EABI requires the use of __cxa_atexit.
            default_use_cxa_atexit=yes
            ;;
diff -r bac9e1b0f142 -r 1c2055bcc91e external/gpl3/gcc/dist/libgcc/config.host
--- a/external/gpl3/gcc/dist/libgcc/config.host Thu Feb 07 10:45:17 2019 +0000
+++ b/external/gpl3/gcc/dist/libgcc/config.host Thu Feb 07 10:45:48 2019 +0000
@@ -412,7 +412,8 @@
        case ${host} in
        arm*-*-netbsdelf-*eabi*)
          tmake_file="${tmake_file} arm/t-netbsd-eabi"
-         unwind_header=config/arm/unwind-arm.h
+         # GCC 7 vs NetBSD/eabi -> avoid arm unwinder
+         # unwind_header=config/arm/unwind-arm.h
        ;;
        *)
          tmake_file="${tmake_file} arm/t-netbsd t-slibgcc-gld-nover"
diff -r bac9e1b0f142 -r 1c2055bcc91e external/gpl3/gcc/dist/libgcc/config/arm/t-netbsd-eabi
--- a/external/gpl3/gcc/dist/libgcc/config/arm/t-netbsd-eabi    Thu Feb 07 10:45:17 2019 +0000
+++ b/external/gpl3/gcc/dist/libgcc/config/arm/t-netbsd-eabi    Thu Feb 07 10:45:48 2019 +0000
@@ -6,9 +6,11 @@
 # Add the BPABI C functions.
 LIB2ADD +=    $(srcdir)/config/arm/unaligned-funcs.c
 
-LIB2ADDEH = $(srcdir)/config/arm/unwind-arm.c \
-  $(srcdir)/config/arm/libunwind.S \
-  $(srcdir)/config/arm/pr-support.c $(srcdir)/unwind-c.c
+#LIB2ADDEH = $(srcdir)/config/arm/unwind-arm.c \
+#  $(srcdir)/config/arm/libunwind.S \
+#  $(srcdir)/config/arm/pr-support.c $(srcdir)/unwind-c.c
+
+LIB2FUNCS_EXCLUDE = _ctors
 
 # Add the BPABI names.
 SHLIB_MAPFILES += $(srcdir)/config/arm/libgcc-bpabi.ver