diff options
| author | Aaron Hill <aa1ronham@gmail.com> | 2019-12-05 22:04:35 -0500 |
|---|---|---|
| committer | Aaron Hill <aa1ronham@gmail.com> | 2019-12-11 09:50:12 -0500 |
| commit | fca192cca2dc1a9ea730f2b1ac5b5976ea62bb61 (patch) | |
| tree | 12473608e1972ca48607b57ea5c1ed8c7b20816e /src/librustc_codegen_llvm/lib.rs | |
| parent | f94b0e6af32c095d1627926d8922d6d3e218ca76 (diff) | |
| download | rust-fca192cca2dc1a9ea730f2b1ac5b5976ea62bb61.tar.gz rust-fca192cca2dc1a9ea730f2b1ac5b5976ea62bb61.zip | |
Fix fallout from rebase
Diffstat (limited to 'src/librustc_codegen_llvm/lib.rs')
| -rw-r--r-- | src/librustc_codegen_llvm/lib.rs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/librustc_codegen_llvm/lib.rs b/src/librustc_codegen_llvm/lib.rs index 77278c699de..278b7ee20b3 100644 --- a/src/librustc_codegen_llvm/lib.rs +++ b/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}; |