bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix fallout from rebase

Browse source
This commit is contained in:
Aaron Hill 2019-12-05 22:04:35 -05:00
parent f94b0e6af3
commit fca192cca2
No known key found for this signature in database
GPG key ID: B4087E510E98B164
5 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/librustc_codegen_llvm/lib.rs
View file

@ -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};