Module Name: src
Committed By: mrg
Date: Thu Feb 7 10:45:48 UTC 2019
Modified Files:
src/distrib/sets/lists/comp: ad.arm
src/external/gpl3/gcc/dist/gcc: config.gcc
src/external/gpl3/gcc/dist/libgcc: config.host
src/external/gpl3/gcc/dist/libgcc/config/arm: t-netbsd-eabi
Log Message:
- don't use arm unwind code for netbsd/earm. conflicts with native unwind.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/distrib/sets/lists/comp/ad.arm
cvs rdiff -u -r1.47 -r1.48 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.21 -r1.22 src/external/gpl3/gcc/dist/libgcc/config.host
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/dist/libgcc/config/arm/t-netbsd-eabi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/ad.arm
diff -u src/distrib/sets/lists/comp/ad.arm:1.94 src/distrib/sets/lists/comp/ad.arm:1.95
--- src/distrib/sets/lists/comp/ad.arm:1.94 Tue Feb 5 10:54:14 2019
+++ src/distrib/sets/lists/comp/ad.arm Thu Feb 7 10:45:48 2019
@@ -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
Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.47 src/external/gpl3/gcc/dist/gcc/config.gcc:1.48
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.47 Thu Feb 7 04:12:27 2019
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Thu Feb 7 10:45:48 2019
@@ -1125,7 +1125,9 @@ arm*-*-netbsdelf*)
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
;;
Index: src/external/gpl3/gcc/dist/libgcc/config.host
diff -u src/external/gpl3/gcc/dist/libgcc/config.host:1.21 src/external/gpl3/gcc/dist/libgcc/config.host:1.22
--- src/external/gpl3/gcc/dist/libgcc/config.host:1.21 Thu Jan 24 22:00:28 2019
+++ src/external/gpl3/gcc/dist/libgcc/config.host Thu Feb 7 10:45:48 2019
@@ -412,7 +412,8 @@ arm*-*-netbsdelf*)
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"
Index: src/external/gpl3/gcc/dist/libgcc/config/arm/t-netbsd-eabi
diff -u src/external/gpl3/gcc/dist/libgcc/config/arm/t-netbsd-eabi:1.1 src/external/gpl3/gcc/dist/libgcc/config/arm/t-netbsd-eabi:1.2
--- src/external/gpl3/gcc/dist/libgcc/config/arm/t-netbsd-eabi:1.1 Sat Mar 1 09:26:00 2014
+++ src/external/gpl3/gcc/dist/libgcc/config/arm/t-netbsd-eabi Thu Feb 7 10:45:48 2019
@@ -6,9 +6,11 @@ LIB1ASMFUNCS += _dvmd_tls _bb_init_func
# 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
