[src/trunk]: src/external/gpl3/gcc/dist/gcc/config/arm Default to EABI5. Don...

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

details:   https://anonhg.NetBSD.org/src/rev/a1af71292170
branches:  trunk
changeset: 784637:a1af71292170
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Feb 04 18:41:18 2013 +0000

description:
Default to EABI5.  Don't supply -meabi= to as.  switch back unwind-arm.h
nuke unwind-netbsd.h

diffstat:

 external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h   |   2 +-
 external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h    |   2 +-
 external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi   |   6 +-
 external/gpl3/gcc/dist/gcc/config/arm/unwind-netbsd.h |  34 -------------------
 4 files changed, 5 insertions(+), 39 deletions(-)

diffs (82 lines):

diff -r 8fe3fbee33d7 -r a1af71292170 external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
--- a/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h       Mon Feb 04 18:29:55 2013 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h       Mon Feb 04 18:41:18 2013 +0000
@@ -68,7 +68,7 @@
 
 #undef SUBTARGET_EXTRA_ASM_SPEC
 #define SUBTARGET_EXTRA_ASM_SPEC       \
-  "-matpcs %{!mabi=*|mabi=aapcs*:-meabi=4} %{fpic|fpie:-k} %{fPIC|fPIE:-k}"
+  "-matpcs %{fpic|fpie:-k} %{fPIC|fPIE:-k}"
 
 /* Default to full VFP if -mhard-float is specified.  */
 #undef SUBTARGET_ASM_FLOAT_SPEC
diff -r 8fe3fbee33d7 -r a1af71292170 external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h
--- a/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h        Mon Feb 04 18:29:55 2013 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h        Mon Feb 04 18:41:18 2013 +0000
@@ -61,7 +61,7 @@
 
 #undef SUBTARGET_EXTRA_ASM_SPEC
 #define SUBTARGET_EXTRA_ASM_SPEC       \
-  "-matpcs %{mabi=aapcs*:-meabi=4} %{fpic|fpie:-k} %{fPIC|fPIE:-k}"
+  "-matpcs %{mabi=aapcs*:-meabi=5} %{fpic|fpie:-k} %{fPIC|fPIE:-k}"
 
 /* Default to full VFP if -mhard-float is specified.  */
 #undef SUBTARGET_ASM_FLOAT_SPEC
diff -r 8fe3fbee33d7 -r a1af71292170 external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi
--- a/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi       Mon Feb 04 18:29:55 2013 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi       Mon Feb 04 18:41:18 2013 +0000
@@ -24,8 +24,8 @@
 #      _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
 #      _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
 #      _fixsfsi _fixunssfsi
-LIB1ASMFUNCS += \
-       _floatundisf
+#LIB1ASMFUNCS += \
+#      _floatundisf
 
 # Add the BPABI C functions.
 LIB2FUNCS_EXTRA = $(srcdir)/config/arm/bpabi-netbsd.c \
@@ -35,4 +35,4 @@
 LIB2FUNCS_STATIC_EXTRA = 
 
 # to make compat easier.
-UNWIND_H = $(srcdir)/config/arm/unwind-netbsd.h 
+UNWIND_H = $(srcdir)/config/arm/unwind-arm.h 
diff -r 8fe3fbee33d7 -r a1af71292170 external/gpl3/gcc/dist/gcc/config/arm/unwind-netbsd.h
--- a/external/gpl3/gcc/dist/gcc/config/arm/unwind-netbsd.h     Mon Feb 04 18:29:55 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/* Header file for the NetBSD ARM unwinder
-   Copyright (C) 2013
-   Free Software Foundation, Inc.
-   Contributed by Matt Thomas
-
-   This file is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 3, or (at your option) any
-   later version.
-
-   This file is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   Under Section 7 of GPL version 3, you are granted additional
-   permissions described in the GCC Runtime Library Exception, version
-   3.1, as published by the Free Software Foundation.
-
-   You should have received a copy of the GNU General Public License and
-   a copy of the GCC Runtime Library Exception along with this program;
-   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef UNWIND_NETBSD_H
-#define UNWIND_NETBSD_H
-
-#ifdef __ARM_EABI__
-#include "unwind-arm.h"
-#else
-#include "unwind-generic.h"
-#endif /* defined __ARM_EABI__ */
- 
-#endif /* defined UNWIND_NETBSD_H */