[src/netbsd-7]: src/external/gpl3/gcc Apply patch, requested by mrg in #819:

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

details:   https://anonhg.NetBSD.org/src/rev/d77948c06678
branches:  netbsd-7
changeset: 799402:d77948c06678
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jun 04 05:40:46 2015 +0000

description:
Apply patch, requested by mrg in #819:

        lib/libstdc++-v3/arch/earm/c++config.h          (patch)
        lib/libstdc++-v3/arch/earmeb/c++config.h        (patch)
        lib/libstdc++-v3/arch/earmhf/c++config.h        (patch)
        lib/libstdc++-v3/arch/earmhfeb/c++config.h      (patch)
        lib/libstdc++-v3/arch/earmv4/c++config.h        (patch)
        lib/libstdc++-v3/arch/earmv4eb/c++config.h      (patch)
        lib/libstdc++-v3/arch/earmv6/c++config.h        (patch)
        lib/libstdc++-v3/arch/earmv6eb/c++config.h      (patch)
        lib/libstdc++-v3/arch/earmv6hf/c++config.h      (patch)
        lib/libstdc++-v3/arch/earmv6hfeb/c++config.h    (patch)
        lib/libstdc++-v3/arch/earmv7/c++config.h        (patch)
        lib/libstdc++-v3/arch/earmv7eb/c++config.h      (patch)
        lib/libstdc++-v3/arch/earmv7hf/c++config.h      (patch)
        lib/libstdc++-v3/arch/earmv7hfeb/c++config.h    (patch)
        usr.bin/gcc/arch/earm/multilib.h                (patch)
        usr.bin/gcc/arch/earmeb/multilib.h              (patch)
        usr.bin/gcc/arch/earmhf/multilib.h              (patch)
        usr.bin/gcc/arch/earmhfeb/multilib.h            (patch)
        usr.bin/gcc/arch/earmv4/multilib.h              (patch)
        usr.bin/gcc/arch/earmv4eb/multilib.h            (patch)
        usr.bin/gcc/arch/earmv6/multilib.h              (patch)
        usr.bin/gcc/arch/earmv6eb/multilib.h            (patch)
        usr.bin/gcc/arch/earmv6hf/multilib.h            (patch)
        usr.bin/gcc/arch/earmv6hfeb/multilib.h          (patch)
        usr.bin/gcc/arch/earmv7/multilib.h              (patch)
        usr.bin/gcc/arch/earmv7eb/multilib.h            (patch)
        usr.bin/gcc/arch/earmv7hf/multilib.h            (patch)
        usr.bin/gcc/arch/earmv7hfeb/multilib.h          (patch)

Regen for arm OABI compat changes.

diffstat:

 external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h       |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h     |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h     |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h   |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h     |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++config.h   |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h     |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++config.h   |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++config.h   |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++config.h     |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++config.h   |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++config.h   |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earm/multilib.h             |  12 ++++++---
 external/gpl3/gcc/usr.bin/gcc/arch/earmeb/multilib.h           |  12 ++++++---
 external/gpl3/gcc/usr.bin/gcc/arch/earmhf/multilib.h           |  12 ++++++---
 external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/multilib.h         |  12 ++++++---
 external/gpl3/gcc/usr.bin/gcc/arch/earmv4/multilib.h           |  12 ++++++---
 external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/multilib.h         |  12 ++++++---
 external/gpl3/gcc/usr.bin/gcc/arch/earmv6/multilib.h           |  12 ++++++---
 external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/multilib.h         |  12 ++++++---
 external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/multilib.h         |  12 ++++++---
 external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/multilib.h       |  12 ++++++---
 external/gpl3/gcc/usr.bin/gcc/arch/earmv7/multilib.h           |  12 ++++++---
 external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/multilib.h         |  12 ++++++---
 external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/multilib.h         |  12 ++++++---
 external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/multilib.h       |  12 ++++++---
 28 files changed, 126 insertions(+), 70 deletions(-)

diffs (truncated from 630 to 300 lines):

diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h  Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h  Thu Jun 04 05:40:46 2015 +0000
@@ -1257,7 +1257,7 @@
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h        Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h        Thu Jun 04 05:40:46 2015 +0000
@@ -1257,7 +1257,7 @@
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h        Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h        Thu Jun 04 05:40:46 2015 +0000
@@ -1257,7 +1257,7 @@
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h      Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h      Thu Jun 04 05:40:46 2015 +0000
@@ -1257,7 +1257,7 @@
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h        Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h        Thu Jun 04 05:40:46 2015 +0000
@@ -1257,7 +1257,7 @@
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++config.h      Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++config.h      Thu Jun 04 05:40:46 2015 +0000
@@ -1257,7 +1257,7 @@
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h        Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h        Thu Jun 04 05:40:46 2015 +0000
@@ -1257,7 +1257,7 @@
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++config.h      Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++config.h      Thu Jun 04 05:40:46 2015 +0000
@@ -1257,7 +1257,7 @@
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++config.h      Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++config.h      Thu Jun 04 05:40:46 2015 +0000
@@ -1257,7 +1257,7 @@
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h    Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h    Thu Jun 04 05:40:46 2015 +0000
@@ -1257,7 +1257,7 @@
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++config.h        Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++config.h        Thu Jun 04 05:40:46 2015 +0000
@@ -1257,7 +1257,7 @@
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++config.h      Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++config.h      Thu Jun 04 05:40:46 2015 +0000
@@ -1257,7 +1257,7 @@
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++config.h      Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++config.h      Thu Jun 04 05:40:46 2015 +0000
@@ -1257,7 +1257,7 @@
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h    Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h    Thu Jun 04 05:40:46 2015 +0000
@@ -1257,7 +1257,7 @@
 
 /* Define if C99 functions in <fenv.h> should be imported in <tr1/cfenv> in
    namespace std::tr1. */
-/* #undef _GLIBCXX_USE_C99_FENV_TR1 */
+#define _GLIBCXX_USE_C99_FENV_TR1 1
 
 /* Define if C99 functions in <inttypes.h> should be imported in
    <tr1/cinttypes> in namespace std::tr1. */
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/usr.bin/gcc/arch/earm/multilib.h
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earm/multilib.h        Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earm/multilib.h        Thu Jun 04 05:40:46 2015 +0000
@@ -1,9 +1,11 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.70 2013/05/05 07:11:34 skrll Exp  */
-/* Generated from: NetBSD: mknative.common,v 1.8 2006/05/26 19:17:21 mrg Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
 static const char *const multilib_raw[] = {
-". ;",
+". !mabi=aapcs-linux !mabi=apcs-gnu;",
+".:. mabi=aapcs-linux !mabi=apcs-gnu;",
+".:../lib/oabi !mabi=aapcs-linux mabi=apcs-gnu;",
 NULL
 };
 
@@ -12,6 +14,8 @@
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/usr.bin/gcc/arch/earmeb/multilib.h
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/multilib.h      Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/multilib.h      Thu Jun 04 05:40:46 2015 +0000
@@ -1,9 +1,11 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.70 2013/05/05 07:11:34 skrll Exp  */
-/* Generated from: NetBSD: mknative.common,v 1.8 2006/05/26 19:17:21 mrg Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
 static const char *const multilib_raw[] = {
-". ;",
+". !mabi=aapcs-linux !mabi=apcs-gnu;",
+".:. mabi=aapcs-linux !mabi=apcs-gnu;",
+".:../lib/oabi !mabi=aapcs-linux mabi=apcs-gnu;",
 NULL
 };
 
@@ -12,6 +14,8 @@
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/usr.bin/gcc/arch/earmhf/multilib.h
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/multilib.h      Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/multilib.h      Thu Jun 04 05:40:46 2015 +0000
@@ -1,9 +1,11 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.70 2013/05/05 07:11:34 skrll Exp  */
-/* Generated from: NetBSD: mknative.common,v 1.8 2006/05/26 19:17:21 mrg Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
 static const char *const multilib_raw[] = {
-". ;",
+". !mabi=aapcs-linux !mabi=apcs-gnu;",
+".:. mabi=aapcs-linux !mabi=apcs-gnu;",
+".:../lib/oabi !mabi=aapcs-linux mabi=apcs-gnu;",
 NULL
 };
 
@@ -12,6 +14,8 @@
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";
diff -r 148caf9c0f31 -r d77948c06678 external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/multilib.h
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/multilib.h    Wed Jun 03 06:53:37 2015 +0000
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/multilib.h    Thu Jun 04 05:40:46 2015 +0000
@@ -1,9 +1,11 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.70 2013/05/05 07:11:34 skrll Exp  */
-/* Generated from: NetBSD: mknative.common,v 1.8 2006/05/26 19:17:21 mrg Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
 static const char *const multilib_raw[] = {
-". ;",
+". !mabi=aapcs-linux !mabi=apcs-gnu;",
+".:. mabi=aapcs-linux !mabi=apcs-gnu;",
+".:../lib/oabi !mabi=aapcs-linux mabi=apcs-gnu;",
 NULL
 };
 
@@ -12,6 +14,8 @@
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";