[src/netbsd-7]: src Pull up following revision(s) (requested by martin in tic...

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

details:   https://anonhg.NetBSD.org/src/rev/e2346d0ad1ea
branches:  netbsd-7
changeset: 799390:e2346d0ad1ea
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Jun 01 19:38:35 2015 +0000

description:
Pull up following revision(s) (requested by martin in ticket #816):
        compat/archdirs.mk: revisions 1.7, 1.9, 1.10
        compat/arm/eabihf/bsd.eabihf.mk: revision 1.2
        external/gpl3/gcc/dist/gcc/config.gcc: revision 1.33
        external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h: revision 1.14
        external/gpl3/gcc/dist/gcc/config/arm/t-netbsdeabi: revision 1.1
Enable building eabihf compat libraries after fixing bsd.eabihf.mk to use
--
use the proper variant of arm*--netbsdelf-eabihf
--
Fix broken subdir selection after arm architecture explosion
--
Only support oabi for earm*
--
Make MULTILIBS work for oabi

diffstat:

 compat/archdirs.mk                                  |  14 +++-----------
 compat/arm/eabihf/bsd.eabihf.mk                     |  10 +++++-----
 external/gpl3/gcc/dist/gcc/config.gcc               |   2 +-
 external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h |   2 --
 external/gpl3/gcc/dist/gcc/config/arm/t-netbsdeabi  |   8 ++++++++
 5 files changed, 17 insertions(+), 19 deletions(-)

diffs (110 lines):

diff -r 9ae139c2eca5 -r e2346d0ad1ea compat/archdirs.mk
--- a/compat/archdirs.mk        Mon Jun 01 19:26:26 2015 +0000
+++ b/compat/archdirs.mk        Mon Jun 01 19:38:35 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: archdirs.mk,v 1.6 2014/08/11 04:33:30 matt Exp $
+#      $NetBSD: archdirs.mk,v 1.6.2.1 2015/06/01 19:38:35 snj Exp $
 
 # list of subdirs used per-platform
 
@@ -10,18 +10,10 @@
 ARCHDIR_SUBDIR=        amd64/i386
 .endif
 
-.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb")
-ARCHDIR_SUBDIR=        arm/eabi
-.endif
-
-.if (${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb")
+.if !empty(MACHINE_ARCH:Mearm*)
 ARCHDIR_SUBDIR=        arm/oabi
 .endif
 
-.if (${MACHINE_ARCH} == "earmhf" || ${MACHINE_ARCH} == "earmhfeb")
-ARCHDIR_SUBDIR=        arm/oabi arm/eabi
-.endif
-
 .if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
 ARCHDIR_SUBDIR=        mips64/64 mips64/o32
 .endif
@@ -32,7 +24,7 @@
 
 .if (${MACHINE_ARCH} == "aarch64")
 ARCHDIR_SUBDIR+= arm/eabi
-#ARCHDIR_SUBDIR+= arm/eabihf
+ARCHDIR_SUBDIR+= arm/eabihf
 ARCHDIR_SUBDIR+= arm/oabi
 .elif (${MACHINE_ARCH} == "aarch64eb")
 ARCHDIR_SUBDIR= arm/eabi
diff -r 9ae139c2eca5 -r e2346d0ad1ea compat/arm/eabihf/bsd.eabihf.mk
--- a/compat/arm/eabihf/bsd.eabihf.mk   Mon Jun 01 19:26:26 2015 +0000
+++ b/compat/arm/eabihf/bsd.eabihf.mk   Mon Jun 01 19:38:35 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.eabihf.mk,v 1.1 2014/08/10 23:26:25 matt Exp $
+#      $NetBSD: bsd.eabihf.mk,v 1.1.2.1 2015/06/01 19:38:35 snj Exp $
 
 .if !defined(MLIBDIR)
 
@@ -9,22 +9,22 @@
 MKSOFTFLOAT=no
 
 .if ${MACHINE_ARCH} == "aarch64eb"
-EARM_COMPAT_FLAGS+=    -target armeb--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+=    -target armeb--netbsdelf-eabihf
 EARM_COMPAT_FLAGS+=    -mcpu=cortex-a53
 ARM_MACHINE_ARCH=      earmv7hfeb
 LDFLAGS+=              -Wl,--be8
 ARM_LD=                        -m armelfb_nbsd_eabihf --be8
 .elif ${MACHINE_ARCH} == "aarch64"
-EARM_COMPAT_FLAGS+=    -target arm--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+=    -target arm--netbsdelf-eabihf
 EARM_COMPAT_FLAGS+=    -mcpu=cortex-a53
 ARM_MACHINE_ARCH=      earmv7hf
 ARM_LD=                        -m armelf_nbsd_eabihf
 .elif !empty(MACHINE_ARCH:M*eb)
-EARM_COMPAT_FLAGS+=    -target armeb--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+=    -target armeb--netbsdelf-eabihf
 ARM_MACHINE_ARCH=      earmhfeb
 ARM_LD=                        -m armelfb_nbsd_eabihf
 .else
-EARM_COMPAT_FLAGS+=    -target arm--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+=    -target arm--netbsdelf-eabihf
 ARM_MACHINE_ARCH=      earmhf
 ARM_LD=                        -m armelf_nbsd_eabihf
 .endif
diff -r 9ae139c2eca5 -r e2346d0ad1ea external/gpl3/gcc/dist/gcc/config.gcc
--- a/external/gpl3/gcc/dist/gcc/config.gcc     Mon Jun 01 19:26:26 2015 +0000
+++ b/external/gpl3/gcc/dist/gcc/config.gcc     Mon Jun 01 19:38:35 2015 +0000
@@ -897,7 +897,7 @@
        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"
+           tmake_file="$tmake_file arm/t-bpabi arm/t-netbsdeabi"
            # The BPABI long long divmod functions return a 128-bit value in
            # registers r0-r3.  Correctly modeling that requires the use of
            # TImode.
diff -r 9ae139c2eca5 -r e2346d0ad1ea external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
--- a/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h       Mon Jun 01 19:26:26 2015 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h       Mon Jun 01 19:38:35 2015 +0000
@@ -40,8 +40,6 @@
 #define TARGET_LINKER_EMULATION TARGET_LINKER_LITTLE_EMULATION
 #endif
 
-#undef MULTILIB_DEFAULTS
-
 #undef ARM_DEFAULT_ABI
 #define ARM_DEFAULT_ABI ARM_ABI_AAPCS_LINUX
 
diff -r 9ae139c2eca5 -r e2346d0ad1ea external/gpl3/gcc/dist/gcc/config/arm/t-netbsdeabi
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/arm/t-netbsdeabi        Mon Jun 01 19:38:35 2015 +0000
@@ -0,0 +1,8 @@
+# NetBSD has (will have) "non-native" libraries in /usr/lib/<arch>.
+
+MULTILIB_OPTIONS = mabi=aapcs-linux/mabi=apcs-gnu
+MULTILIB_DIRNAMES = eabi oabi
+MULTILIB_OSDIRNAMES = . ../lib/oabi
+
+LIBGCC = stmp-multilib
+INSTALL_LIBGCC = install-multilib