---

yaml
---
r: 124263
b: refs/heads/try
c: cf360f3
h: refs/heads/master
i:
  124261: 3c6c15a
  124259: 9afb5a0
  124255: 4325127
v: v3

Author: brson

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 6c35d513cea468b30759b4f78becf28f11a123c0
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: afbcbbc77ffc6b10053bc543daf7d2e05d68cc01
-refs/heads/try: d3096c2348b463ccdbb1c066b688d487e72e6c73
+refs/heads/try: cf360f328aad26bd19490270aa9716645aa4d4cf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/mk/crates.mk

@@ -53,7 +53,8 @@ TARGET_CRATES := libc std green rustuv native flate arena glob term semver \
                  uuid serialize sync getopts collections num test time rand \
                  url log regex graphviz core rlibc alloc debug rustrt \
                  unicode
-HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros fmt_macros rustc_llvm
+HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros fmt_macros \
+	       rustc_llvm rustc_back
 CRATES := $(TARGET_CRATES) $(HOST_CRATES)
 TOOLS := compiletest rustdoc rustc
 
@@ -71,8 +72,9 @@ DEPS_rustuv := std native:uv native:uv_support
 DEPS_native := std
 DEPS_syntax := std term serialize log fmt_macros debug
 DEPS_rustc := syntax flate arena serialize getopts \
-              time log graphviz debug rustc_llvm
+              time log graphviz debug rustc_llvm rustc_back
 DEPS_rustc_llvm := native:rustllvm libc std
+DEPS_rustc_back := std syntax rustc_llvm flate log libc
 DEPS_rustdoc := rustc native:hoedown serialize getopts \
                 test time debug
 DEPS_flate := std native:miniz

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

@@ -10,10 +10,10 @@
 
 //! A helper class for dealing with static archives
 
-use back::link::{get_ar_prog};
+use super::link::{get_ar_prog};
 use driver::session::Session;
 use metadata::filesearch;
-use lib::llvm::{ArchiveRef, llvm};
+use llvm::{ArchiveRef, llvm};
 
 use libc;
 use std::io::process::{Command, ProcessOutput};

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

@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use back::archive::ArchiveRO;
-use back::link;
+use super::archive::ArchiveRO;
+use super::link;
 use driver::session;
 use driver::config;
-use lib::llvm::{ModuleRef, TargetMachineRef, llvm, True, False};
+use llvm::{ModuleRef, TargetMachineRef, llvm, True, False};
 use metadata::cstore;
 use util::common::time;
 

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

@@ -42,13 +42,32 @@ extern crate getopts;
 extern crate graphviz;
 extern crate libc;
 extern crate llvm = "rustc_llvm";
+extern crate rustc_back = "rustc_back";
 extern crate serialize;
 extern crate time;
 #[phase(plugin, link)] extern crate log;
 #[phase(plugin, link)] extern crate syntax;
 
 mod diagnostics;
 
+pub mod back {
+    pub use rustc_back::abi;
+    pub use rustc_back::arm;
+    pub use rustc_back::mips;
+    pub use rustc_back::mipsel;
+    pub use rustc_back::svh;
+    pub use rustc_back::target_strs;
+    pub use rustc_back::x86;
+    pub use rustc_back::x86_64;
+
+    pub mod archive;
+    pub mod link;
+    pub mod lto;
+    pub mod rpath;
+
+}
+>>>>>>> Extract librustc_back from librustc
+
 pub mod middle {
     pub mod def;
     pub mod trans;
@@ -97,21 +116,6 @@ pub mod front {
     pub mod show_span;
 }
 
-pub mod back {
-    pub mod abi;
-    pub mod archive;
-    pub mod arm;
-    pub mod link;
-    pub mod lto;
-    pub mod mips;
-    pub mod mipsel;
-    pub mod rpath;
-    pub mod svh;
-    pub mod target_strs;
-    pub mod x86;
-    pub mod x86_64;
-}
-
 pub mod metadata;
 
 pub mod driver;

branches/try/src/librustc/lib.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use back::target_strs;
+use target_strs;
 use syntax::abi;
 
 pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs::t {

branches/try/src/librustc/back/abi.rs renamed to branches/try/src/librustc_back/abi.rs

@@ -0,0 +1,39 @@
+// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![crate_id = "rustc_back#0.11.0-pre"]
+#![crate_name = "rustc_back"]
+#![experimental]
+#![comment = "The Rust compiler backend"]
+#![license = "MIT/ASL2"]
+#![crate_type = "dylib"]
+#![crate_type = "rlib"]
+#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
+      html_favicon_url = "http://www.rust-lang.org/favicon.ico",
+      html_root_url = "http://doc.rust-lang.org/")]
+
+#![feature(globs)]
+#![feature(phase)]
+#![allow(unused_attribute)] // NOTE: remove after stage0
+
+#[phase(plugin, link)]
+extern crate log;
+extern crate syntax;
+extern crate libc;
+extern crate flate;
+
+pub mod abi;
+pub mod arm;
+pub mod mips;
+pub mod mipsel;
+pub mod svh;
+pub mod target_strs;
+pub mod x86;
+pub mod x86_64;

branches/try/src/librustc/back/arm.rs renamed to branches/try/src/librustc_back/arm.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use back::target_strs;
+use target_strs;
 use syntax::abi;
 
 pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs::t {

branches/try/src/librustc_back/lib.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use back::target_strs;
+use target_strs;
 use syntax::abi;
 
 pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs::t {

branches/try/src/librustc/back/mips.rs renamed to branches/try/src/librustc_back/mips.rs

@@ -53,8 +53,6 @@ use std::iter::range_step;
 use syntax::ast;
 use syntax::visit;
 
-use driver::session::Session;
-
 #[deriving(Clone, PartialEq)]
 pub struct Svh {
     hash: String,
@@ -70,7 +68,7 @@ impl Svh {
         self.hash.as_slice()
     }
 
-    pub fn calculate(sess: &Session, krate: &ast::Crate) -> Svh {
+    pub fn calculate(metadata: &Vec<String>, krate: &ast::Crate) -> Svh {
         // FIXME (#14132): This is better than it used to be, but it still not
         // ideal. We now attempt to hash only the relevant portions of the
         // Crate AST as well as the top-level crate attributes. (However,
@@ -82,7 +80,7 @@ impl Svh {
         //        avoid collisions.
         let mut state = SipState::new();
 
-        for data in sess.opts.cg.metadata.iter() {
+        for data in metadata.iter() {
             data.hash(&mut state);
         }
 

branches/try/src/librustc/back/mipsel.rs renamed to branches/try/src/librustc_back/mipsel.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 
-use back::target_strs;
+use target_strs;
 use syntax::abi;
 
 pub fn get_target_strs(target_triple: String, target_os: abi::Os)

branches/try/src/librustc/back/svh.rs renamed to branches/try/src/librustc_back/svh.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 
-use back::target_strs;
+use target_strs;
 use syntax::abi;
 
 pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs::t {