mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock
View file

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

2
src/librustc_codegen_llvm/Cargo.toml
View file

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

1
src/librustc_codegen_llvm/abi.rs
View file

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

5
src/librustc_codegen_llvm/lib.rs
View file

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

2
src/librustc_driver/lib.rs
View file

@ -42,8 +42,6 @@ use rustc_metadata::locator;
use rustc_codegen_utils::codegen_backend::CodegenBackend; use rustc_codegen_utils::codegen_backend::CodegenBackend;
use errors::{PResult, registry::Registry}; use errors::{PResult, registry::Registry};
use rustc_interface::{interface, Queries}; 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_interface::util::get_builtin_codegen_backend;
use rustc_data_structures::sync::SeqCst; use rustc_data_structures::sync::SeqCst;
use rustc_feature::{find_gated_cfg, UnstableFeatures}; use rustc_feature::{find_gated_cfg, UnstableFeatures};