---

yaml
---
r: 159802
b: refs/heads/try
c: d108613
h: refs/heads/master
v: v3

Author: steveklabnik

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: e09d98603e608c9e47d4c89f7b4dca87a4b56da3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9c96a79a74f10bed18b031ce0ac4126c56d6cfb3
-refs/heads/try: 8a25e071e8ca281189663d23de5e317e87004a48
+refs/heads/try: d108613ba00edea07ff7e233e3e9c0766132cd3e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/.mailmap

@@ -5,104 +5,8 @@
 # email addresses.
 #
 
-Aaron Todd <[email protected]>
-Ahmed Charles <[email protected]> <[email protected]>
-Alex Lyon <[email protected]> <[email protected]>
-Alex Rønne Petersen <[email protected]>
-Andreas Gal <[email protected]> <[email protected]>
-Andrew Poelstra <[email protected]> <[email protected]>
-Anton Löfgren <[email protected]> <[email protected]>
-Ariel Ben-Yehuda <[email protected]> <[email protected]>
-Austin Seipp <[email protected]> <[email protected]>
-Ben Alpert <[email protected]> <[email protected]>
-Benjamin Jackman <[email protected]>
-Björn Steinbrink <[email protected]> <[email protected]>
-blake2-ppc <[email protected]> <blake2-ppc>
-Boris Egorov <[email protected]> <[email protected]>
-Brian Anderson <[email protected]> <[email protected]>
-Brian Dawn <[email protected]>
-Carl-Anton Ingmarsson <[email protected]> <[email protected]>
-Carol Willing <[email protected]>
-Chris Pressey <[email protected]>
-Clark Gaebel <[email protected]> <[email protected]>
-David Klein <[email protected]>
-David Manescu <[email protected]> <[email protected]>
-Damien Schoof <[email protected]>
-Derek Chiang <[email protected]> Derek Chiang (Enchi Jiang) <[email protected]>
-Dylan Braithwaite <[email protected]> <[email protected]>
-Eduardo Bautista <[email protected]> <[email protected]>
-Eduardo Bautista <[email protected]> <=>
-Elliott Slaughter <[email protected]> <[email protected]>
-Elly Fong-Jones <[email protected]>
-Eric Holk <[email protected]> <[email protected]>
-Eric Holk <[email protected]> <[email protected]>
-Eric Holmes <[email protected]>
-Eric Reed <[email protected]> <[email protected]>
-Erick Tryzelaar <[email protected]> <[email protected]>
-Evgeny Sologubov
-Falco Hirschenberger <[email protected]> <[email protected]>
-Gareth Daniel Smith <[email protected]>
-Georges Dubus <[email protected]> <[email protected]>
-Graham Fawcett <[email protected]> <[email protected]>
-Graydon Hoare <[email protected]> <[email protected]>
-Heather <[email protected]> <[email protected]>
-Heather <[email protected]> <[email protected]>
-Ilyong Cho <[email protected]>
-J. J. Weber <[email protected]>
-Jakub Bukaj <[email protected]>
-Jakub Bukaj <[email protected]> <[email protected]>
-James Deng <[email protected]> <[email protected]>
-James Miller <[email protected]> <[email protected]>
-Jason Orendorff <[email protected]> <[email protected]>
-Jason Orendorff <[email protected]> <[email protected]>
-Jeremy Letang <[email protected]>
-Jihyun Yu <[email protected]> jihyun <[email protected]>
-Jihyun Yu <[email protected]> <[email protected]>
-John Clements <[email protected]> <[email protected]>
-Jorge Aparicio <[email protected]> <[email protected]>
-Jonathan Bailey <[email protected]> <[email protected]>
+Elly Jones <[email protected]>
+ILyoan <[email protected]>
 Junyoung Cho <[email protected]>
-Jyun-Yan You <[email protected]> <[email protected]>
-Kang Seonghoon <[email protected]> <[email protected]>
-Keegan McAllister <[email protected]> <[email protected]>
-Kyeongwoon Lee <[email protected]>
-Lee Wondong <[email protected]>
-Lennart Kudling <[email protected]>
-Lindsey Kuper <[email protected]> <[email protected]>
-Lindsey Kuper <[email protected]> <[email protected]>
-Luqman Aden <[email protected]> <[email protected]>
-Luqman Aden <[email protected]> <[email protected]>
-Luke Metz <[email protected]>
-Makoto Nakashima <[email protected]> <[email protected]>
-Makoto Nakashima <[email protected]> gifnksm <[email protected]>
-Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
-Mark Sinclair <[email protected]>
-Mark Sinclair <[email protected]> =Mark Sinclair <[email protected]>
-Matt Brubeck <[email protected]> <[email protected]>
-Matthew Auld <[email protected]>
-Matthew McPherrin <[email protected]> <[email protected]>
 Matthijs Hofstra <[email protected]>
-Michael Williams <[email protected]>
-Michael Woerister <michaelwoerister@gmail> <[email protected]>
-Michael Woerister <michaelwoerister@gmail> <michaelwoerister@posteo>
-Neil Pankey <[email protected]> <[email protected]>
-Philipp Brüschweiler <[email protected]> <[email protected]>
-Philipp Brüschweiler <[email protected]> <[email protected]>
-Pradeep Kumar <[email protected]>
-Richard Diamond <[email protected]> <[email protected]>
 Rob Arnold <[email protected]>
-Robert Gawdzik <[email protected]> Robert Gawdzik ☢ <[email protected]>
-Robert Millar <[email protected]>
-Ryan Scheel <[email protected]>
-Seonghyun Kim <[email protected]>
-Simon Barber-Dueck <[email protected]> Simon BD <simon@server>
-Simon Sapin <[email protected]> <[email protected]>
-startling <[email protected]>
-Steven Fackler <[email protected]> <[email protected]>
-Steven Stewart-Gallus <[email protected]> <[email protected]>
-Tim Chevalier <[email protected]> <[email protected]>
-Torsten Weber <[email protected]> <[email protected]>
-William Ting <[email protected]> <[email protected]>
-Youngsoo Son <[email protected]> <[email protected]>
-Zack Corr <[email protected]> <[email protected]>
-Zack Slayton <[email protected]>

branches/try/configure

@@ -291,22 +291,6 @@ envopt() {
     fi
 }
 
-to_llvm_triple() {
-    case $1 in
-        i686-w64-mingw32) echo i686-pc-windows-gnu ;;
-        x86_64-w64-mingw32) echo x86_64-pc-windows-gnu ;;
-        *) echo $1 ;;
-    esac
-}
-
-to_gnu_triple() {
-    case $1 in
-        i686-pc-windows-gnu) echo i686-w64-mingw32 ;;
-        x86_64-pc-windows-gnu) echo x86_64-w64-mingw32 ;;
-        *) echo $1 ;;
-    esac
-}
-
 msg "looking for configure programs"
 need_cmd cmp
 need_cmd mkdir
@@ -366,40 +350,37 @@ case $CFG_OSTYPE in
         # instead, msys defines $MSYSTEM which is MINGW32 on i686 and
         # MINGW64 on x86_64.
         CFG_CPUTYPE=i686
-        CFG_OSTYPE=pc-windows-gnu
+        CFG_OSTYPE=w64-mingw32
         if [ "$MSYSTEM" = MINGW64 ]
         then
             CFG_CPUTYPE=x86_64
+            CFG_OSTYPE=w64-mingw32
         fi
         ;;
 
-    MSYS*)
-        CFG_OSTYPE=pc-windows-gnu
-        ;;
-
 # Thad's Cygwin identifers below
 
 #   Vista 32 bit
     CYGWIN_NT-6.0)
-        CFG_OSTYPE=pc-windows-gnu
+        CFG_OSTYPE=pc-mingw32
         CFG_CPUTYPE=i686
         ;;
 
 #   Vista 64 bit
     CYGWIN_NT-6.0-WOW64)
-        CFG_OSTYPE=pc-windows-gnu
+        CFG_OSTYPE=w64-mingw32
         CFG_CPUTYPE=x86_64
         ;;
 
 #   Win 7 32 bit
     CYGWIN_NT-6.1)
-        CFG_OSTYPE=pc-windows-gnu
+        CFG_OSTYPE=pc-mingw32
         CFG_CPUTYPE=i686
         ;;
 
 #   Win 7 64 bit
     CYGWIN_NT-6.1-WOW64)
-        CFG_OSTYPE=pc-windows-gnu
+        CFG_OSTYPE=w64-mingw32
         CFG_CPUTYPE=x86_64
         ;;
 
@@ -485,6 +466,7 @@ opt llvm-assertions 1 "build LLVM with assertions"
 opt debug 1 "build with extra debug fun"
 opt ratchet-bench 0 "ratchet benchmarks"
 opt fast-make 0 "use .gitmodules as timestamp for submodule deps"
+opt mingw-cross 0 "cross-compile for win32 using mingw"
 opt ccache 0 "invoke gcc/clang via ccache to reuse object files between builds"
 opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
 opt llvm-static-stdcpp 0 "statically link to libstdc++ for LLVM"
@@ -505,6 +487,7 @@ valopt llvm-root "" "set LLVM root"
 valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located"
 valopt build "${DEFAULT_BUILD}" "GNUs ./configure syntax LLVM build triple"
 valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path"
+valopt mingw32-cross-path "" "MinGW32 cross compiler path"
 
 # Many of these are saved below during the "writing configuration" step
 # (others are conditionally saved).
@@ -518,18 +501,12 @@ valopt_nosave target "${CFG_HOST}" "GNUs ./configure syntax LLVM target triples"
 valopt_nosave mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
 valopt_nosave release-channel "dev" "the name of the release channel to build"
 
-# Temporarily support old triples until buildbots get updated
-CFG_BUILD=$(to_llvm_triple $CFG_BUILD)
-putvar CFG_BUILD # Yes, this creates a duplicate entry, but the last one wins.
-CFG_HOST=$(to_llvm_triple $CFG_HOST)
-CFG_TARGET=$(to_llvm_triple $CFG_TARGET)
-
 # On windows we just store the libraries in the bin directory because
 # there's no rpath. This is where the build system itself puts libraries;
 # --libdir is used to configure the installation directory.
 # FIXME: This needs to parameterized over target triples. Do it in platform.mk
 CFG_LIBDIR_RELATIVE=lib
-if [ "$CFG_OSTYPE" = "pc-windows-gnu" ]
+if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
 then
     CFG_LIBDIR_RELATIVE=bin
 fi
@@ -655,7 +632,7 @@ then
 fi
 
 BIN_SUF=
-if [ "$CFG_OSTYPE" = "pc-windows-gnu" ]
+if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
 then
     BIN_SUF=.exe
 fi
@@ -865,7 +842,7 @@ CFG_PREFIX=${CFG_PREFIX%/}
 CFG_MANDIR=${CFG_MANDIR%/}
 CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
 CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
-CFG_SUPPORTED_TARGET="$(ls ${CFG_SRC_DIR}mk/cfg)"
+CFG_SUPPORTED_TARGET="$(grep ^CC_*=* ${CFG_SRC_DIR}mk/platform.mk | sed -e 's/^CC_//' -e 's/\([^=]*\).*/\1/' | xargs)"
 
 # copy host-triples to target-triples so that hosts are a subset of targets
 V_TEMP=""
@@ -1012,7 +989,6 @@ do
     make_dir $h/test/doc-guide-container
     make_dir $h/test/doc-guide-tasks
     make_dir $h/test/doc-guide-plugin
-    make_dir $h/test/doc-guide-crates
     make_dir $h/test/doc-rust
 done
 
@@ -1123,15 +1099,12 @@ do
 
     if [ ${do_reconfigure} -ne 0 ]
     then
-        # LLVM's configure doesn't recognize the new Windows triples yet
-        gnu_t=$(to_gnu_triple $t)
-
-        msg "configuring LLVM for $gnu_t"
+        msg "configuring LLVM for $t"
 
         LLVM_TARGETS="--enable-targets=x86,x86_64,arm,mips"
-        LLVM_BUILD="--build=$gnu_t"
-        LLVM_HOST="--host=$gnu_t"
-        LLVM_TARGET="--target=$gnu_t"
+        LLVM_BUILD="--build=$t"
+        LLVM_HOST="--host=$t"
+        LLVM_TARGET="--target=$t"
 
         # Disable unused LLVM features
         LLVM_OPTS="$LLVM_DBG_OPTS $LLVM_ASSERTION_OPTS --disable-docs --enable-bindings=none"
@@ -1145,7 +1118,7 @@ do
         # (llvm's configure tries to find pthread first, so we have to disable it explicitly.)
         # Also note that pthreads works badly on mingw-w64 systems: #8996
         case "$CFG_BUILD" in
-            (*-windows-*)
+            (*-mingw32)
             LLVM_OPTS="$LLVM_OPTS --disable-pthreads"
             ;;
         esac
@@ -1295,7 +1268,6 @@ putvar CFG_HOST
 putvar CFG_TARGET
 putvar CFG_LIBDIR_RELATIVE
 putvar CFG_DISABLE_MANAGE_SUBMODULES
-putvar CFG_ANDROID_CROSS_PATH
 putvar CFG_MANDIR
 
 # Avoid spurious warnings from clang by feeding it original source on