Module Name:    src
Committed By:   martin
Date:           Thu Jun  4 05:40:48 UTC 2015

Modified Files:
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm [netbsd-7]:
            c++config.h
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb [netbsd-7]:
            c++config.h
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf [netbsd-7]:
            c++config.h
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb [netbsd-7]:
            c++config.h
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4 [netbsd-7]:
            c++config.h
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb [netbsd-7]:
            c++config.h
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6 [netbsd-7]:
            c++config.h
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb [netbsd-7]:
            c++config.h
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf [netbsd-7]:
            c++config.h
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb [netbsd-7]:
            c++config.h
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7 [netbsd-7]:
            c++config.h
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb [netbsd-7]:
            c++config.h
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf [netbsd-7]:
            c++config.h
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb [netbsd-7]:
            c++config.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earm [netbsd-7]: multilib.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb [netbsd-7]: multilib.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf [netbsd-7]: multilib.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb [netbsd-7]: multilib.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4 [netbsd-7]: multilib.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb [netbsd-7]: multilib.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6 [netbsd-7]: multilib.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb [netbsd-7]: multilib.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf [netbsd-7]: multilib.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb [netbsd-7]:
            multilib.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7 [netbsd-7]: multilib.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb [netbsd-7]: multilib.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf [netbsd-7]: multilib.h
        src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb [netbsd-7]:
            multilib.h

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.10.2.2 -r1.10.2.3 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h
cvs rdiff -u -r1.8.2.2 -r1.8.2.3 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h
cvs rdiff -u -r1.8.2.2 -r1.8.2.3 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h
cvs rdiff -u -r1.6.2.2 -r1.6.2.3 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++config.h
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++config.h
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++config.h
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++config.h
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++config.h
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++config.h
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h
cvs rdiff -u -r1.3 -r1.3.4.1 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earm/multilib.h
cvs rdiff -u -r1.3 -r1.3.6.1 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/multilib.h
cvs rdiff -u -r1.3 -r1.3.6.1 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/multilib.h
cvs rdiff -u -r1.2 -r1.2.6.1 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/multilib.h
cvs rdiff -u -r1.2 -r1.2.6.1 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/multilib.h
cvs rdiff -u -r1.2 -r1.2.6.1 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/multilib.h
cvs rdiff -u -r1.2 -r1.2.6.1 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/multilib.h
cvs rdiff -u -r1.2 -r1.2.6.1 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/multilib.h
cvs rdiff -u -r1.2 -r1.2.6.1 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/multilib.h
cvs rdiff -u -r1.2 -r1.2.6.1 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/multilib.h
cvs rdiff -u -r1.2 -r1.2.6.1 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7/multilib.h
cvs rdiff -u -r1.2 -r1.2.6.1 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/multilib.h
cvs rdiff -u -r1.2 -r1.2.6.1 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/multilib.h
cvs rdiff -u -r1.2 -r1.2.6.1 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/multilib.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h:1.10.2.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h:1.10.2.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h:1.10.2.2	Sun Jan 25 00:19:38 2015
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h	Thu Jun  4 05:40:46 2015
@@ -1257,7 +1257,7 @@ namespace std
 
 /* 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. */

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h:1.8.2.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h:1.8.2.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h:1.8.2.2	Sun Jan 25 00:19:38 2015
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h	Thu Jun  4 05:40:46 2015
@@ -1257,7 +1257,7 @@ namespace std
 
 /* 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. */

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h:1.8.2.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h:1.8.2.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h:1.8.2.2	Sun Jan 25 00:19:39 2015
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h	Thu Jun  4 05:40:46 2015
@@ -1257,7 +1257,7 @@ namespace std
 
 /* 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. */

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h:1.6.2.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h:1.6.2.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h:1.6.2.2	Sun Jan 25 00:19:39 2015
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h	Thu Jun  4 05:40:46 2015
@@ -1257,7 +1257,7 @@ namespace std
 
 /* 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. */

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h:1.5.2.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h:1.5.2.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h:1.5.2.2	Sun Jan 25 00:19:39 2015
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h	Thu Jun  4 05:40:46 2015
@@ -1257,7 +1257,7 @@ namespace std
 
 /* 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. */

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++config.h:1.5.2.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++config.h:1.5.2.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++config.h:1.5.2.2	Sun Jan 25 00:19:39 2015
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++config.h	Thu Jun  4 05:40:46 2015
@@ -1257,7 +1257,7 @@ namespace std
 
 /* 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. */

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h:1.5.2.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h:1.5.2.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h:1.5.2.2	Sun Jan 25 00:19:39 2015
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h	Thu Jun  4 05:40:46 2015
@@ -1257,7 +1257,7 @@ namespace std
 
 /* 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. */

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++config.h:1.5.2.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++config.h:1.5.2.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++config.h:1.5.2.2	Sun Jan 25 00:19:39 2015
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++config.h	Thu Jun  4 05:40:46 2015
@@ -1257,7 +1257,7 @@ namespace std
 
 /* 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. */

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++config.h:1.5.2.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++config.h:1.5.2.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++config.h:1.5.2.2	Sun Jan 25 00:19:39 2015
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++config.h	Thu Jun  4 05:40:46 2015
@@ -1257,7 +1257,7 @@ namespace std
 
 /* 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. */

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h:1.5.2.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h:1.5.2.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h:1.5.2.2	Sun Jan 25 00:19:39 2015
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h	Thu Jun  4 05:40:46 2015
@@ -1257,7 +1257,7 @@ namespace std
 
 /* 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. */

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++config.h:1.5.2.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++config.h:1.5.2.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++config.h:1.5.2.2	Sun Jan 25 00:19:39 2015
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++config.h	Thu Jun  4 05:40:46 2015
@@ -1257,7 +1257,7 @@ namespace std
 
 /* 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. */

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++config.h:1.5.2.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++config.h:1.5.2.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++config.h:1.5.2.2	Sun Jan 25 00:19:39 2015
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++config.h	Thu Jun  4 05:40:47 2015
@@ -1257,7 +1257,7 @@ namespace std
 
 /* 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. */

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++config.h:1.5.2.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++config.h:1.5.2.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++config.h:1.5.2.2	Sun Jan 25 00:19:39 2015
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++config.h	Thu Jun  4 05:40:47 2015
@@ -1257,7 +1257,7 @@ namespace std
 
 /* 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. */

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h:1.5.2.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h:1.5.2.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h:1.5.2.2	Sun Jan 25 00:19:39 2015
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h	Thu Jun  4 05:40:47 2015
@@ -1257,7 +1257,7 @@ namespace std
 
 /* 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. */

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earm/multilib.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earm/multilib.h:1.3 src/external/gpl3/gcc/usr.bin/gcc/arch/earm/multilib.h:1.3.4.1
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earm/multilib.h:1.3	Sat Mar  1 10:00:50 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earm/multilib.h	Thu Jun  4 05:40:47 2015
@@ -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 @@ NULL
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@ static const char *const multilib_exclus
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/multilib.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/multilib.h:1.3 src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/multilib.h:1.3.6.1
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/multilib.h:1.3	Sat Mar  1 10:00:50 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/multilib.h	Thu Jun  4 05:40:47 2015
@@ -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 @@ NULL
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@ static const char *const multilib_exclus
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/multilib.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/multilib.h:1.3 src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/multilib.h:1.3.6.1
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/multilib.h:1.3	Sat Mar  1 10:00:50 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/multilib.h	Thu Jun  4 05:40:47 2015
@@ -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 @@ NULL
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@ static const char *const multilib_exclus
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/multilib.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/multilib.h:1.2 src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/multilib.h:1.2.6.1
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/multilib.h:1.2	Sat Mar  1 10:00:50 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/multilib.h	Thu Jun  4 05:40:47 2015
@@ -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 @@ NULL
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@ static const char *const multilib_exclus
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/multilib.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/multilib.h:1.2 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/multilib.h:1.2.6.1
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/multilib.h:1.2	Sat Mar  1 10:00:50 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/multilib.h	Thu Jun  4 05:40:47 2015
@@ -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 @@ NULL
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@ static const char *const multilib_exclus
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/multilib.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/multilib.h:1.2 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/multilib.h:1.2.6.1
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/multilib.h:1.2	Sat Mar  1 10:00:50 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/multilib.h	Thu Jun  4 05:40:47 2015
@@ -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 @@ NULL
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@ static const char *const multilib_exclus
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/multilib.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/multilib.h:1.2 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/multilib.h:1.2.6.1
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/multilib.h:1.2	Sat Mar  1 10:00:50 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6/multilib.h	Thu Jun  4 05:40:47 2015
@@ -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 @@ NULL
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@ static const char *const multilib_exclus
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/multilib.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/multilib.h:1.2 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/multilib.h:1.2.6.1
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/multilib.h:1.2	Sat Mar  1 10:00:50 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/multilib.h	Thu Jun  4 05:40:47 2015
@@ -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 @@ NULL
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@ static const char *const multilib_exclus
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/multilib.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/multilib.h:1.2 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/multilib.h:1.2.6.1
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/multilib.h:1.2	Sat Mar  1 10:00:50 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/multilib.h	Thu Jun  4 05:40:47 2015
@@ -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 @@ NULL
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@ static const char *const multilib_exclus
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/multilib.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/multilib.h:1.2 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/multilib.h:1.2.6.1
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/multilib.h:1.2	Sat Mar  1 10:00:50 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/multilib.h	Thu Jun  4 05:40:47 2015
@@ -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 @@ NULL
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@ static const char *const multilib_exclus
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7/multilib.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7/multilib.h:1.2 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7/multilib.h:1.2.6.1
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7/multilib.h:1.2	Sat Mar  1 10:00:50 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7/multilib.h	Thu Jun  4 05:40:48 2015
@@ -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 @@ NULL
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@ static const char *const multilib_exclus
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/multilib.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/multilib.h:1.2 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/multilib.h:1.2.6.1
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/multilib.h:1.2	Sat Mar  1 10:00:50 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/multilib.h	Thu Jun  4 05:40:48 2015
@@ -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 @@ NULL
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@ static const char *const multilib_exclus
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/multilib.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/multilib.h:1.2 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/multilib.h:1.2.6.1
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/multilib.h:1.2	Sat Mar  1 10:00:50 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/multilib.h	Thu Jun  4 05:40:48 2015
@@ -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 @@ NULL
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@ static const char *const multilib_exclus
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/multilib.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/multilib.h:1.2 src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/multilib.h:1.2.6.1
--- src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/multilib.h:1.2	Sat Mar  1 10:00:50 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/multilib.h	Thu Jun  4 05:40:48 2015
@@ -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 @@ NULL
 };
 
 static const char *const multilib_matches_raw[] = {
+"mabi=aapcs-linux mabi=aapcs-linux;",
+"mabi=apcs-gnu mabi=apcs-gnu;",
 NULL
 };
 
@@ -21,4 +25,4 @@ static const char *const multilib_exclus
 NULL
 };
 
-static const char *multilib_options = "";
+static const char *multilib_options = "mabi=aapcs-linux/mabi=apcs-gnu";

Reply via email to