---

yaml
---
r: 159803
b: refs/heads/try
c: fcfd307
h: refs/heads/master
i:
  159801: 1c99030
  159799: 576c456
v: v3

Author: alexcrichton

[refs]

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

branches/try/.mailmap

@@ -5,8 +5,104 @@
 # email addresses.
 #
 
-Elly Jones <[email protected]>
-ILyoan <[email protected]>
+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]>
 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,6 +291,22 @@ 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
@@ -350,37 +366,40 @@ case $CFG_OSTYPE in
         # instead, msys defines $MSYSTEM which is MINGW32 on i686 and
         # MINGW64 on x86_64.
         CFG_CPUTYPE=i686
-        CFG_OSTYPE=w64-mingw32
+        CFG_OSTYPE=pc-windows-gnu
         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-mingw32
+        CFG_OSTYPE=pc-windows-gnu
         CFG_CPUTYPE=i686
         ;;
 
 #   Vista 64 bit
     CYGWIN_NT-6.0-WOW64)
-        CFG_OSTYPE=w64-mingw32
+        CFG_OSTYPE=pc-windows-gnu
         CFG_CPUTYPE=x86_64
         ;;
 
 #   Win 7 32 bit
     CYGWIN_NT-6.1)
-        CFG_OSTYPE=pc-mingw32
+        CFG_OSTYPE=pc-windows-gnu
         CFG_CPUTYPE=i686
         ;;
 
 #   Win 7 64 bit
     CYGWIN_NT-6.1-WOW64)
-        CFG_OSTYPE=w64-mingw32
+        CFG_OSTYPE=pc-windows-gnu
         CFG_CPUTYPE=x86_64
         ;;
 
@@ -466,7 +485,6 @@ 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"
@@ -487,7 +505,6 @@ 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).
@@ -501,12 +518,18 @@ 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-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
+if [ "$CFG_OSTYPE" = "pc-windows-gnu" ]
 then
     CFG_LIBDIR_RELATIVE=bin
 fi
@@ -632,7 +655,7 @@ then
 fi
 
 BIN_SUF=
-if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
+if [ "$CFG_OSTYPE" = "pc-windows-gnu" ]
 then
     BIN_SUF=.exe
 fi
@@ -842,7 +865,7 @@ CFG_PREFIX=${CFG_PREFIX%/}
 CFG_MANDIR=${CFG_MANDIR%/}
 CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
 CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
-CFG_SUPPORTED_TARGET="$(grep ^CC_*=* ${CFG_SRC_DIR}mk/platform.mk | sed -e 's/^CC_//' -e 's/\([^=]*\).*/\1/' | xargs)"
+CFG_SUPPORTED_TARGET="$(ls ${CFG_SRC_DIR}mk/cfg)"
 
 # copy host-triples to target-triples so that hosts are a subset of targets
 V_TEMP=""
@@ -989,6 +1012,7 @@ 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
 
@@ -1099,12 +1123,15 @@ do
 
     if [ ${do_reconfigure} -ne 0 ]
     then
-        msg "configuring LLVM for $t"
+        # LLVM's configure doesn't recognize the new Windows triples yet
+        gnu_t=$(to_gnu_triple $t)
+
+        msg "configuring LLVM for $gnu_t"
 
         LLVM_TARGETS="--enable-targets=x86,x86_64,arm,mips"
-        LLVM_BUILD="--build=$t"
-        LLVM_HOST="--host=$t"
-        LLVM_TARGET="--target=$t"
+        LLVM_BUILD="--build=$gnu_t"
+        LLVM_HOST="--host=$gnu_t"
+        LLVM_TARGET="--target=$gnu_t"
 
         # Disable unused LLVM features
         LLVM_OPTS="$LLVM_DBG_OPTS $LLVM_ASSERTION_OPTS --disable-docs --enable-bindings=none"
@@ -1118,7 +1145,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
-            (*-mingw32)
+            (*-windows-*)
             LLVM_OPTS="$LLVM_OPTS --disable-pthreads"
             ;;
         esac
@@ -1268,6 +1295,7 @@ 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

branches/try/mk/cfg/arm-apple-ios

@@ -0,0 +1,35 @@
+# arm-apple-ios configuration
+CFG_SDK_NAME_arm-apple-ios = iphoneos
+CFG_SDK_ARCHS_arm-apple-ios = armv7
+ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
+CFG_IOS_SDK = $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
+CFG_IOS_FLAGS = -target armv7-apple-ios -isysroot $(CFG_IOS_SDK) -mios-version-min=7.0
+CC_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
+CXX_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
+CPP_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
+AR_arm-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
+endif
+CFG_LIB_NAME_arm-apple-ios = lib$(1).a
+CFG_LIB_GLOB_arm-apple-ios = lib$(1)-*.a
+CFG_STATIC_LIB_NAME_arm-apple-ios=lib$(1).a
+CFG_LIB_DSYM_GLOB_arm-apple-ios = lib$(1)-*.a.dSYM
+CFG_CFLAGS_arm-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_FLAGS)
+CFG_GCCISH_CFLAGS_arm-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS) -mfpu=vfp3 -arch armv7
+CFG_GCCISH_CXXFLAGS_arm-apple-ios := -fno-rtti $(CFG_IOS_FLAGS) -I$(CFG_IOS_SDK)/usr/include/c++/4.2.1
+CFG_GCCISH_LINK_FLAGS_arm-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK) -Wl,-no_compact_unwind
+CFG_GCCISH_DEF_FLAG_arm-apple-ios := -Wl,-exported_symbols_list,
+CFG_GCCISH_PRE_LIB_FLAGS_arm-apple-ios :=
+CFG_GCCISH_POST_LIB_FLAGS_arm-apple-ios :=
+CFG_DEF_SUFFIX_arm-apple-ios := .darwin.def
+CFG_LLC_FLAGS_arm-apple-ios := -mattr=+vfp3,+v7,+thumb2,+neon -march=arm
+CFG_INSTALL_NAME_arm-apple-ios = -Wl,-install_name,@rpath/$(1)
+CFG_EXE_SUFFIX_arm-apple-ios :=
+CFG_WINDOWSY_arm-apple-ios :=
+CFG_UNIXY_arm-apple-ios := 1
+CFG_PATH_MUNGE_arm-apple-ios := true
+CFG_LDPATH_arm-apple-ios :=
+CFG_RUN_arm-apple-ios = $(2)
+CFG_RUN_TARG_arm-apple-ios = $(call CFG_RUN_arm-apple-ios,,$(2))
+RUSTC_FLAGS_arm-apple-ios := -C relocation_model=pic
+RUSTC_CROSS_FLAGS_arm-apple-ios :=-C relocation_model=pic
+CFG_GNU_TRIPLE_arm-apple-ios := arm-apple-ios

branches/try/mk/cfg/arm-linux-androideabi

@@ -0,0 +1,29 @@
+# arm-linux-androideabi configuration
+CC_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc
+CXX_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-g++
+CPP_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc -E
+AR_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-ar
+CFG_LIB_NAME_arm-linux-androideabi=lib$(1).so
+CFG_STATIC_LIB_NAME_arm-linux-androideabi=lib$(1).a
+CFG_LIB_GLOB_arm-linux-androideabi=lib$(1)-*.so
+CFG_LIB_DSYM_GLOB_arm-linux-androideabi=lib$(1)-*.dylib.dSYM
+CFG_CFLAGS_arm-linux-androideabi := -D__arm__ -DANDROID -D__ANDROID__ $(CFLAGS)
+CFG_GCCISH_CFLAGS_arm-linux-androideabi := -Wall -g -fPIC -D__arm__ -DANDROID -D__ANDROID__ $(CFLAGS)
+CFG_GCCISH_CXXFLAGS_arm-linux-androideabi := -fno-rtti $(CXXFLAGS)
+CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++
+CFG_GCCISH_DEF_FLAG_arm-linux-androideabi := -Wl,--export-dynamic,--dynamic-list=
+CFG_GCCISH_PRE_LIB_FLAGS_arm-linux-androideabi := -Wl,-whole-archive
+CFG_GCCISH_POST_LIB_FLAGS_arm-linux-androideabi := -Wl,-no-whole-archive
+CFG_DEF_SUFFIX_arm-linux-androideabi := .android.def
+CFG_LLC_FLAGS_arm-linux-androideabi :=
+CFG_INSTALL_NAME_arm-linux-androideabi =
+CFG_EXE_SUFFIX_arm-linux-androideabi :=
+CFG_WINDOWSY_arm-linux-androideabi :=
+CFG_UNIXY_arm-linux-androideabi := 1
+CFG_PATH_MUNGE_arm-linux-androideabi := true
+CFG_LDPATH_arm-linux-androideabi :=
+CFG_RUN_arm-linux-androideabi=
+CFG_RUN_TARG_arm-linux-androideabi=
+RUSTC_FLAGS_arm-linux-androideabi :=
+RUSTC_CROSS_FLAGS_arm-linux-androideabi :=
+CFG_GNU_TRIPLE_arm-linux-androideabi := arm-linux-androideabi

branches/try/mk/cfg/arm-unknown-linux-gnueabi

@@ -0,0 +1,30 @@
+# arm-unknown-linux-gnueabi configuration
+CROSS_PREFIX_arm-unknown-linux-gnueabi=arm-linux-gnueabi-
+CC_arm-unknown-linux-gnueabi=gcc
+CXX_arm-unknown-linux-gnueabi=g++
+CPP_arm-unknown-linux-gnueabi=gcc -E
+AR_arm-unknown-linux-gnueabi=ar
+CFG_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).so
+CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).a
+CFG_LIB_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.so
+CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.dylib.dSYM
+CFG_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfpu=vfp $(CFLAGS)
+CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfpu=vfp $(CFLAGS)
+CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabi := -fno-rtti $(CXXFLAGS)
+CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabi := -shared -fPIC -g
+CFG_GCCISH_DEF_FLAG_arm-unknown-linux-gnueabi := -Wl,--export-dynamic,--dynamic-list=
+CFG_GCCISH_PRE_LIB_FLAGS_arm-unknown-linux-gnueabi := -Wl,-whole-archive
+CFG_GCCISH_POST_LIB_FLAGS_arm-unknown-linux-gnueabi := -Wl,-no-whole-archive
+CFG_DEF_SUFFIX_arm-unknown-linux-gnueabi := .linux.def
+CFG_LLC_FLAGS_arm-unknown-linux-gnueabi :=
+CFG_INSTALL_NAME_arm-unknown-linux-gnueabi =
+CFG_EXE_SUFFIX_arm-unknown-linux-gnueabi :=
+CFG_WINDOWSY_arm-unknown-linux-gnueabi :=
+CFG_UNIXY_arm-unknown-linux-gnueabi := 1
+CFG_PATH_MUNGE_arm-unknown-linux-gnueabi := true
+CFG_LDPATH_arm-unknown-linux-gnueabi :=
+CFG_RUN_arm-unknown-linux-gnueabi=$(2)
+CFG_RUN_TARG_arm-unknown-linux-gnueabi=$(call CFG_RUN_arm-unknown-linux-gnueabi,,$(2))
+RUSTC_FLAGS_arm-unknown-linux-gnueabi :=
+RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabi :=
+CFG_GNU_TRIPLE_arm-unknown-linux-gnueabi := arm-unknown-linux-gnueabi