diff --git a/mk/crates.mk b/mk/crates.mk index e565d3eb2b9..c95576f6252 100644 --- a/mk/crates.mk +++ b/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 diff --git a/src/librustc/back/archive.rs b/src/librustc/back/archive.rs index 4d921fb97dc..8acb610db3f 100644 --- a/src/librustc/back/archive.rs +++ b/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}; diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index a1df360a11b..2112e8d822d 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -8,16 +8,15 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use back::archive::{Archive, METADATA_FILENAME}; -use back::rpath; -use back::svh::Svh; +use super::archive::{Archive, METADATA_FILENAME}; +use super::rpath; +use super::svh::Svh; use driver::driver::{CrateTranslation, OutputFilenames, Input, FileInput}; use driver::config::NoDebugInfo; use driver::session::Session; use driver::config; -use lib::llvm::llvm; -use lib::llvm::ModuleRef; -use lib; +use llvm; +use llvm::ModuleRef; use metadata::common::LinkMeta; use metadata::{encoder, cstore, filesearch, csearch, loader, creader}; use middle::trans::context::CrateContext; @@ -55,7 +54,7 @@ pub enum OutputType { pub fn llvm_err(sess: &Session, msg: String) -> ! { unsafe { - let cstr = llvm::LLVMRustGetLastError(); + let cstr = llvm::llvm::LLVMRustGetLastError(); if cstr == ptr::null() { sess.fatal(msg.as_slice()); } else { @@ -70,14 +69,14 @@ pub fn llvm_err(sess: &Session, msg: String) -> ! { pub fn write_output_file( sess: &Session, - target: lib::llvm::TargetMachineRef, - pm: lib::llvm::PassManagerRef, + target: llvm::TargetMachineRef, + pm: llvm::PassManagerRef, m: ModuleRef, output: &Path, - file_type: lib::llvm::FileType) { + file_type: llvm::FileType) { unsafe { output.with_c_str(|output| { - let result = llvm::LLVMRustWriteOutputFile( + let result = llvm::llvm::LLVMRustWriteOutputFile( target, pm, m, output, file_type); if !result { llvm_err(sess, "could not write output".to_string()); @@ -88,18 +87,17 @@ pub fn write_output_file( pub mod write { - use back::lto; - use back::link::{write_output_file, OutputType}; - use back::link::{OutputTypeAssembly, OutputTypeBitcode}; - use back::link::{OutputTypeExe, OutputTypeLlvmAssembly}; - use back::link::{OutputTypeObject}; + use super::super::lto; + use super::{write_output_file, OutputType}; + use super::{OutputTypeAssembly, OutputTypeBitcode}; + use super::{OutputTypeExe, OutputTypeLlvmAssembly}; + use super::{OutputTypeObject}; use driver::driver::{CrateTranslation, OutputFilenames}; use driver::config::NoDebugInfo; use driver::session::Session; use driver::config; - use lib::llvm::llvm; - use lib::llvm::{ModuleRef, TargetMachineRef, PassManagerRef}; - use lib; + use llvm; + use llvm::{ModuleRef, TargetMachineRef, PassManagerRef}; use util::common::time; use syntax::abi; @@ -147,15 +145,15 @@ pub mod write { if sess.opts.cg.save_temps { output.with_extension("no-opt.bc").with_c_str(|buf| { - llvm::LLVMWriteBitcodeToFile(llmod, buf); + llvm::llvm::LLVMWriteBitcodeToFile(llmod, buf); }) } let opt_level = match sess.opts.optimize { - config::No => lib::llvm::CodeGenLevelNone, - config::Less => lib::llvm::CodeGenLevelLess, - config::Default => lib::llvm::CodeGenLevelDefault, - config::Aggressive => lib::llvm::CodeGenLevelAggressive, + config::No => llvm::CodeGenLevelNone, + config::Less => llvm::CodeGenLevelLess, + config::Default => llvm::CodeGenLevelDefault, + config::Aggressive => llvm::CodeGenLevelAggressive, }; let use_softfp = sess.opts.cg.soft_float; @@ -172,10 +170,10 @@ pub mod write { let fdata_sections = ffunction_sections; let reloc_model = match sess.opts.cg.relocation_model.as_slice() { - "pic" => lib::llvm::RelocPIC, - "static" => lib::llvm::RelocStatic, - "default" => lib::llvm::RelocDefault, - "dynamic-no-pic" => lib::llvm::RelocDynamicNoPic, + "pic" => llvm::RelocPIC, + "static" => llvm::RelocStatic, + "default" => llvm::RelocDefault, + "dynamic-no-pic" => llvm::RelocDynamicNoPic, _ => { sess.err(format!("{} is not a valid relocation mode", sess.opts @@ -193,9 +191,9 @@ pub mod write { .with_c_str(|t| { sess.opts.cg.target_cpu.as_slice().with_c_str(|cpu| { target_feature(sess).with_c_str(|features| { - llvm::LLVMRustCreateTargetMachine( + llvm::llvm::LLVMRustCreateTargetMachine( t, cpu, features, - lib::llvm::CodeModelDefault, + llvm::CodeModelDefault, reloc_model, opt_level, true /* EnableSegstk */, @@ -212,26 +210,26 @@ pub mod write { // does, and are by populated by LLVM's default PassManagerBuilder. // Each manager has a different set of passes, but they also share // some common passes. - let fpm = llvm::LLVMCreateFunctionPassManagerForModule(llmod); - let mpm = llvm::LLVMCreatePassManager(); + let fpm = llvm::llvm::LLVMCreateFunctionPassManagerForModule(llmod); + let mpm = llvm::llvm::LLVMCreatePassManager(); // If we're verifying or linting, add them to the function pass // manager. let addpass = |pass: &str| { - pass.as_slice().with_c_str(|s| llvm::LLVMRustAddPass(fpm, s)) + pass.as_slice().with_c_str(|s| llvm::llvm::LLVMRustAddPass(fpm, s)) }; if !sess.no_verify() { assert!(addpass("verify")); } if !sess.opts.cg.no_prepopulate_passes { - llvm::LLVMRustAddAnalysisPasses(tm, fpm, llmod); - llvm::LLVMRustAddAnalysisPasses(tm, mpm, llmod); + llvm::llvm::LLVMRustAddAnalysisPasses(tm, fpm, llmod); + llvm::llvm::LLVMRustAddAnalysisPasses(tm, mpm, llmod); populate_llvm_passes(fpm, mpm, llmod, opt_level, trans.no_builtins); } for pass in sess.opts.cg.passes.iter() { pass.as_slice().with_c_str(|s| { - if !llvm::LLVMRustAddPass(mpm, s) { + if !llvm::llvm::LLVMRustAddPass(mpm, s) { sess.warn(format!("unknown pass {}, ignoring", *pass).as_slice()); } @@ -240,13 +238,13 @@ pub mod write { // Finally, run the actual optimization passes time(sess.time_passes(), "llvm function passes", (), |()| - llvm::LLVMRustRunFunctionPassManager(fpm, llmod)); + llvm::llvm::LLVMRustRunFunctionPassManager(fpm, llmod)); time(sess.time_passes(), "llvm module passes", (), |()| - llvm::LLVMRunPassManager(mpm, llmod)); + llvm::llvm::LLVMRunPassManager(mpm, llmod)); // Deallocate managers that we're now done with - llvm::LLVMDisposePassManager(fpm); - llvm::LLVMDisposePassManager(mpm); + llvm::llvm::LLVMDisposePassManager(fpm); + llvm::llvm::LLVMDisposePassManager(mpm); // Emit the bytecode if we're either saving our temporaries or // emitting an rlib. Whenever an rlib is created, the bytecode is @@ -255,7 +253,7 @@ pub mod write { (sess.crate_types.borrow().contains(&config::CrateTypeRlib) && sess.opts.output_types.contains(&OutputTypeExe)) { output.temp_path(OutputTypeBitcode).with_c_str(|buf| { - llvm::LLVMWriteBitcodeToFile(llmod, buf); + llvm::llvm::LLVMWriteBitcodeToFile(llmod, buf); }) } @@ -265,7 +263,7 @@ pub mod write { if sess.opts.cg.save_temps { output.with_extension("lto.bc").with_c_str(|buf| { - llvm::LLVMWriteBitcodeToFile(llmod, buf); + llvm::llvm::LLVMWriteBitcodeToFile(llmod, buf); }) } } @@ -281,11 +279,11 @@ pub mod write { fn with_codegen(tm: TargetMachineRef, llmod: ModuleRef, no_builtins: bool, f: |PassManagerRef|) { unsafe { - let cpm = llvm::LLVMCreatePassManager(); - llvm::LLVMRustAddAnalysisPasses(tm, cpm, llmod); - llvm::LLVMRustAddLibraryInfo(cpm, llmod, no_builtins); + let cpm = llvm::llvm::LLVMCreatePassManager(); + llvm::llvm::LLVMRustAddAnalysisPasses(tm, cpm, llmod); + llvm::llvm::LLVMRustAddLibraryInfo(cpm, llmod, no_builtins); f(cpm); - llvm::LLVMDisposePassManager(cpm); + llvm::llvm::LLVMDisposePassManager(cpm); } } @@ -296,13 +294,13 @@ pub mod write { match *output_type { OutputTypeBitcode => { path.with_c_str(|buf| { - llvm::LLVMWriteBitcodeToFile(llmod, buf); + llvm::llvm::LLVMWriteBitcodeToFile(llmod, buf); }) } OutputTypeLlvmAssembly => { path.with_c_str(|output| { with_codegen(tm, llmod, trans.no_builtins, |cpm| { - llvm::LLVMRustPrintModule(cpm, llmod, output); + llvm::llvm::LLVMRustPrintModule(cpm, llmod, output); }) }) } @@ -320,7 +318,7 @@ pub mod write { }; with_codegen(tm, llmod, trans.no_builtins, |cpm| { write_output_file(sess, tm, cpm, llmod, &path, - lib::llvm::AssemblyFile); + llvm::AssemblyFile); }); } OutputTypeObject => { @@ -338,7 +336,7 @@ pub mod write { Some(ref path) => { with_codegen(tm, llmod, trans.no_builtins, |cpm| { write_output_file(sess, tm, cpm, llmod, path, - lib::llvm::ObjectFile); + llvm::ObjectFile); }); } None => {} @@ -350,16 +348,16 @@ pub mod write { .with_extension("metadata.o"); write_output_file(sess, tm, cpm, trans.metadata_module, &out, - lib::llvm::ObjectFile); + llvm::ObjectFile); }) } }); - llvm::LLVMRustDisposeTargetMachine(tm); - llvm::LLVMDisposeModule(trans.metadata_module); - llvm::LLVMDisposeModule(llmod); - llvm::LLVMContextDispose(llcx); - if sess.time_llvm_passes() { llvm::LLVMRustPrintPassTimings(); } + llvm::llvm::LLVMRustDisposeTargetMachine(tm); + llvm::llvm::LLVMDisposeModule(trans.metadata_module); + llvm::llvm::LLVMDisposeModule(llmod); + llvm::llvm::LLVMContextDispose(llcx); + if sess.time_llvm_passes() { llvm::llvm::LLVMRustPrintPassTimings(); } } } @@ -426,69 +424,69 @@ pub mod write { } INIT.doit(|| { - llvm::LLVMInitializePasses(); + llvm::llvm::LLVMInitializePasses(); // Only initialize the platforms supported by Rust here, because // using --llvm-root will have multiple platforms that rustllvm // doesn't actually link to and it's pointless to put target info // into the registry that Rust cannot generate machine code for. - llvm::LLVMInitializeX86TargetInfo(); - llvm::LLVMInitializeX86Target(); - llvm::LLVMInitializeX86TargetMC(); - llvm::LLVMInitializeX86AsmPrinter(); - llvm::LLVMInitializeX86AsmParser(); + llvm::llvm::LLVMInitializeX86TargetInfo(); + llvm::llvm::LLVMInitializeX86Target(); + llvm::llvm::LLVMInitializeX86TargetMC(); + llvm::llvm::LLVMInitializeX86AsmPrinter(); + llvm::llvm::LLVMInitializeX86AsmParser(); - llvm::LLVMInitializeARMTargetInfo(); - llvm::LLVMInitializeARMTarget(); - llvm::LLVMInitializeARMTargetMC(); - llvm::LLVMInitializeARMAsmPrinter(); - llvm::LLVMInitializeARMAsmParser(); + llvm::llvm::LLVMInitializeARMTargetInfo(); + llvm::llvm::LLVMInitializeARMTarget(); + llvm::llvm::LLVMInitializeARMTargetMC(); + llvm::llvm::LLVMInitializeARMAsmPrinter(); + llvm::llvm::LLVMInitializeARMAsmParser(); - llvm::LLVMInitializeMipsTargetInfo(); - llvm::LLVMInitializeMipsTarget(); - llvm::LLVMInitializeMipsTargetMC(); - llvm::LLVMInitializeMipsAsmPrinter(); - llvm::LLVMInitializeMipsAsmParser(); + llvm::llvm::LLVMInitializeMipsTargetInfo(); + llvm::llvm::LLVMInitializeMipsTarget(); + llvm::llvm::LLVMInitializeMipsTargetMC(); + llvm::llvm::LLVMInitializeMipsAsmPrinter(); + llvm::llvm::LLVMInitializeMipsAsmParser(); - llvm::LLVMRustSetLLVMOptions(llvm_args.len() as c_int, + llvm::llvm::LLVMRustSetLLVMOptions(llvm_args.len() as c_int, llvm_args.as_ptr()); }); } - unsafe fn populate_llvm_passes(fpm: lib::llvm::PassManagerRef, - mpm: lib::llvm::PassManagerRef, + unsafe fn populate_llvm_passes(fpm: llvm::PassManagerRef, + mpm: llvm::PassManagerRef, llmod: ModuleRef, - opt: lib::llvm::CodeGenOptLevel, + opt: llvm::CodeGenOptLevel, no_builtins: bool) { // Create the PassManagerBuilder for LLVM. We configure it with // reasonable defaults and prepare it to actually populate the pass // manager. - let builder = llvm::LLVMPassManagerBuilderCreate(); + let builder = llvm::llvm::LLVMPassManagerBuilderCreate(); match opt { - lib::llvm::CodeGenLevelNone => { + llvm::CodeGenLevelNone => { // Don't add lifetime intrinsics at O0 - llvm::LLVMRustAddAlwaysInlinePass(builder, false); + llvm::llvm::LLVMRustAddAlwaysInlinePass(builder, false); } - lib::llvm::CodeGenLevelLess => { - llvm::LLVMRustAddAlwaysInlinePass(builder, true); + llvm::CodeGenLevelLess => { + llvm::llvm::LLVMRustAddAlwaysInlinePass(builder, true); } // numeric values copied from clang - lib::llvm::CodeGenLevelDefault => { - llvm::LLVMPassManagerBuilderUseInlinerWithThreshold(builder, + llvm::CodeGenLevelDefault => { + llvm::llvm::LLVMPassManagerBuilderUseInlinerWithThreshold(builder, 225); } - lib::llvm::CodeGenLevelAggressive => { - llvm::LLVMPassManagerBuilderUseInlinerWithThreshold(builder, + llvm::CodeGenLevelAggressive => { + llvm::llvm::LLVMPassManagerBuilderUseInlinerWithThreshold(builder, 275); } } - llvm::LLVMPassManagerBuilderSetOptLevel(builder, opt as c_uint); - llvm::LLVMRustAddBuilderLibraryInfo(builder, llmod, no_builtins); + llvm::llvm::LLVMPassManagerBuilderSetOptLevel(builder, opt as c_uint); + llvm::llvm::LLVMRustAddBuilderLibraryInfo(builder, llmod, no_builtins); // Use the builder to populate the function/module pass managers. - llvm::LLVMPassManagerBuilderPopulateFunctionPassManager(builder, fpm); - llvm::LLVMPassManagerBuilderPopulateModulePassManager(builder, mpm); - llvm::LLVMPassManagerBuilderDispose(builder); + llvm::llvm::LLVMPassManagerBuilderPopulateFunctionPassManager(builder, fpm); + llvm::llvm::LLVMPassManagerBuilderPopulateModulePassManager(builder, mpm); + llvm::llvm::LLVMPassManagerBuilderDispose(builder); } } @@ -611,7 +609,7 @@ pub fn build_link_meta(sess: &Session, krate: &ast::Crate, name: String) -> LinkMeta { let r = LinkMeta { crate_name: name, - crate_hash: Svh::calculate(sess, krate), + crate_hash: Svh::calculate(&sess.opts.cg.metadata, krate), }; info!("{}", r); return r; diff --git a/src/librustc/back/lto.rs b/src/librustc/back/lto.rs index b9ae9530f8e..cf163cdbb63 100644 --- a/src/librustc/back/lto.rs +++ b/src/librustc/back/lto.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; diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index 7da3ae02087..65124ceff1d 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -42,6 +42,7 @@ 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; @@ -49,6 +50,24 @@ extern crate time; 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; diff --git a/src/librustc/back/abi.rs b/src/librustc_back/abi.rs similarity index 100% rename from src/librustc/back/abi.rs rename to src/librustc_back/abi.rs diff --git a/src/librustc/back/arm.rs b/src/librustc_back/arm.rs similarity index 99% rename from src/librustc/back/arm.rs rename to src/librustc_back/arm.rs index 7a7d248a4cb..a0730360ec7 100644 --- a/src/librustc/back/arm.rs +++ b/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 { diff --git a/src/librustc_back/lib.rs b/src/librustc_back/lib.rs new file mode 100644 index 00000000000..5334c499300 --- /dev/null +++ b/src/librustc_back/lib.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 or the MIT license +// , 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; diff --git a/src/librustc/back/mips.rs b/src/librustc_back/mips.rs similarity index 98% rename from src/librustc/back/mips.rs rename to src/librustc_back/mips.rs index 8f3da03e825..4176d0e9a6f 100644 --- a/src/librustc/back/mips.rs +++ b/src/librustc_back/mips.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 { diff --git a/src/librustc/back/mipsel.rs b/src/librustc_back/mipsel.rs similarity index 98% rename from src/librustc/back/mipsel.rs rename to src/librustc_back/mipsel.rs index c2c48a41e8f..d3ea9d3aa72 100644 --- a/src/librustc/back/mipsel.rs +++ b/src/librustc_back/mipsel.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 { diff --git a/src/librustc/back/svh.rs b/src/librustc_back/svh.rs similarity index 99% rename from src/librustc/back/svh.rs rename to src/librustc_back/svh.rs index 324ed3b567e..66bc8c740c4 100644 --- a/src/librustc/back/svh.rs +++ b/src/librustc_back/svh.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, 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); } diff --git a/src/librustc/back/target_strs.rs b/src/librustc_back/target_strs.rs similarity index 100% rename from src/librustc/back/target_strs.rs rename to src/librustc_back/target_strs.rs diff --git a/src/librustc/back/x86.rs b/src/librustc_back/x86.rs similarity index 98% rename from src/librustc/back/x86.rs rename to src/librustc_back/x86.rs index d2dac03267d..b4d67bc98d2 100644 --- a/src/librustc/back/x86.rs +++ b/src/librustc_back/x86.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) diff --git a/src/librustc/back/x86_64.rs b/src/librustc_back/x86_64.rs similarity index 99% rename from src/librustc/back/x86_64.rs rename to src/librustc_back/x86_64.rs index c2eae18737b..70807edc996 100644 --- a/src/librustc/back/x86_64.rs +++ b/src/librustc_back/x86_64.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 {