Scale back changes made

Author: alexcrichton

mk/cfg/x86_64-pc-windows-msvc.mk

@@ -1,29 +1,24 @@
 # x86_64-pc-windows-msvc configuration
-CROSS_PREFIX_x86_64-pc-windows-msvc=
 CC_x86_64-pc-windows-msvc=cl
 LINK_x86_64-pc-windows-msvc=link
-CXX_x86_64-pc-windows-msvc=g++
-CPP_x86_64-pc-windows-msvc=gcc -E
+CXX_x86_64-pc-windows-msvc=cl
+CPP_x86_64-pc-windows-msvc=cl
 AR_x86_64-pc-windows-msvc=llvm-ar
 CFG_LIB_NAME_x86_64-pc-windows-msvc=$(1).dll
 CFG_STATIC_LIB_NAME_x86_64-pc-windows-msvc=$(1).lib
 CFG_LIB_GLOB_x86_64-pc-windows-msvc=$(1)-*.dll
 CFG_LIB_DSYM_GLOB_x86_64-pc-windows-msvc=$(1)-*.dylib.dSYM
-CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-msvc := $(CFLAGS)
-CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc := $(CFLAGS)
-CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-msvc := -fno-rtti $(CXXFLAGS)
-CFG_GCCISH_LINK_FLAGS_x86_64-pc-windows-msvc := -shared -g -m64
+CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-msvc :=
+CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc :=
+CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-msvc :=
+CFG_GCCISH_LINK_FLAGS_x86_64-pc-windows-msvc :=
 CFG_GCCISH_DEF_FLAG_x86_64-pc-windows-msvc :=
-CFG_GCCISH_PRE_LIB_FLAGS_x86_64-pc-windows-msvc :=
-CFG_GCCISH_POST_LIB_FLAGS_x86_64-pc-windows-msvc :=
-CFG_DEF_SUFFIX_x86_64-pc-windows-msvc := .windows.def
 CFG_LLC_FLAGS_x86_64-pc-windows-msvc :=
 CFG_INSTALL_NAME_x86_64-pc-windows-msvc =
 CFG_EXE_SUFFIX_x86_64-pc-windows-msvc := .exe
 CFG_WINDOWSY_x86_64-pc-windows-msvc := 1
 CFG_UNIXY_x86_64-pc-windows-msvc :=
-CFG_PATH_MUNGE_x86_64-pc-windows-msvc :=
 CFG_LDPATH_x86_64-pc-windows-msvc :=
 CFG_RUN_x86_64-pc-windows-msvc=$(2)
 CFG_RUN_TARG_x86_64-pc-windows-msvc=$(call CFG_RUN_x86_64-pc-windows-msvc,,$(2))
-CFG_GNU_TRIPLE_x86_64-pc-windows-msvc := x86_64-w64-mingw32
+CFG_GNU_TRIPLE_x86_64-pc-windows-msvc := x86_64-pc-windows-msvc

mk/platform.mk

@@ -145,15 +145,15 @@ FIND_COMPILER = $(word 1,$(1:ccache=))
 define CFG_MAKE_TOOLCHAIN
   # Prepend the tools with their prefix if cross compiling
   ifneq ($(CFG_BUILD),$(1))
-	CC_$(1)=$(CROSS_PREFIX_$(1))$(CC_$(1))
-	CXX_$(1)=$(CROSS_PREFIX_$(1))$(CXX_$(1))
-	CPP_$(1)=$(CROSS_PREFIX_$(1))$(CPP_$(1))
-	AR_$(1)=$(CROSS_PREFIX_$(1))$(AR_$(1))
-	LINK_$(1)=$(CROSS_PREFIX_$(1))$(LINK_$(1))
-	RUSTC_CROSS_FLAGS_$(1)=-C linker=$$(call FIND_COMPILER,$$(LINK_$(1))) \
-	    -C ar=$$(call FIND_COMPILER,$$(AR_$(1))) $(RUSTC_CROSS_FLAGS_$(1))
-
-	RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1))
+       CC_$(1)=$(CROSS_PREFIX_$(1))$(CC_$(1))
+       CXX_$(1)=$(CROSS_PREFIX_$(1))$(CXX_$(1))
+       CPP_$(1)=$(CROSS_PREFIX_$(1))$(CPP_$(1))
+       AR_$(1)=$(CROSS_PREFIX_$(1))$(AR_$(1))
+       LINK_$(1)=$(CROSS_PREFIX_$(1))$(LINK_$(1))
+       RUSTC_CROSS_FLAGS_$(1)=-C linker=$$(call FIND_COMPILER,$$(LINK_$(1))) \
+           -C ar=$$(call FIND_COMPILER,$$(AR_$(1))) $(RUSTC_CROSS_FLAGS_$(1))
+
+       RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1))
   endif
 
   CFG_COMPILE_C_$(1) = $$(CC_$(1)) \

src/librustc/session/config.rs

@@ -632,7 +632,6 @@ pub fn default_configuration(sess: &Session) -> ast::CrateConfig {
     let mut ret = vec![ // Target bindings.
          attr::mk_word_item(fam.clone()),
          mk(InternedString::new("target_os"), intern(os)),
-         mk(InternedString::new("target_abi"), intern(abi)),
          mk(InternedString::new("target_family"), fam),
          mk(InternedString::new("target_arch"), intern(arch)),
          mk(InternedString::new("target_endian"), intern(end)),

src/librustc_back/target/aarch64_unknown_linux_gnu.rs

@@ -22,7 +22,6 @@ pub fn target() -> Target {
         target_env: "gnu".to_string(),
         arch: "aarch64".to_string(),
         target_os: "linux".to_string(),
-        target_abi: "".to_string(),
         options: base,
     }
 }

src/librustc_back/target/i686_unknown_linux_gnu.rs

@@ -22,11 +22,7 @@ pub fn target() -> Target {
         target_pointer_width: "32".to_string(),
         arch: "x86".to_string(),
         target_os: "linux".to_string(),
-<<<<<<< HEAD
         target_env: "gnu".to_string(),
-=======
-        target_abi: "".to_string(),
->>>>>>> 9f1453c... Very hacky MSVC hacks.
         options: base,
     }
 }

src/librustc_back/target/mod.rs

@@ -59,6 +59,7 @@ mod freebsd_base;
 mod linux_base;
 mod openbsd_base;
 mod windows_base;
+mod windows_msvc_base;
 
 /// Everything `rustc` knows about how to compile for a specific target.
 ///

src/librustc_back/target/windows_msvc_base.rs

@@ -13,8 +13,7 @@ use std::default::Default;
 
 pub fn opts() -> TargetOptions {
     TargetOptions {
-        // FIXME(#13846) this should be enabled for windows
-        function_sections: false,
+        function_sections: true,
         linker: "link".to_string(),
         dynamic_linking: true,
         executables: true,

src/librustc_back/target/x86_64_pc_windows_msvc.rs

@@ -24,7 +24,7 @@ pub fn target() -> Target {
         target_pointer_width: "64".to_string(),
         arch: "x86_64".to_string(),
         target_os: "windows".to_string(),
-        target_abi: "msvc".to_string(),
+        target_env: "msvc".to_string(),
         options: base,
     }
 }

src/librustc_llvm/lib.rs

@@ -55,7 +55,6 @@ pub use self::CallConv::*;
 pub use self::Visibility::*;
 pub use self::DiagnosticSeverity::*;
 pub use self::Linkage::*;
-pub use self::DLLStorageClass::*;
 
 use std::ffi::CString;
 use std::cell::RefCell;
@@ -115,13 +114,6 @@ pub enum Linkage {
     CommonLinkage = 14,
 }
 
-#[derive(Copy)]
-pub enum DLLStorageClass {
-    DefaultStorageClass = 0,
-    DLLImportStorageClass = 1,
-    DLLExportStorageClass = 2,
-}
-
 #[repr(C)]
 #[derive(Copy, Clone, Debug)]
 pub enum DiagnosticSeverity {
@@ -2133,12 +2125,6 @@ pub fn SetLinkage(global: ValueRef, link: Linkage) {
     }
 }
 
-pub fn SetDLLStorageClass(global: ValueRef, storage_class: DLLStorageClass) {
-    unsafe {
-        LLVMRustSetDLLStorageClass(global, storage_class as c_uint);
-    }
-}
-
 pub fn SetUnnamedAddr(global: ValueRef, unnamed: bool) {
     unsafe {
         LLVMSetUnnamedAddr(global, unnamed as Bool);

src/librustc_trans/back/link.rs

@@ -8,21 +8,22 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use super::archive::{ArchiveBuilder, ArchiveConfig, METADATA_FILENAME};
+use super::archive::{Archive, ArchiveBuilder, ArchiveConfig, METADATA_FILENAME};
+use super::archive;
+use super::rpath;
+use super::rpath::RPathConfig;
 use super::svh::Svh;
-
-use super::link_gnu;
-use super::link_msvc;
-
 use session::config;
+use session::config::NoDebugInfo;
 use session::config::{OutputFilenames, Input, OutputTypeBitcode, OutputTypeExe, OutputTypeObject};
 use session::search_paths::PathKind;
 use session::Session;
 use metadata::common::LinkMeta;
-use metadata::{encoder, cstore, csearch, creader};
+use metadata::{encoder, cstore, filesearch, csearch, creader};
 use metadata::filesearch::FileDoesntMatch;
 use trans::{CrateContext, CrateTranslation, gensym_name};
 use middle::ty::{self, Ty};
+use util::common::time;
 use util::ppaux;
 use util::sha2::{Digest, Sha256};
 use util::fs::fix_windows_verbatim_for_gcc;