---

yaml
---
r: 78785
b: refs/heads/try
c: b59d503
h: refs/heads/master
i:
  78783: b5c6de8
v: v3

Author: blake2-ppc

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 25ed29a0edb3d48fef843a0b818ee68faf2252da
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 60fba4d7d677ec098e6a43014132fe99f7547363
-refs/heads/try: bed84898fca9443f97fc3db17b0417c179d25803
+refs/heads/try: b59d50368e5223d9c66c7a64c5aeff2b8e9b343f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/back/arm.rs

@@ -13,7 +13,7 @@ use driver::session::sess_os_to_meta_os;
 use driver::session;
 use metadata::loader::meta_section_name;
 
-pub fn get_target_strs(target_triple: ~str, target_os: session::os) -> target_strs::t {
+pub fn get_target_strs(target_os: session::os) -> target_strs::t {
     return target_strs::t {
         module_asm: ~"",
 
@@ -61,7 +61,13 @@ pub fn get_target_strs(target_triple: ~str, target_os: session::os) -> target_st
           }
         },
 
-        target_triple: target_triple,
+        target_triple: match target_os {
+          session::os_macos => ~"arm-apple-darwin",
+          session::os_win32 => ~"arm-pc-mingw32",
+          session::os_linux => ~"arm-unknown-linux-gnueabihf",
+          session::os_android => ~"arm-linux-androideabi",
+          session::os_freebsd => ~"arm-unknown-freebsd"
+        },
 
         cc_args: ~[~"-marm"]
     };

branches/try/src/librustc/back/mips.rs

@@ -13,7 +13,7 @@ use driver::session;
 use driver::session::sess_os_to_meta_os;
 use metadata::loader::meta_section_name;
 
-pub fn get_target_strs(target_triple: ~str, target_os: session::os) -> target_strs::t {
+pub fn get_target_strs(target_os: session::os) -> target_strs::t {
     return target_strs::t {
         module_asm: ~"",
 
@@ -61,7 +61,13 @@ pub fn get_target_strs(target_triple: ~str, target_os: session::os) -> target_st
           }
         },
 
-        target_triple: target_triple,
+        target_triple: match target_os {
+          session::os_macos => ~"mips-apple-darwin",
+          session::os_win32 => ~"mips-pc-mingw32",
+          session::os_linux => ~"mips-unknown-linux-gnu",
+          session::os_android => ~"mips-unknown-android-gnu",
+          session::os_freebsd => ~"mips-unknown-freebsd"
+        },
 
         cc_args: ~[]
     };

branches/try/src/librustc/back/x86.rs

@@ -14,7 +14,7 @@ use driver::session::sess_os_to_meta_os;
 use driver::session;
 use metadata::loader::meta_section_name;
 
-pub fn get_target_strs(target_triple: ~str, target_os: session::os) -> target_strs::t {
+pub fn get_target_strs(target_os: session::os) -> target_strs::t {
     return target_strs::t {
         module_asm: ~"",
 
@@ -44,7 +44,13 @@ pub fn get_target_strs(target_triple: ~str, target_os: session::os) -> target_st
           }
         },
 
-        target_triple: target_triple,
+        target_triple: match target_os {
+          session::os_macos => ~"i686-apple-darwin",
+          session::os_win32 => ~"i686-pc-mingw32",
+          session::os_linux => ~"i686-unknown-linux-gnu",
+          session::os_android => ~"i686-unknown-android-gnu",
+          session::os_freebsd => ~"i686-unknown-freebsd"
+        },
 
         cc_args: ~[~"-m32"]
     };

branches/try/src/librustc/back/x86_64.rs

@@ -14,7 +14,7 @@ use driver::session::sess_os_to_meta_os;
 use driver::session;
 use metadata::loader::meta_section_name;
 
-pub fn get_target_strs(target_triple: ~str, target_os: session::os) -> target_strs::t {
+pub fn get_target_strs(target_os: session::os) -> target_strs::t {
     return target_strs::t {
         module_asm: ~"",
 
@@ -52,7 +52,13 @@ pub fn get_target_strs(target_triple: ~str, target_os: session::os) -> target_st
           }
         },
 
-        target_triple: target_triple,
+        target_triple: match target_os {
+          session::os_macos => ~"x86_64-apple-darwin",
+          session::os_win32 => ~"x86_64-pc-mingw32",
+          session::os_linux => ~"x86_64-unknown-linux-gnu",
+          session::os_android => ~"x86_64-unknown-android-gnu",
+          session::os_freebsd => ~"x86_64-unknown-freebsd",
+        },
 
         cc_args: ~[~"-m64"]
     };

branches/try/src/librustc/driver/driver.rs

@@ -570,12 +570,11 @@ pub fn build_target_config(sopts: @session::options,
       abi::Arm => (ast::ty_i32, ast::ty_u32, ast::ty_f64),
       abi::Mips => (ast::ty_i32, ast::ty_u32, ast::ty_f64)
     };
-    let target_triple = sopts.target_triple.clone();
     let target_strs = match arch {
-      abi::X86 => x86::get_target_strs(target_triple, os),
-      abi::X86_64 => x86_64::get_target_strs(target_triple, os),
-      abi::Arm => arm::get_target_strs(target_triple, os),
-      abi::Mips => mips::get_target_strs(target_triple, os)
+      abi::X86 => x86::get_target_strs(os),
+      abi::X86_64 => x86_64::get_target_strs(os),
+      abi::Arm => arm::get_target_strs(os),
+      abi::Mips => mips::get_target_strs(os)
     };
     let target_cfg = @session::config {
         os: os,