rustc_llvm: move to rustc_codegen_llvm::llvm.

Author: irinagpopa

src/Cargo.lock

@@ -2222,11 +2222,8 @@ dependencies = [
 name = "rustc_llvm"
 version = "0.0.0"
 dependencies = [
- "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "build_helper 0.1.0",
  "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_cratesio_shim 0.0.0",
 ]
 
 [[package]]

src/librustc_codegen_llvm/lib.rs

@@ -29,6 +29,9 @@
 #![feature(rustc_diagnostic_macros)]
 #![feature(slice_sort_by_cached_key)]
 #![feature(optin_builtin_traits)]
+#![feature(concat_idents)]
+#![feature(link_args)]
+#![feature(static_nobundle)]
 
 use rustc::dep_graph::WorkProduct;
 use syntax_pos::symbol::Symbol;
@@ -46,7 +49,7 @@ extern crate rustc_target;
 #[macro_use] extern crate rustc_data_structures;
 extern crate rustc_demangle;
 extern crate rustc_incremental;
-extern crate rustc_llvm as llvm;
+extern crate rustc_llvm;
 extern crate rustc_platform_intrinsics as intrinsics;
 extern crate rustc_codegen_utils;
 
@@ -110,6 +113,7 @@ mod debuginfo;
 mod declare;
 mod glue;
 mod intrinsic;
+pub mod llvm;
 mod llvm_util;
 mod metadata;
 mod meth;

src/librustc_llvm/archive_ro.rs …librustc_codegen_llvm/llvm/archive_ro.rssrc/librustc_llvm/archive_ro.rs renamed to src/librustc_codegen_llvm/llvm/archive_ro.rs src/librustc_llvm/archive_ro.rs renamed to src/librustc_codegen_llvm/llvm/archive_ro.rs

@@ -10,7 +10,7 @@
 
 //! A wrapper around LLVM's archive (.a) code
 
-use ArchiveRef;
+use super::ArchiveRef;
 
 use std::ffi::CString;
 use std::marker;
@@ -26,11 +26,11 @@ unsafe impl Send for ArchiveRO {}
 
 pub struct Iter<'a> {
     archive: &'a ArchiveRO,
-    ptr: ::ArchiveIteratorRef,
+    ptr: super::ArchiveIteratorRef,
 }
 
 pub struct Child<'a> {
-    ptr: ::ArchiveChildRef,
+    ptr: super::ArchiveChildRef,
     _data: marker::PhantomData<&'a ArchiveRO>,
 }
 
@@ -44,9 +44,9 @@ impl ArchiveRO {
     pub fn open(dst: &Path) -> Result<ArchiveRO, String> {
         return unsafe {
             let s = path2cstr(dst);
-            let ar = ::LLVMRustOpenArchive(s.as_ptr());
+            let ar = super::LLVMRustOpenArchive(s.as_ptr());
             if ar.is_null() {
-                Err(::last_error().unwrap_or("failed to open archive".to_string()))
+                Err(super::last_error().unwrap_or("failed to open archive".to_string()))
             } else {
                 Ok(ArchiveRO { ptr: ar })
             }
@@ -72,7 +72,7 @@ impl ArchiveRO {
     pub fn iter(&self) -> Iter {
         unsafe {
             Iter {
-                ptr: ::LLVMRustArchiveIteratorNew(self.ptr),
+                ptr: super::LLVMRustArchiveIteratorNew(self.ptr),
                 archive: self,
             }
         }
@@ -82,7 +82,7 @@ impl ArchiveRO {
 impl Drop for ArchiveRO {
     fn drop(&mut self) {
         unsafe {
-            ::LLVMRustDestroyArchive(self.ptr);
+            super::LLVMRustDestroyArchive(self.ptr);
         }
     }
 }
@@ -91,9 +91,9 @@ impl<'a> Iterator for Iter<'a> {
     type Item = Result<Child<'a>, String>;
 
     fn next(&mut self) -> Option<Result<Child<'a>, String>> {
-        let ptr = unsafe { ::LLVMRustArchiveIteratorNext(self.ptr) };
+        let ptr = unsafe { super::LLVMRustArchiveIteratorNext(self.ptr) };
         if ptr.is_null() {
-            ::last_error().map(Err)
+            super::last_error().map(Err)
         } else {
             Some(Ok(Child {
                 ptr,
@@ -106,7 +106,7 @@ impl<'a> Iterator for Iter<'a> {
 impl<'a> Drop for Iter<'a> {
     fn drop(&mut self) {
         unsafe {
-            ::LLVMRustArchiveIteratorFree(self.ptr);
+            super::LLVMRustArchiveIteratorFree(self.ptr);
         }
     }
 }
@@ -115,7 +115,7 @@ impl<'a> Child<'a> {
     pub fn name(&self) -> Option<&'a str> {
         unsafe {
             let mut name_len = 0;
-            let name_ptr = ::LLVMRustArchiveChildName(self.ptr, &mut name_len);
+            let name_ptr = super::LLVMRustArchiveChildName(self.ptr, &mut name_len);
             if name_ptr.is_null() {
                 None
             } else {
@@ -128,23 +128,23 @@ impl<'a> Child<'a> {
     pub fn data(&self) -> &'a [u8] {
         unsafe {
             let mut data_len = 0;
-            let data_ptr = ::LLVMRustArchiveChildData(self.ptr, &mut data_len);
+            let data_ptr = super::LLVMRustArchiveChildData(self.ptr, &mut data_len);
             if data_ptr.is_null() {
                 panic!("failed to read data from archive child");
             }
             slice::from_raw_parts(data_ptr as *const u8, data_len as usize)
         }
     }
 
-    pub fn raw(&self) -> ::ArchiveChildRef {
+    pub fn raw(&self) -> super::ArchiveChildRef {
         self.ptr
     }
 }
 
 impl<'a> Drop for Child<'a> {
     fn drop(&mut self) {
         unsafe {
-            ::LLVMRustArchiveChildFree(self.ptr);
+            super::LLVMRustArchiveChildFree(self.ptr);
         }
     }
 }

src/librustc_llvm/diagnostic.rs …librustc_codegen_llvm/llvm/diagnostic.rssrc/librustc_llvm/diagnostic.rs renamed to src/librustc_codegen_llvm/llvm/diagnostic.rs src/librustc_llvm/diagnostic.rs renamed to src/librustc_codegen_llvm/llvm/diagnostic.rs

@@ -16,7 +16,7 @@ pub use self::Diagnostic::*;
 use libc::c_uint;
 use std::ptr;
 
-use {DiagnosticInfoRef, TwineRef, ValueRef};
+use super::{DiagnosticInfoRef, TwineRef, ValueRef};
 
 #[derive(Copy, Clone)]
 pub enum OptimizationDiagnosticKind {

src/librustc_llvm/ffi.rs src/librustc_codegen_llvm/llvm/ffi.rssrc/librustc_llvm/ffi.rs renamed to src/librustc_codegen_llvm/llvm/ffi.rs

@@ -14,15 +14,17 @@
 // This method was changed in this LLVM patch:
 // https://reviews.llvm.org/D26769
 
-use debuginfo::{DIBuilderRef, DIDescriptor, DIFile, DILexicalBlock, DISubprogram, DIType,
-                DIBasicType, DIDerivedType, DICompositeType, DIScope, DIVariable,
-                DIGlobalVariable, DIArray, DISubrange, DITemplateTypeParameter, DIEnumerator,
-                DINameSpace, DIFlags};
+use super::debuginfo::{
+    DIBuilderRef, DIDescriptor, DIFile, DILexicalBlock, DISubprogram, DIType,
+    DIBasicType, DIDerivedType, DICompositeType, DIScope, DIVariable,
+    DIGlobalVariable, DIArray, DISubrange, DITemplateTypeParameter, DIEnumerator,
+    DINameSpace, DIFlags,
+};
 
 use libc::{c_uint, c_int, size_t, c_char};
 use libc::{c_longlong, c_ulonglong, c_void};
 
-use RustStringRef;
+use super::RustStringRef;
 
 pub type Opcode = u32;
 pub type Bool = c_uint;
@@ -512,13 +514,6 @@ pub mod debuginfo {
 
 pub enum ModuleBuffer {}
 
-// This annotation is primarily needed for MSVC where attributes like
-// dllimport/dllexport are applied and need to be correct for everything to
-// link successfully. The #[link] annotation here says "these symbols are
-// included statically" which means that they're all exported with dllexport
-// and from the rustc_llvm dynamic library. Otherwise the rustc_codegen_llvm dynamic
-// library would not be able to access these symbols.
-#[link(name = "rustllvm", kind = "static")]
 extern "C" {
     // Create and destroy contexts.
     pub fn LLVMRustContextCreate(shouldDiscardNames: bool) -> ContextRef;