Update MinGW prebuilts to build 6159401

Includes cherry-pick of
  headers: Avoid builtin clash with _xgetbv in Clang 9
    (https://android-review.googlesource.com/c/toolchain/mingw/+/1217556)

Test: presubmit
Change-Id: I4f541b4ecc9f84f967540a93b25de080c311c91f

18 files changed, 46 insertions, 46 deletions

diff --git a/lib/gcc/x86_64-w64-mingw32/4.8.3/32/crtfastmath.o b/lib/gcc/x86_64-w64-mingw32/4.8.3/32/crtfastmath.o
index 9d15b292..57ce6f96 100644
--- a/lib/gcc/x86_64-w64-mingw32/4.8.3/32/crtfastmath.o
+++ b/lib/gcc/x86_64-w64-mingw32/4.8.3/32/crtfastmath.o
diff --git a/lib/gcc/x86_64-w64-mingw32/4.8.3/32/libgcc.a b/lib/gcc/x86_64-w64-mingw32/4.8.3/32/libgcc.a
index 14a29cab..ac2d85c3 100644
--- a/lib/gcc/x86_64-w64-mingw32/4.8.3/32/libgcc.a
+++ b/lib/gcc/x86_64-w64-mingw32/4.8.3/32/libgcc.a
diff --git a/lib/gcc/x86_64-w64-mingw32/4.8.3/32/libgcc_eh.a b/lib/gcc/x86_64-w64-mingw32/4.8.3/32/libgcc_eh.a
index 9a9ede74..d8d07ff5 100644
--- a/lib/gcc/x86_64-w64-mingw32/4.8.3/32/libgcc_eh.a
+++ b/lib/gcc/x86_64-w64-mingw32/4.8.3/32/libgcc_eh.a
diff --git a/lib/gcc/x86_64-w64-mingw32/4.8.3/32/libgcov.a b/lib/gcc/x86_64-w64-mingw32/4.8.3/32/libgcov.a
index cf002fa2..d7ee8e13 100644
--- a/lib/gcc/x86_64-w64-mingw32/4.8.3/32/libgcov.a
+++ b/lib/gcc/x86_64-w64-mingw32/4.8.3/32/libgcov.a
diff --git a/lib/gcc/x86_64-w64-mingw32/4.8.3/crtfastmath.o b/lib/gcc/x86_64-w64-mingw32/4.8.3/crtfastmath.o
index 21f69867..c710effb 100644
--- a/lib/gcc/x86_64-w64-mingw32/4.8.3/crtfastmath.o
+++ b/lib/gcc/x86_64-w64-mingw32/4.8.3/crtfastmath.o
diff --git a/lib/gcc/x86_64-w64-mingw32/4.8.3/install-tools/mkheaders.conf b/lib/gcc/x86_64-w64-mingw32/4.8.3/install-tools/mkheaders.conf
index 8b1c6342..80354271 100644
--- a/lib/gcc/x86_64-w64-mingw32/4.8.3/install-tools/mkheaders.conf
+++ b/lib/gcc/x86_64-w64-mingw32/4.8.3/install-tools/mkheaders.conf
@@ -1,3 +1,3 @@
-SYSTEM_HEADER_DIR="/work/src/mingw/out/install/x86_64-w64-mingw32-4.8${sysroot_headers_suffix}/mingw/include"
+SYSTEM_HEADER_DIR="/buildbot/src/android/mingw/out/install/x86_64-w64-mingw32-4.8${sysroot_headers_suffix}/mingw/include"
 OTHER_FIXINCLUDES_DIRS=""
 STMP_FIXINC="stmp-fixinc"
diff --git a/lib/gcc/x86_64-w64-mingw32/4.8.3/libgcc.a b/lib/gcc/x86_64-w64-mingw32/4.8.3/libgcc.a
index 2dd66fd0..c5020ccd 100644
--- a/lib/gcc/x86_64-w64-mingw32/4.8.3/libgcc.a
+++ b/lib/gcc/x86_64-w64-mingw32/4.8.3/libgcc.a
diff --git a/lib/gcc/x86_64-w64-mingw32/4.8.3/libgcc_eh.a b/lib/gcc/x86_64-w64-mingw32/4.8.3/libgcc_eh.a
index 30e57873..fdecfa0a 100644
--- a/lib/gcc/x86_64-w64-mingw32/4.8.3/libgcc_eh.a
+++ b/lib/gcc/x86_64-w64-mingw32/4.8.3/libgcc_eh.a
diff --git a/lib/gcc/x86_64-w64-mingw32/4.8.3/libgcov.a b/lib/gcc/x86_64-w64-mingw32/4.8.3/libgcov.a
index d2afc144..e4102151 100644
--- a/lib/gcc/x86_64-w64-mingw32/4.8.3/libgcov.a
+++ b/lib/gcc/x86_64-w64-mingw32/4.8.3/libgcov.a
diff --git a/lib/gcc/x86_64-w64-mingw32/4.8.3/plugin/gtype.state b/lib/gcc/x86_64-w64-mingw32/4.8.3/plugin/gtype.state
index ed8dcaf7..db294016 100644
--- a/lib/gcc/x86_64-w64-mingw32/4.8.3/plugin/gtype.state
+++ b/lib/gcc/x86_64-w64-mingw32/4.8.3/plugin/gtype.state
@@ -6,7 +6,7 @@
 
 (!version  "4.8.3")
 
-(!srcdir  "/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc")
+(!srcdir  "/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc")
 
 (!languages 9 ada c cp fortran go java lto objc objcp)
 
@@ -334,12 +334,12 @@ nil )
 (!srcfileloc  "tree.h" 437)
 nil )
 (!pair  "u"
-(!type union 12 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/tree.h:439"
+(!type union 12 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/tree.h:439"
 (!srcfileloc  "tree.h" 472)
 
 (!fields 3 
 (!pair  "bits"
-(!type struct 13 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/tree.h:442"
+(!type struct 13 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/tree.h:442"
 (!srcfileloc  "tree.h" 464)
 
 (!fields 15 
@@ -8074,7 +8074,7 @@ nil )
 (!srcfileloc  "gimple.h" 285)
 nil )
 (!pair  "u"
-(!type union 323 nil  gc_used "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/gimple.h:288"
+(!type union 323 nil  gc_used "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/gimple.h:288"
 (!srcfileloc  "gimple.h" 291)
 
 (!fields 2 
@@ -8345,7 +8345,7 @@ nil )
 )
 )
 (!pair  "loc"
-(!type union 336 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/tree.h:1960"
+(!type union 336 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/tree.h:1960"
 (!srcfileloc  "tree.h" 1960)
 
 (!fields 2 
@@ -8992,7 +8992,7 @@ nil 511 nil )
 )
 )
 (!pair  "x"
-(!type struct 361 nil  gc_used "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/basic-block.h:199"
+(!type struct 361 nil  gc_used "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/basic-block.h:199"
 (!srcfileloc  "basic-block.h" 202)
 
 (!fields 2 
@@ -15891,7 +15891,7 @@ nil )
 
 (!fields 11 
 (!pair  "u"
-(!type union 590 nil  gc_used "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/c/c-decl.c:188"
+(!type union 590 nil  gc_used "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/c/c-decl.c:188"
 (!srcfileloc  "c/c-decl.c" 191)
 
 (!fields 2 
@@ -17131,7 +17131,7 @@ nil 0 nil )
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 653 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/java/expr.c:2058"nil 
+(!type struct 653 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/java/expr.c:2058"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -17268,11 +17268,11 @@ nil )
 nil ))
 nil 8 nil )
 
-(!type struct 663 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/fortran/trans.h:334"nil 
+(!type struct 663 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/fortran/trans.h:334"nil 
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 664 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/fortran/trans.h:322"nil 
+(!type struct 664 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/fortran/trans.h:322"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -17296,7 +17296,7 @@ nil 0 nil )
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 670 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/fortran/trans.h:31"nil 
+(!type struct 670 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/fortran/trans.h:31"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -18633,7 +18633,7 @@ nil ))
 
 (!type already_seen 112)
 
-(!type struct 759 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/c/c-parser.c:5589"nil 
+(!type struct 759 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/c/c-parser.c:5589"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -18744,7 +18744,7 @@ nil 130 nil )
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 765 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/c-family/c-pragma.c:1160"nil 
+(!type struct 765 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/c-family/c-pragma.c:1160"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -19317,7 +19317,7 @@ nil ))
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 821 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/ada/gcc-interface/decl.c:172"nil 
+(!type struct 821 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/ada/gcc-interface/decl.c:172"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -20070,7 +20070,7 @@ nil 0 nil )
 nil ))
 nil 511 nil )
 
-(!type struct 903 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/lto-streamer.h:451"nil 
+(!type struct 903 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/lto-streamer.h:451"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -20082,7 +20082,7 @@ nil 0 nil )
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 906 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/lto-streamer.h:426"nil 
+(!type struct 906 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/lto-streamer.h:426"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -21471,15 +21471,15 @@ nil 0 nil )
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 1004 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/config/i386/i386.c:31237"nil 
+(!type struct 1004 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/config/i386/i386.c:31237"nil 
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 1005 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/config/i386/i386.c:30762"nil 
+(!type struct 1005 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/config/i386/i386.c:30762"nil 
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 1006 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/config/i386/i386.c:30075"nil 
+(!type struct 1006 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/config/i386/i386.c:30075"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -21731,7 +21731,7 @@ nil 0 nil )
 (!fields 0 )
 nil 0 nil )
 
-(!type union 1052 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/tree-eh.c:41"nil 
+(!type union 1052 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/tree-eh.c:41"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -21743,7 +21743,7 @@ nil 0 nil )
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 1055 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/tree-flow.h:571"nil 
+(!type struct 1055 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/tree-flow.h:571"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -21792,7 +21792,7 @@ nil 0 nil )
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 1063 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/tree-flow.h:103"nil 
+(!type struct 1063 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/tree-flow.h:103"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -21884,7 +21884,7 @@ nil 0 nil )
 
 (!type already_seen 312)
 
-(!type struct 1069 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/gimple.h:134"nil 
+(!type struct 1069 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/gimple.h:134"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -21903,11 +21903,11 @@ nil ))
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 1072 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/varasm.c:4712"nil 
+(!type struct 1072 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/varasm.c:4712"nil 
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 1073 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/varasm.c:4464"nil 
+(!type struct 1073 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/varasm.c:4464"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -22000,7 +22000,7 @@ nil 0 nil )
 (!fields 0 )
 nil 0 nil )
 
-(!type union 1087 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/mcf.c:344"nil 
+(!type union 1087 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/mcf.c:344"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -22823,7 +22823,7 @@ nil ))
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 1179 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/dwarf2cfi.c:192"nil 
+(!type struct 1179 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/dwarf2cfi.c:192"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -22831,7 +22831,7 @@ nil 0 nil )
 (!type pointer 1181 nil  gc_unused
 (!type already_seen 1180)
 )
- gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/dwarf2cfi.c:98"nil 
+ gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/dwarf2cfi.c:98"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -23330,11 +23330,11 @@ nil 511 nil )
 
 (!type already_seen 940)
 
-(!type struct 1238 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/cgraph.h:363"nil 
+(!type struct 1238 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/cgraph.h:363"nil 
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 1239 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/cgraph.h:356"nil 
+(!type struct 1239 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/cgraph.h:356"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -23420,7 +23420,7 @@ nil 511 nil )
 
 (!type already_seen 920)
 
-(!type struct 1246 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/basic-block.h:574"nil 
+(!type struct 1246 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/basic-block.h:574"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -23468,7 +23468,7 @@ nil 0 nil )
 
 (!type already_seen 878)
 
-(!type struct 1254 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/cfgloop.h:544"nil 
+(!type struct 1254 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/cfgloop.h:544"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -24387,7 +24387,7 @@ nil 511 nil )
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 1304 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/tree.h:5525"nil 
+(!type struct 1304 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/tree.h:5525"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -24944,7 +24944,7 @@ nil 511 nil )
 
 (!type already_seen 259)
 
-(!type struct 1323 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/rtl.h:116"nil 
+(!type struct 1323 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/rtl.h:116"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -25002,7 +25002,7 @@ nil ))
 )
 511 nil )
 
-(!type struct 1329 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/bitmap.h:316"nil 
+(!type struct 1329 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/bitmap.h:316"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -25104,11 +25104,11 @@ nil 0 nil )
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 1345 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/../libcpp/include/cpplib.h:984"nil 
+(!type struct 1345 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/../libcpp/include/cpplib.h:984"nil 
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 1346 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/../libcpp/include/cpplib.h:973"nil 
+(!type struct 1346 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/../libcpp/include/cpplib.h:973"nil 
 (!fields 0 )
 nil 0 nil )
 
@@ -25162,7 +25162,7 @@ nil 0 nil )
 (!fields 0 )
 nil 0 nil )
 
-(!type struct 1355 nil  gc_unused "anonymous:/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/../libcpp/include/line-map.h:627"nil 
+(!type struct 1355 nil  gc_unused "anonymous:/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/../libcpp/include/line-map.h:627"nil 
 (!fields 0 )
 nil 0 nil )
 
diff --git a/lib/gcc/x86_64-w64-mingw32/4.8.3/plugin/include/configargs.h b/lib/gcc/x86_64-w64-mingw32/4.8.3/plugin/include/configargs.h
index 6b852c2d..84446e6e 100644
--- a/lib/gcc/x86_64-w64-mingw32/4.8.3/plugin/include/configargs.h
+++ b/lib/gcc/x86_64-w64-mingw32/4.8.3/plugin/include/configargs.h
@@ -1,5 +1,5 @@
 /* Generated automatically. */
-static const char configuration_arguments[] = "/work/src/mingw/toolchain/gcc/gcc-4.8.3/configure --prefix=/work/src/mingw/out/install/x86_64-w64-mingw32-4.8 --disable-shared --with-gmp=/work/src/mingw/out/install/x86_64-w64-mingw32-4.8 --with-mpfr=/work/src/mingw/out/install/x86_64-w64-mingw32-4.8 --with-mpc=/work/src/mingw/out/install/x86_64-w64-mingw32-4.8 --target=x86_64-w64-mingw32 --enable-targets=all --enable-languages=c,c++ --with-sysroot=/work/src/mingw/out/install/x86_64-w64-mingw32-4.8 --enable-threads=posix --enable-shared=libgcc";
+static const char configuration_arguments[] = "/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/configure --prefix=/buildbot/src/android/mingw/out/install/x86_64-w64-mingw32-4.8 --disable-shared --with-gmp=/buildbot/src/android/mingw/out/install/x86_64-w64-mingw32-4.8 --with-mpfr=/buildbot/src/android/mingw/out/install/x86_64-w64-mingw32-4.8 --with-mpc=/buildbot/src/android/mingw/out/install/x86_64-w64-mingw32-4.8 --target=x86_64-w64-mingw32 --enable-targets=all --enable-languages=c,c++ --with-sysroot=/buildbot/src/android/mingw/out/install/x86_64-w64-mingw32-4.8 --enable-threads=posix --enable-shared=libgcc";
 static const char thread_model[] = "posix";
 
 static const struct {
diff --git a/lib/gcc/x86_64-w64-mingw32/4.8.3/plugin/include/tm-preds.h b/lib/gcc/x86_64-w64-mingw32/4.8.3/plugin/include/tm-preds.h
index 826809df..30ddd252 100644
--- a/lib/gcc/x86_64-w64-mingw32/4.8.3/plugin/include/tm-preds.h
+++ b/lib/gcc/x86_64-w64-mingw32/4.8.3/plugin/include/tm-preds.h
@@ -1,5 +1,5 @@
 /* Generated automatically by the program 'build/genpreds'
-   from the machine description file '/work/src/mingw/toolchain/gcc/gcc-4.8.3/gcc/config/i386/i386.md'.  */
+   from the machine description file '/buildbot/src/android/mingw/toolchain/gcc/gcc-4.8.3/gcc/config/i386/i386.md'.  */
 
 #ifndef GCC_TM_PREDS_H
 #define GCC_TM_PREDS_H
diff --git a/lib/libgmp.a b/lib/libgmp.a
index 0bcfc2f4..b5d2dc33 100644
--- a/lib/libgmp.a
+++ b/lib/libgmp.a
diff --git a/lib/libgmp.la b/lib/libgmp.la
index caa2f990..458edc56 100755
--- a/lib/libgmp.la
+++ b/lib/libgmp.la
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/work/src/mingw/out/install/x86_64-w64-mingw32-4.8/lib'
+libdir='/buildbot/src/android/mingw/out/install/x86_64-w64-mingw32-4.8/lib'
diff --git a/lib/libmpc.a b/lib/libmpc.a
index cb95141c..823f3e4c 100644
--- a/lib/libmpc.a
+++ b/lib/libmpc.a
diff --git a/lib/libmpc.la b/lib/libmpc.la
index b14ed795..9ef5a230 100755
--- a/lib/libmpc.la
+++ b/lib/libmpc.la
@@ -17,7 +17,7 @@ old_library='libmpc.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/work/src/mingw/out/install/x86_64-w64-mingw32-4.8/lib /work/src/mingw/out/install/x86_64-w64-mingw32-4.8/lib/libmpfr.la /work/src/mingw/out/install/x86_64-w64-mingw32-4.8/lib/libgmp.la -lm'
+dependency_libs=' -L/buildbot/src/android/mingw/out/install/x86_64-w64-mingw32-4.8/lib /buildbot/src/android/mingw/out/install/x86_64-w64-mingw32-4.8/lib/libmpfr.la /buildbot/src/android/mingw/out/install/x86_64-w64-mingw32-4.8/lib/libgmp.la -lm'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/work/src/mingw/out/install/x86_64-w64-mingw32-4.8/lib'
+libdir='/buildbot/src/android/mingw/out/install/x86_64-w64-mingw32-4.8/lib'
diff --git a/lib/libmpfr.a b/lib/libmpfr.a
index f3166e1a..0cf536ca 100644
--- a/lib/libmpfr.a
+++ b/lib/libmpfr.a
diff --git a/lib/libmpfr.la b/lib/libmpfr.la
index acf17f73..2a5c8142 100755
--- a/lib/libmpfr.la
+++ b/lib/libmpfr.la
@@ -17,7 +17,7 @@ old_library='libmpfr.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/work/src/mingw/out/install/x86_64-w64-mingw32-4.8/lib /work/src/mingw/out/install/x86_64-w64-mingw32-4.8/lib/libgmp.la'
+dependency_libs=' -L/buildbot/src/android/mingw/out/install/x86_64-w64-mingw32-4.8/lib /buildbot/src/android/mingw/out/install/x86_64-w64-mingw32-4.8/lib/libgmp.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/work/src/mingw/out/install/x86_64-w64-mingw32-4.8/lib'
+libdir='/buildbot/src/android/mingw/out/install/x86_64-w64-mingw32-4.8/lib'