---

yaml
---
r: 136575
b: refs/heads/dist-snap
c: b2b0737
h: refs/heads/master
i:
  136573: 2985b73
  136571: 4b3b043
  136567: 622ab3c
  136559: 644bd48
  136543: 398965f
  136511: 21f0ef5
  136447: 404d2e8
v: v3

Author: colrdavidson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 189b7332968972f34cdbbbd9b62d97ababf53059
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 72841b128df8b6a4eb88b1048548e2eec5244449
+refs/heads/dist-snap: b2b0737fbe1b4be62cb3656dabf69c0eb7c5a89e
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/etc/make-win-dist.py

@@ -58,15 +58,15 @@ def make_win_dist(dist_root, target_triple):
     for src in rustc_dlls:
         shutil.copy(src, dist_bin_dir)
 
-    # Copy platform tools to platform-specific bin directory
-    target_bin_dir = os.path.join(dist_root, "bin", "rustlib", target_triple, "gcc", "bin")
+    # Copy platform tools (and another copy of runtime dlls) to platform-spcific bin directory
+    target_bin_dir = os.path.join(dist_root, "bin", "rustlib", target_triple, "bin")
     if not os.path.exists(target_bin_dir):
         os.makedirs(target_bin_dir)
     for src in target_tools:
         shutil.copy(src, target_bin_dir)
 
     # Copy platform libs to platform-spcific lib directory
-    target_lib_dir = os.path.join(dist_root, "bin", "rustlib", target_triple, "gcc", "lib")
+    target_lib_dir = os.path.join(dist_root, "bin", "rustlib", target_triple, "lib")
     if not os.path.exists(target_lib_dir):
         os.makedirs(target_lib_dir)
     for src in target_libs:

branches/dist-snap/src/librustc/driver/config.rs

@@ -176,10 +176,10 @@ debugging_opts!(
         SHOW_SPAN,
         COUNT_TYPE_SIZES,
         META_STATS,
-        NO_OPT,
         GC,
         PRINT_LINK_ARGS,
         PRINT_LLVM_PASSES,
+        LTO,
         AST_JSON,
         AST_JSON_NOEXPAND,
         LS,
@@ -211,13 +211,13 @@ pub fn debugging_opts_map() -> Vec<(&'static str, &'static str, u64)> {
      ("count-type-sizes", "count the sizes of aggregate types",
       COUNT_TYPE_SIZES),
      ("meta-stats", "gather metadata statistics", META_STATS),
-     ("no-opt", "do not optimize, even if -O is passed", NO_OPT),
      ("print-link-args", "Print the arguments passed to the linker",
       PRINT_LINK_ARGS),
      ("gc", "Garbage collect shared data (experimental)", GC),
      ("print-llvm-passes",
       "Prints the llvm optimization passes being run",
       PRINT_LLVM_PASSES),
+     ("lto", "Perform LLVM link-time optimizations", LTO),
      ("ast-json", "Print the AST as JSON and halt", AST_JSON),
      ("ast-json-noexpand", "Print the pre-expansion AST as JSON and halt", AST_JSON_NOEXPAND),
      ("ls", "List the symbols defined by a library crate", LS),
@@ -351,8 +351,6 @@ cgoptions!(
         "system linker to link outputs with"),
     link_args: Vec<String> = (Vec::new(), parse_list,
         "extra arguments to pass to the linker (space separated)"),
-    lto: bool = (false, parse_bool,
-        "perform LLVM link-time optimizations"),
     target_cpu: String = ("generic".to_string(), parse_string,
         "select target processor (llc -mcpu=help for details)"),
     target_feature: String = ("".to_string(), parse_string,
@@ -714,9 +712,7 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
     let target = matches.opt_str("target").unwrap_or(
         driver::host_triple().to_string());
     let opt_level = {
-        if (debugging_opts & NO_OPT) != 0 {
-            No
-        } else if matches.opt_present("O") {
+        if matches.opt_present("O") {
             if matches.opt_present("opt-level") {
                 early_error("-O and --opt-level both provided");
             }

branches/dist-snap/src/librustc/driver/driver.rs

@@ -560,8 +560,8 @@ pub fn phase_6_link_output(sess: &Session,
                            trans: &CrateTranslation,
                            outputs: &OutputFilenames) {
     let old_path = os::getenv("PATH").unwrap_or_else(||String::new());
-    let mut new_path = sess.host_filesearch().get_tools_search_paths();
-    new_path.push_all_move(os::split_paths(old_path.as_slice()));
+    let mut new_path = os::split_paths(old_path.as_slice());
+    new_path.push_all_move(sess.host_filesearch().get_tools_search_paths());
     os::setenv("PATH", os::join_paths(new_path.as_slice()).unwrap());
 
     time(sess.time_passes(), "linking", (), |_|

branches/dist-snap/src/librustc/driver/session.rs

@@ -168,7 +168,7 @@ impl Session {
         self.debugging_opt(config::PRINT_LLVM_PASSES)
     }
     pub fn lto(&self) -> bool {
-        self.opts.cg.lto
+        self.debugging_opt(config::LTO)
     }
     pub fn no_landing_pads(&self) -> bool {
         self.debugging_opt(config::NO_LANDING_PADS)

branches/dist-snap/src/librustc/metadata/filesearch.rs

@@ -150,12 +150,8 @@ impl<'a> FileSearch<'a> {
         p.push(find_libdir(self.sysroot));
         p.push(rustlibdir());
         p.push(self.triple);
-        let mut p1 = p.clone();
-        p1.push("bin");
-        let mut p2 = p.clone();
-        p2.push("gcc");
-        p2.push("bin");
-        vec![p1, p2]
+        p.push("bin");
+        vec![p]
     }
 }
 

branches/dist-snap/src/librustc/middle/resolve.rs

@@ -2928,7 +2928,7 @@ impl<'a> Resolver<'a> {
                             Some(span) => {
                                 self.session
                                     .span_note(span,
-                                               "conflicting value here");
+                                               "note conflicting value here");
                             }
                         }
                     }
@@ -2951,7 +2951,7 @@ impl<'a> Resolver<'a> {
                             Some(span) => {
                                 self.session
                                     .span_note(span,
-                                               "conflicting type here")
+                                               "note conflicting type here")
                             }
                         }
                     }

branches/dist-snap/src/libstd/dynamic_lib.rs

@@ -260,7 +260,7 @@ pub mod dl {
         dlclose(handle as *mut libc::c_void); ()
     }
 
-    pub enum Rtld {
+    pub enum RTLD {
         Lazy = 1,
         Now = 2,
         Global = 256,

branches/dist-snap/src/libterm/win.rs

@@ -23,29 +23,15 @@ use Terminal;
 /// A Terminal implementation which uses the Win32 Console API.
 pub struct WinConsole<T> {
     buf: T,
-    def_foreground: color::Color,
-    def_background: color::Color,
     foreground: color::Color,
     background: color::Color,
 }
 
-#[allow(non_snake_case)]
-#[repr(C)]
-struct CONSOLE_SCREEN_BUFFER_INFO {
-    dwSize: [libc::c_short, ..2],
-    dwCursorPosition: [libc::c_short, ..2],
-    wAttributes: libc::WORD,
-    srWindow: [libc::c_short, ..4],
-    dwMaximumWindowSize: [libc::c_short, ..2],
-}
-
 #[allow(non_snake_case)]
 #[link(name = "kernel32")]
 extern "system" {
     fn SetConsoleTextAttribute(handle: libc::HANDLE, attr: libc::WORD) -> libc::BOOL;
     fn GetStdHandle(which: libc::DWORD) -> libc::HANDLE;
-    fn GetConsoleScreenBufferInfo(handle: libc::HANDLE,
-                                  info: *mut CONSOLE_SCREEN_BUFFER_INFO) -> libc::BOOL;
 }
 
 fn color_to_bits(color: color::Color) -> u16 {
@@ -70,26 +56,6 @@ fn color_to_bits(color: color::Color) -> u16 {
     }
 }
 
-fn bits_to_color(bits: u16) -> color::Color {
-    let color = match bits & 0x7 {
-        0 => color::BLACK,
-        0x1 => color::BLUE,
-        0x2 => color::GREEN,
-        0x4 => color::RED,
-        0x6 => color::YELLOW,
-        0x5 => color::MAGENTA,
-        0x3 => color::CYAN,
-        0x7 => color::WHITE,
-        _ => unreachable!()
-    };
-
-    if bits >= 8 {
-        color | 0x8
-    } else {
-        color
-    }
-}
-
 impl<T: Writer> WinConsole<T> {
     fn apply(&mut self) {
         let _unused = self.buf.flush();
@@ -125,21 +91,7 @@ impl<T: Writer> Writer for WinConsole<T> {
 
 impl<T: Writer> Terminal<T> for WinConsole<T> {
     fn new(out: T) -> Option<WinConsole<T>> {
-        let fg;
-        let bg;
-        unsafe {
-            let mut buffer_info = ::std::mem::uninitialized();
-            if GetConsoleScreenBufferInfo(GetStdHandle(-11), &mut buffer_info) != 0 {
-                fg = bits_to_color(buffer_info.wAttributes);
-                bg = bits_to_color(buffer_info.wAttributes >> 4);
-            } else {
-                fg = color::WHITE;
-                bg = color::BLACK;
-            }
-        }
-        Some(WinConsole { buf: out,
-                          def_foreground: fg, def_background: bg,
-                          foreground: fg, background: bg } )
+        Some(WinConsole { buf: out, foreground: color::WHITE, background: color::BLACK })
     }
 
     fn fg(&mut self, color: color::Color) -> IoResult<bool> {
@@ -182,8 +134,8 @@ impl<T: Writer> Terminal<T> for WinConsole<T> {
     }
 
     fn reset(&mut self) -> IoResult<()> {
-        self.foreground = self.def_foreground;
-        self.background = self.def_background;
+        self.foreground = color::WHITE;
+        self.background = color::BLACK;
         self.apply();
 
         Ok(())

branches/dist-snap/src/test/compile-fail/issue-11154.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// compile-flags: -C lto -C prefer-dynamic
+// compile-flags: -Z lto -C prefer-dynamic
 
 // error-pattern: cannot prefer dynamic linking
 

branches/dist-snap/src/test/debuginfo/cross-crate-type-uniquing.rs

@@ -14,7 +14,7 @@
 extern crate cross_crate_debuginfo_type_uniquing;
 
 // no-prefer-dynamic
-// compile-flags:-g -C lto
+// compile-flags:-g -Zlto
 
 pub struct C;
 pub fn p() -> C {

branches/dist-snap/src/test/run-make/issue-14500/Makefile

@@ -8,7 +8,7 @@
 
 all:
 	$(RUSTC) foo.rs --crate-type=rlib
-	$(RUSTC) bar.rs --crate-type=staticlib -C lto -L. -o $(TMPDIR)/libbar.a
+	$(RUSTC) bar.rs --crate-type=staticlib -Zlto -L. -o $(TMPDIR)/libbar.a
 	$(CC) foo.c -lbar -o $(call RUN_BINFILE,foo) $(EXTRACFLAGS)
 	$(call RUN,foo)
 

branches/dist-snap/src/test/run-make/lto-smoke-c/Makefile

@@ -4,6 +4,6 @@
 CC := $(CC:-g=)
 
 all:
-	$(RUSTC) foo.rs -C lto
+	$(RUSTC) foo.rs -Z lto
 	$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(EXTRACFLAGS) -lstdc++
 	$(call RUN,bar)

branches/dist-snap/src/test/run-make/lto-smoke/Makefile

@@ -2,5 +2,5 @@
 
 all:
 	$(RUSTC) lib.rs
-	$(RUSTC) main.rs -C lto
+	$(RUSTC) main.rs -Z lto
 	$(call RUN,main)

branches/dist-snap/src/test/run-make/lto-syntax-extension/Makefile

@@ -14,5 +14,5 @@ all: $(DOTEST)
 dotest:
 	env
 	$(RUSTC) lib.rs
-	$(RUSTC) main.rs -C lto
+	$(RUSTC) main.rs -Z lto
 	$(call RUN,main)

branches/dist-snap/src/test/run-pass/capture_nil.rs

@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Check that we can use `-C lto` when linking against libraries that were
+// Check that we can use `-Z lto` when linking against libraries that were
 // separately compiled.
 
 // aux-build:sepcomp_lib.rs
-// compile-flags: -C lto
+// compile-flags: -Z lto
 // no-prefer-dynamic
 
 extern crate sepcomp_lib;