From 915382f7306be7841c4254cee13fa55a865bdd8b Mon Sep 17 00:00:00 2001
From: Denis Merigoux <denis.merigoux@gmail.com>
Date: Tue, 2 Oct 2018 10:49:54 +0200
Subject: [PATCH] Moved DeclareMethods, MiscMethods and StaticMethods

---
 src/librustc_codegen_llvm/interfaces/mod.rs           | 11 ++++-------
 .../interfaces/declare.rs                             |  2 +-
 .../interfaces/misc.rs                                |  2 +-
 src/librustc_codegen_ssa/interfaces/mod.rs            |  6 ++++++
 .../interfaces/statics.rs                             |  0
 src/librustc_codegen_ssa/lib.rs                       |  2 ++
 6 files changed, 14 insertions(+), 9 deletions(-)
 rename src/{librustc_codegen_llvm => librustc_codegen_ssa}/interfaces/declare.rs (98%)
 rename src/{librustc_codegen_llvm => librustc_codegen_ssa}/interfaces/misc.rs (96%)
 rename src/{librustc_codegen_llvm => librustc_codegen_ssa}/interfaces/statics.rs (100%)

diff --git a/src/librustc_codegen_llvm/interfaces/mod.rs b/src/librustc_codegen_llvm/interfaces/mod.rs
index 0547ce7ce4c..5fff0567585 100644
--- a/src/librustc_codegen_llvm/interfaces/mod.rs
+++ b/src/librustc_codegen_llvm/interfaces/mod.rs
@@ -13,10 +13,7 @@ mod asm;
 mod builder;
 mod consts;
 mod debuginfo;
-mod declare;
 mod intrinsic;
-mod misc;
-mod statics;
 mod type_;
 
 pub use self::abi::{AbiBuilderMethods, AbiMethods};
@@ -24,14 +21,14 @@ pub use self::asm::{AsmBuilderMethods, AsmMethods};
 pub use self::builder::BuilderMethods;
 pub use self::consts::ConstMethods;
 pub use self::debuginfo::{DebugInfoBuilderMethods, DebugInfoMethods};
-pub use self::declare::{DeclareMethods, PreDefineMethods};
 pub use self::intrinsic::{IntrinsicCallMethods, IntrinsicDeclarationMethods};
-pub use self::misc::MiscMethods;
-pub use self::statics::StaticMethods;
 pub use self::type_::{
     ArgTypeMethods, BaseTypeMethods, DerivedTypeMethods, LayoutTypeMethods, TypeMethods,
 };
-pub use rustc_codegen_ssa::interfaces::{Backend, BackendMethods, BackendTypes, CodegenObject};
+pub use rustc_codegen_ssa::interfaces::{
+    Backend, BackendMethods, BackendTypes, CodegenObject, DeclareMethods, MiscMethods,
+    PreDefineMethods, StaticMethods,
+};
 
 pub trait CodegenMethods<'tcx>:
     Backend<'tcx>
diff --git a/src/librustc_codegen_llvm/interfaces/declare.rs b/src/librustc_codegen_ssa/interfaces/declare.rs
similarity index 98%
rename from src/librustc_codegen_llvm/interfaces/declare.rs
rename to src/librustc_codegen_ssa/interfaces/declare.rs
index 373220fd345..38ef52e3c8e 100644
--- a/src/librustc_codegen_llvm/interfaces/declare.rs
+++ b/src/librustc_codegen_ssa/interfaces/declare.rs
@@ -9,10 +9,10 @@
 // except according to those terms.
 
 use super::Backend;
-use monomorphize::Instance;
 use rustc::hir::def_id::DefId;
 use rustc::mir::mono::{Linkage, Visibility};
 use rustc::ty;
+use rustc_mir::monomorphize::Instance;
 
 pub trait DeclareMethods<'tcx>: Backend<'tcx> {
     /// Declare a global value.
diff --git a/src/librustc_codegen_llvm/interfaces/misc.rs b/src/librustc_codegen_ssa/interfaces/misc.rs
similarity index 96%
rename from src/librustc_codegen_llvm/interfaces/misc.rs
rename to src/librustc_codegen_ssa/interfaces/misc.rs
index 6e6af597a76..462061f1493 100644
--- a/src/librustc_codegen_llvm/interfaces/misc.rs
+++ b/src/librustc_codegen_ssa/interfaces/misc.rs
@@ -10,11 +10,11 @@
 
 use super::Backend;
 use libc::c_uint;
-use monomorphize::partitioning::CodegenUnit;
 use rustc::mir::mono::Stats;
 use rustc::session::Session;
 use rustc::ty::{self, Instance, Ty};
 use rustc::util::nodemap::FxHashMap;
+use rustc_mir::monomorphize::partitioning::CodegenUnit;
 use std::cell::RefCell;
 use std::sync::Arc;
 
diff --git a/src/librustc_codegen_ssa/interfaces/mod.rs b/src/librustc_codegen_ssa/interfaces/mod.rs
index f958dbabe68..aa8355e7dfd 100644
--- a/src/librustc_codegen_ssa/interfaces/mod.rs
+++ b/src/librustc_codegen_ssa/interfaces/mod.rs
@@ -9,8 +9,14 @@
 // except according to those terms.
 
 mod backend;
+mod declare;
+mod misc;
+mod statics;
 
 pub use self::backend::{Backend, BackendMethods, BackendTypes};
+pub use self::declare::{DeclareMethods, PreDefineMethods};
+pub use self::misc::MiscMethods;
+pub use self::statics::StaticMethods;
 
 use std::fmt;
 
diff --git a/src/librustc_codegen_llvm/interfaces/statics.rs b/src/librustc_codegen_ssa/interfaces/statics.rs
similarity index 100%
rename from src/librustc_codegen_llvm/interfaces/statics.rs
rename to src/librustc_codegen_ssa/interfaces/statics.rs
diff --git a/src/librustc_codegen_ssa/lib.rs b/src/librustc_codegen_ssa/lib.rs
index e8e6222f87c..7c062781fc0 100644
--- a/src/librustc_codegen_ssa/lib.rs
+++ b/src/librustc_codegen_ssa/lib.rs
@@ -19,6 +19,7 @@
 #![feature(box_patterns)]
 #![feature(box_syntax)]
 #![feature(custom_attribute)]
+#![feature(libc)]
 #![feature(nll)]
 #![allow(unused_attributes)]
 #![allow(dead_code)]
@@ -33,6 +34,7 @@ extern crate rustc_mir;
 extern crate syntax;
 extern crate syntax_pos;
 extern crate rustc_data_structures;
+extern crate libc;
 
 use std::path::PathBuf;
 use rustc::dep_graph::WorkProduct;