Fix fallout from rebase

Author: Aaron1011

Cargo.lock

@@ -3445,10 +3445,12 @@ dependencies = [
  "rustc_codegen_utils",
  "rustc_data_structures",
  "rustc_errors",
+ "rustc_feature",
  "rustc_fs_util",
  "rustc_incremental",
  "rustc_index",
  "rustc_llvm",
+ "rustc_session",
  "rustc_target",
  "smallvec 0.6.10",
  "syntax",

src/librustc_codegen_llvm/Cargo.toml

@@ -21,10 +21,12 @@ rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
 rustc_codegen_utils = { path = "../librustc_codegen_utils" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_errors = { path = "../librustc_errors" }
+rustc_feature = { path = "../librustc_feature" }
 rustc_fs_util = { path = "../librustc_fs_util" }
 rustc_incremental = { path = "../librustc_incremental" }
 rustc_index = { path = "../librustc_index" }
 rustc_llvm = { path = "../librustc_llvm" }
+rustc_session = { path = "../librustc_session" }
 rustc_target = { path = "../librustc_target" }
 smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }
 syntax = { path = "../libsyntax" }

src/librustc_codegen_llvm/abi.rs

@@ -8,7 +8,6 @@ use crate::value::Value;
 use rustc_codegen_ssa::MemFlags;
 use rustc_codegen_ssa::mir::place::PlaceRef;
 use rustc_codegen_ssa::mir::operand::OperandValue;
-use rustc_target::abi::call::ArgAbi;
 use rustc::bug;
 use rustc_codegen_ssa::traits::*;
 use rustc_target::abi::call::ArgAbi;

src/librustc_codegen_llvm/lib.rs

@@ -24,7 +24,6 @@
 use back::write::{create_target_machine, create_informational_target_machine};
 use syntax_pos::symbol::Symbol;
 
-<<<<<<< HEAD
 extern crate rustc_demangle;
 extern crate flate2;
 #[macro_use] extern crate bitflags;
@@ -38,17 +37,13 @@ extern crate rustc_incremental;
 extern crate rustc_codegen_utils;
 extern crate rustc_codegen_ssa;
 extern crate rustc_fs_util;
-extern crate rustc_driver as _;
 
 #[macro_use] extern crate log;
 extern crate smallvec;
 extern crate syntax;
 extern crate syntax_pos;
 extern crate rustc_errors as errors;
-extern crate rustc_session;
 
-=======
->>>>>>> rustc: Link LLVM directly into rustc again
 use rustc_codegen_ssa::traits::*;
 use rustc_codegen_ssa::back::write::{CodegenContext, ModuleConfig, FatLTOInput};
 use rustc_codegen_ssa::back::lto::{SerializedModule, LtoModuleCodegen, ThinModule};

src/librustc_driver/lib.rs

@@ -42,8 +42,6 @@ use rustc_metadata::locator;
 use rustc_codegen_utils::codegen_backend::CodegenBackend;
 use errors::{PResult, registry::Registry};
 use rustc_interface::{interface, Queries};
-use rustc_interface::util::get_codegen_sysroot;
-use rustc_interface::interface;
 use rustc_interface::util::get_builtin_codegen_backend;
 use rustc_data_structures::sync::SeqCst;
 use rustc_feature::{find_gated_cfg, UnstableFeatures};