[src/trunk]: src/external/gpl3/gcc/dist/gcc Make MULTILIBS work for oabi

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

details:   https://anonhg.NetBSD.org/src/rev/457ebc5ab05c
branches:  trunk
changeset: 338489:457ebc5ab05c
user:      matt <matt%NetBSD.org@localhost>
date:      Wed May 27 15:33:41 2015 +0000

description:
Make MULTILIBS work for oabi

diffstat:

 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 ++++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 5377e8bf8b65 -r 457ebc5ab05c external/gpl3/gcc/dist/gcc/config.gcc
--- a/external/gpl3/gcc/dist/gcc/config.gcc     Wed May 27 15:31:15 2015 +0000
+++ b/external/gpl3/gcc/dist/gcc/config.gcc     Wed May 27 15:33:41 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 5377e8bf8b65 -r 457ebc5ab05c external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
--- a/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h       Wed May 27 15:31:15 2015 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h       Wed May 27 15:33:41 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 5377e8bf8b65 -r 457ebc5ab05c 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        Wed May 27 15:33:41 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