575 files changed, 522 insertions, 17 deletions

diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index a398bcc9737..2e094a88982 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -313,6 +313,7 @@ impl<'a> Builder<'a> {
                 test::RunPassFullDepsPretty, test::RunFailFullDepsPretty,
                 test::Crate, test::CrateLibrustc, test::CrateRustdoc, test::Linkcheck,
                 test::Cargotest, test::Cargo, test::Rls, test::ErrorIndex, test::Distcheck,
+                test::RunMakeFullDeps,
                 test::Nomicon, test::Reference, test::RustdocBook, test::RustByExample,
                 test::TheBook, test::UnstableBook,
                 test::Rustfmt, test::Miri, test::Clippy, test::RustdocJS, test::RustdocTheme,
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index 86263c8fa07..2640248373c 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -915,7 +915,7 @@ impl Step for Assemble {
             }
         }
 
-        let lld_install = if build.config.lld_enabled && target_compiler.stage > 0 {
+        let lld_install = if build.config.lld_enabled {
             Some(builder.ensure(native::Lld {
                 target: target_compiler.host,
             }))
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index de938ec8e83..6c19da4648a 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -759,12 +759,18 @@ test!(RunFailFullDepsPretty {
     host: true
 });
 
-host_test!(RunMake {
+default_test!(RunMake {
     path: "src/test/run-make",
     mode: "run-make",
     suite: "run-make"
 });
 
+host_test!(RunMakeFullDeps {
+    path: "src/test/run-make-fulldeps",
+    mode: "run-make",
+    suite: "run-make-fulldeps"
+});
+
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 struct Compiletest {
     compiler: Compiler,
@@ -827,8 +833,7 @@ impl Step for Compiletest {
             // FIXME: Does pretty need librustc compiled? Note that there are
             // fulldeps test suites with mode = pretty as well.
             mode == "pretty" ||
-            mode == "rustdoc" ||
-            mode == "run-make" {
+            mode == "rustdoc" {
             builder.ensure(compile::Rustc { compiler, target });
         }
 
@@ -849,7 +854,7 @@ impl Step for Compiletest {
         cmd.arg("--rustc-path").arg(builder.rustc(compiler));
 
         // Avoid depending on rustdoc when we don't need it.
-        if mode == "rustdoc" || mode == "run-make" {
+        if mode == "rustdoc" || (mode == "run-make" && suite.ends_with("fulldeps")) {
             cmd.arg("--rustdoc-path").arg(builder.rustdoc(compiler.host));
         }
 
@@ -931,7 +936,7 @@ impl Step for Compiletest {
 
             // Only pass correct values for these flags for the `run-make` suite as it
             // requires that a C++ compiler was configured which isn't always the case.
-            if suite == "run-make" {
+            if suite == "run-make-fulldeps" {
                 let llvm_components = output(Command::new(&llvm_config).arg("--components"));
                 let llvm_cxxflags = output(Command::new(&llvm_config).arg("--cxxflags"));
                 cmd.arg("--cc").arg(build.cc(target))
@@ -944,12 +949,12 @@ impl Step for Compiletest {
                 }
             }
         }
-        if suite == "run-make" && !build.config.llvm_enabled {
+        if suite == "run-make-fulldeps" && !build.config.llvm_enabled {
             println!("Ignoring run-make test suite as they generally don't work without LLVM");
             return;
         }
 
-        if suite != "run-make" {
+        if suite != "run-make-fulldeps" {
             cmd.arg("--cc").arg("")
                .arg("--cxx").arg("")
                .arg("--cflags").arg("")
diff --git a/src/librustc/dep_graph/dep_node.rs b/src/librustc/dep_graph/dep_node.rs
index 1e2e4e5a69f..09d7ce599ab 100644
--- a/src/librustc/dep_graph/dep_node.rs
+++ b/src/librustc/dep_graph/dep_node.rs
@@ -650,6 +650,8 @@ define_dep_nodes!( <'tcx>
 
     [] GetSymbolExportLevel(DefId),
 
+    [] WasmCustomSections(CrateNum),
+
     [input] Features,
 
     [] ProgramClausesFor(DefId),
diff --git a/src/librustc/hir/check_attr.rs b/src/librustc/hir/check_attr.rs
index d7194e9c2ca..f141cac1614 100644
--- a/src/librustc/hir/check_attr.rs
+++ b/src/librustc/hir/check_attr.rs
@@ -25,6 +25,7 @@ enum Target {
     Struct,
     Union,
     Enum,
+    Const,
     Other,
 }
 
@@ -35,6 +36,7 @@ impl Target {
             hir::ItemStruct(..) => Target::Struct,
             hir::ItemUnion(..) => Target::Union,
             hir::ItemEnum(..) => Target::Enum,
+            hir::ItemConst(..) => Target::Const,
             _ => Target::Other,
         }
     }
@@ -60,6 +62,17 @@ impl<'a, 'tcx> CheckAttrVisitor<'a, 'tcx> {
                 if name == "inline" {
                     self.check_inline(attr, item, target)
                 }
+
+                if name == "wasm_custom_section" {
+                    if target != Target::Const {
+                        self.tcx.sess.span_err(attr.span, "only allowed on consts");
+                    }
+
+                    if attr.value_str().is_none() {
+                        self.tcx.sess.span_err(attr.span, "must be of the form \
+                            #[wasm_custom_section = \"foo\"]");
+                    }
+                }
             }
         }
 
diff --git a/src/librustc/middle/dead.rs b/src/librustc/middle/dead.rs
index 1ff9c7a8629..abd52624c30 100644
--- a/src/librustc/middle/dead.rs
+++ b/src/librustc/middle/dead.rs
@@ -318,6 +318,11 @@ fn has_allow_dead_code_or_lang_attr(tcx: TyCtxt,
         return true;
     }
 
+    // These constants are special for wasm
+    if attr::contains_name(attrs, "wasm_custom_section") {
+        return true;
+    }
+
     tcx.lint_level_at_node(lint::builtin::DEAD_CODE, id).0 == lint::Allow
 }
 
diff --git a/src/librustc/ty/maps/config.rs b/src/librustc/ty/maps/config.rs
index 117d9219312..0b41c3ab2fa 100644
--- a/src/librustc/ty/maps/config.rs
+++ b/src/librustc/ty/maps/config.rs
@@ -678,6 +678,12 @@ impl<'tcx> QueryDescription<'tcx> for queries::instance_def_size_estimate<'tcx>
     }
 }
 
+impl<'tcx> QueryDescription<'tcx> for queries::wasm_custom_sections<'tcx> {
+    fn describe(_tcx: TyCtxt, _: CrateNum) -> String {
+        format!("custom wasm sections for a crate")
+    }
+}
+
 impl<'tcx> QueryDescription<'tcx> for queries::generics_of<'tcx> {
     #[inline]
     fn cache_on_disk(def_id: Self::Key) -> bool {
diff --git a/src/librustc/ty/maps/mod.rs b/src/librustc/ty/maps/mod.rs
index 6c3b4efb932..2b4c1992762 100644
--- a/src/librustc/ty/maps/mod.rs
+++ b/src/librustc/ty/maps/mod.rs
@@ -424,6 +424,8 @@ define_maps! { <'tcx>
     [] fn features_query: features_node(CrateNum) -> Lrc<feature_gate::Features>,
 
     [] fn program_clauses_for: ProgramClausesFor(DefId) -> Lrc<Vec<Clause<'tcx>>>,
+
+    [] fn wasm_custom_sections: WasmCustomSections(CrateNum) -> Lrc<Vec<DefId>>,
 }
 
 //////////////////////////////////////////////////////////////////////
diff --git a/src/librustc/ty/maps/plumbing.rs b/src/librustc/ty/maps/plumbing.rs
index 4170fa76797..910c00b832e 100644
--- a/src/librustc/ty/maps/plumbing.rs
+++ b/src/librustc/ty/maps/plumbing.rs
@@ -940,6 +940,7 @@ pub fn force_from_dep_node<'a, 'gcx, 'lcx>(tcx: TyCtxt<'a, 'gcx, 'lcx>,
         DepKind::Features => { force!(features_query, LOCAL_CRATE); }
 
         DepKind::ProgramClausesFor => { force!(program_clauses_for, def_id!()); }
+        DepKind::WasmCustomSections => { force!(wasm_custom_sections, krate!()); }
     }
 
     true
diff --git a/src/librustc_metadata/cstore_impl.rs b/src/librustc_metadata/cstore_impl.rs
index 2de27f3a1c3..3c2f984ef8b 100644
--- a/src/librustc_metadata/cstore_impl.rs
+++ b/src/librustc_metadata/cstore_impl.rs
@@ -271,6 +271,8 @@ provide! { <'tcx> tcx, def_id, other, cdata,
 
         Arc::new(cdata.exported_symbols())
     }
+
+    wasm_custom_sections => { Lrc::new(cdata.wasm_custom_sections()) }
 }
 
 pub fn provide<'tcx>(providers: &mut Providers<'tcx>) {
diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs
index b0c945fbf2a..0e5df3142af 100644
--- a/src/librustc_metadata/decoder.rs
+++ b/src/librustc_metadata/decoder.rs
@@ -1067,6 +1067,16 @@ impl<'a, 'tcx> CrateMetadata {
             .collect()
     }
 
+    pub fn wasm_custom_sections(&self) -> Vec<DefId> {
+        let sections = self.root
+            .wasm_custom_sections
+            .decode(self)
+            .map(|def_index| self.local_def_id(def_index))
+            .collect::<Vec<_>>();
+        info!("loaded wasm sections {:?}", sections);
+        return sections
+    }
+
     pub fn get_macro(&self, id: DefIndex) -> (InternedString, MacroDef) {
         let entry = self.entry(id);
         match entry.kind {
diff --git a/src/librustc_metadata/encoder.rs b/src/librustc_metadata/encoder.rs
index 6b3453f2c99..56981b8f4a1 100644
--- a/src/librustc_metadata/encoder.rs
+++ b/src/librustc_metadata/encoder.rs
@@ -435,6 +435,12 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
             &exported_symbols);
         let exported_symbols_bytes = self.position() - i;
 
+        // encode wasm custom sections
+        let wasm_custom_sections = self.tcx.wasm_custom_sections(LOCAL_CRATE);
+        let wasm_custom_sections = self.tracked(
+            IsolatedEncoder::encode_wasm_custom_sections,
+            &wasm_custom_sections);
+
         // Encode and index the items.
         i = self.position();
         let items = self.encode_info_for_items();
@@ -478,6 +484,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
             def_path_table,
             impls,
             exported_symbols,
+            wasm_custom_sections,
             index,
         });
 
@@ -1444,6 +1451,11 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> {
             .cloned())
     }
 
+    fn encode_wasm_custom_sections(&mut self, statics: &[DefId]) -> LazySeq<DefIndex> {
+        info!("encoding custom wasm section constants {:?}", statics);
+        self.lazy_seq(statics.iter().map(|id| id.index))
+    }
+
     fn encode_dylib_dependency_formats(&mut self, _: ()) -> LazySeq<Option<LinkagePreference>> {
         match self.tcx.sess.dependency_formats.borrow().get(&config::CrateTypeDylib) {
             Some(arr) => {
diff --git a/src/librustc_metadata/schema.rs b/src/librustc_metadata/schema.rs
index 593f08e90bb..001772623e7 100644
--- a/src/librustc_metadata/schema.rs
+++ b/src/librustc_metadata/schema.rs
@@ -204,6 +204,7 @@ pub struct CrateRoot {
     pub def_path_table: Lazy<hir::map::definitions::DefPathTable>,
     pub impls: LazySeq<TraitImpls>,
     pub exported_symbols: LazySeq<(ExportedSymbol, SymbolExportLevel)>,
+    pub wasm_custom_sections: LazySeq<DefIndex>,
 
     pub index: LazySeq<index::Index>,
 }
diff --git a/src/librustc_trans/attributes.rs b/src/librustc_trans/attributes.rs
index 040d9455334..16253aa92ac 100644
--- a/src/librustc_trans/attributes.rs
+++ b/src/librustc_trans/attributes.rs
@@ -11,9 +11,11 @@
 
 use std::ffi::{CStr, CString};
 
-use rustc::hir::TransFnAttrFlags;
+use rustc::hir::{self, TransFnAttrFlags};
 use rustc::hir::def_id::{DefId, LOCAL_CRATE};
+use rustc::hir::itemlikevisit::ItemLikeVisitor;
 use rustc::session::config::Sanitizer;
+use rustc::ty::TyCtxt;
 use rustc::ty::maps::Providers;
 use rustc_data_structures::sync::Lrc;
 
@@ -161,4 +163,32 @@ pub fn provide(providers: &mut Providers) {
                 .collect())
         }
     };
+
+    providers.wasm_custom_sections = |tcx, cnum| {
+        assert_eq!(cnum, LOCAL_CRATE);
+        let mut finder = WasmSectionFinder { tcx, list: Vec::new() };
+        tcx.hir.krate().visit_all_item_likes(&mut finder);
+        Lrc::new(finder.list)
+    };
+}
+
+struct WasmSectionFinder<'a, 'tcx: 'a> {
+    tcx: TyCtxt<'a, 'tcx, 'tcx>,
+    list: Vec<DefId>,
+}
+
+impl<'a, 'tcx: 'a> ItemLikeVisitor<'tcx> for WasmSectionFinder<'a, 'tcx> {
+    fn visit_item(&mut self, i: &'tcx hir::Item) {
+        match i.node {
+            hir::ItemConst(..) => {}
+            _ => return,
+        }
+        if i.attrs.iter().any(|i| i.check_name("wasm_custom_section")) {
+            self.list.push(self.tcx.hir.local_def_id(i.id));
+        }
+    }
+
+    fn visit_trait_item(&mut self, _: &'tcx hir::TraitItem) {}
+
+    fn visit_impl_item(&mut self, _: &'tcx hir::ImplItem) {}
 }
diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
index bdda7741221..8e8ba823b6f 100644
--- a/src/librustc_trans/back/link.rs
+++ b/src/librustc_trans/back/link.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use back::wasm;
 use cc::windows_registry;
 use super::archive::{ArchiveBuilder, ArchiveConfig};
 use super::bytecode::RLIB_BYTECODE_EXTENSION;
@@ -810,6 +811,11 @@ fn link_natively(sess: &Session,
             Err(e) => sess.fatal(&format!("failed to run dsymutil: {}", e)),
         }
     }
+
+    if sess.opts.target_triple == "wasm32-unknown-unknown" {
+        wasm::add_custom_sections(&out_filename,
+                                  &trans.crate_info.wasm_custom_sections);
+    }
 }
 
 fn exec_linker(sess: &Session, cmd: &mut Command, tmpdir: &Path)
diff --git a/src/librustc_trans/back/wasm.rs b/src/librustc_trans/back/wasm.rs
new file mode 100644
index 00000000000..99f1e4b7e78
--- /dev/null
+++ b/src/librustc_trans/back/wasm.rs
@@ -0,0 +1,44 @@
+// Copyright 2018 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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::fs;
+use std::path::Path;
+use std::collections::BTreeMap;
+
+use serialize::leb128;
+
+pub fn add_custom_sections(path: &Path, sections: &BTreeMap<String, Vec<u8>>) {
+    let mut wasm = fs::read(path).expect("failed to read wasm output");
+
+    // see https://webassembly.github.io/spec/core/binary/modules.html#custom-section
+    for (section, bytes) in sections {
+        // write the `id` identifier, 0 for a custom section
+        let len = wasm.len();
+        leb128::write_u32_leb128(&mut wasm, len, 0);
+
+        // figure out how long our name descriptor will be
+        let mut name = Vec::new();
+        leb128::write_u32_leb128(&mut name, 0, section.len() as u32);
+        name.extend_from_slice(section.as_bytes());
+
+        // write the length of the payload
+        let len = wasm.len();
+        let total_len = bytes.len() + name.len();
+        leb128::write_u32_leb128(&mut wasm, len, total_len as u32);
+
+        // write out the name section
+        wasm.extend(name);
+
+        // and now the payload itself
+        wasm.extend_from_slice(bytes);
+    }
+
+    fs::write(path, &wasm).expect("failed to write wasm output");
+}
diff --git a/src/librustc_trans/base.rs b/src/librustc_trans/base.rs
index 4da082e9d50..11f952bc5bc 100644
--- a/src/librustc_trans/base.rs
+++ b/src/librustc_trans/base.rs
@@ -74,6 +74,7 @@ use rustc::util::nodemap::{FxHashMap, FxHashSet, DefIdSet};
 use CrateInfo;
 
 use std::any::Any;
+use std::collections::BTreeMap;
 use std::ffi::CString;
 use std::str;
 use std::sync::Arc;
@@ -1070,8 +1071,24 @@ impl CrateInfo {
             used_crates_dynamic: cstore::used_crates(tcx, LinkagePreference::RequireDynamic),
             used_crates_static: cstore::used_crates(tcx, LinkagePreference::RequireStatic),
             used_crate_source: FxHashMap(),
+            wasm_custom_sections: BTreeMap::new(),
         };
 
+        let load_wasm_sections = tcx.sess.crate_types.borrow()
+            .iter()
+            .any(|c| *c != config::CrateTypeRlib) &&
+            tcx.sess.opts.target_triple == "wasm32-unknown-unknown";
+
+        if load_wasm_sections {
+            info!("attempting to load all wasm sections");
+            for &id in tcx.wasm_custom_sections(LOCAL_CRATE).iter() {
+                let (name, contents) = fetch_wasm_section(tcx, id);
+                info.wasm_custom_sections.entry(name)
+                    .or_insert(Vec::new())
+                    .extend(contents);
+            }
+        }
+
         for &cnum in tcx.crates().iter() {
             info.native_libraries.insert(cnum, tcx.native_libraries(cnum));
             info.crate_name.insert(cnum, tcx.crate_name(cnum).to_string());
@@ -1091,6 +1108,14 @@ impl CrateInfo {
             if tcx.is_no_builtins(cnum) {
                 info.is_no_builtins.insert(cnum);
             }
+            if load_wasm_sections {
+                for &id in tcx.wasm_custom_sections(cnum).iter() {
+                    let (name, contents) = fetch_wasm_section(tcx, id);
+                    info.wasm_custom_sections.entry(name)
+                        .or_insert(Vec::new())
+                        .extend(contents);
+                }
+            }
         }
 
 
@@ -1270,3 +1295,44 @@ mod temp_stable_hash_impls {
         }
     }
 }
+
+fn fetch_wasm_section(tcx: TyCtxt, id: DefId) -> (String, Vec<u8>) {
+    use rustc::mir::interpret::{GlobalId, Value, PrimVal};
+    use rustc::middle::const_val::ConstVal;
+
+    info!("loading wasm section {:?}", id);
+
+    let section = tcx.get_attrs(id)
+        .iter()
+        .find(|a| a.check_name("wasm_custom_section"))
+        .expect("missing #[wasm_custom_section] attribute")
+        .value_str()
+        .expect("malformed #[wasm_custom_section] attribute");
+
+    let instance = ty::Instance::mono(tcx, id);
+    let cid = GlobalId {
+        instance,
+        promoted: None
+    };
+    let param_env = ty::ParamEnv::reveal_all();
+    let val = tcx.const_eval(param_env.and(cid)).unwrap();
+
+    let val = match val.val {
+        ConstVal::Value(val) => val,
+        ConstVal::Unevaluated(..) => bug!("should be evaluated"),
+    };
+    let val = match val {
+        Value::ByRef(ptr, _align) => ptr.into_inner_primval(),
+        ref v => bug!("should be ByRef, was {:?}", v),
+    };
+    let mem = match val {
+        PrimVal::Ptr(mem) => mem,
+        ref v => bug!("should be Ptr, was {:?}", v),
+    };
+    assert_eq!(mem.offset, 0);
+    let alloc = tcx
+        .interpret_interner
+        .get_alloc(mem.alloc_id)
+        .expect("miri allocation never successfully created");
+    (section.to_string(), alloc.bytes.clone())
+}
diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs
index 337f85a3813..bb2aeca3748 100644
--- a/src/librustc_trans/lib.rs
+++ b/src/librustc_trans/lib.rs
@@ -72,6 +72,7 @@ pub use llvm_util::target_features;
 use std::any::Any;
 use std::path::PathBuf;
 use std::sync::mpsc;
+use std::collections::BTreeMap;
 use rustc_data_structures::sync::Lrc;
 
 use rustc::dep_graph::DepGraph;
@@ -98,6 +99,7 @@ mod back {
     pub mod symbol_export;
     pub mod write;
     mod rpath;
+    mod wasm;
 }
 
 mod abi;
@@ -400,6 +402,7 @@ struct CrateInfo {
     used_crate_source: FxHashMap<CrateNum, Lrc<CrateSource>>,
     used_crates_static: Vec<(CrateNum, LibSource)>,
     used_crates_dynamic: Vec<(CrateNum, LibSource)>,
+    wasm_custom_sections: BTreeMap<String, Vec<u8>>,
 }
 
 __build_diagnostic_array! { librustc_trans, DIAGNOSTICS }
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index 69879bbe85d..f86fe1fb756 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -1182,9 +1182,15 @@ pub fn check_item_type<'a,'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, it: &'tcx hir::Item
     let _indenter = indenter();
     match it.node {
       // Consts can play a role in type-checking, so they are included here.
-      hir::ItemStatic(..) |
+      hir::ItemStatic(..) => {
+        tcx.typeck_tables_of(tcx.hir.local_def_id(it.id));
+      }
       hir::ItemConst(..) => {
         tcx.typeck_tables_of(tcx.hir.local_def_id(it.id));
+        if it.attrs.iter().any(|a| a.check_name("wasm_custom_section")) {
+            let def_id = tcx.hir.local_def_id(it.id);
+            check_const_is_u8_array(tcx, def_id, it.span);
+        }
       }
       hir::ItemEnum(ref enum_definition, _) => {
         check_enum(tcx,
@@ -1256,6 +1262,21 @@ pub fn check_item_type<'a,'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, it: &'tcx hir::Item
     }
 }
 
+fn check_const_is_u8_array<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
+                                     def_id: DefId,
+                                     span: Span) {
+    match tcx.type_of(def_id).sty {
+        ty::TyArray(t, _) => {
+            match t.sty {
+                ty::TyUint(ast::UintTy::U8) => return,
+                _ => {}
+            }
+        }
+        _ => {}
+    }
+    tcx.sess.span_err(span, "must be an array of bytes like `[u8; N]`");
+}
+
 fn check_on_unimplemented<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
                                     trait_def_id: DefId,
                                     item: &hir::Item) {
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 915396d29fe..dbcfee208ca 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -451,6 +451,9 @@ declare_features! (
 
     // `use path as _;` and `extern crate c as _;`
     (active, underscore_imports, "1.26.0", Some(48216), None),
+
+    // The #[wasm_custom_section] attribute
+    (active, wasm_custom_section, "1.26.0", None, None),
 );
 
 declare_features! (
@@ -1004,6 +1007,11 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG
                                  "never will be stable",
                                  cfg_fn!(rustc_attrs))),
 
+    ("wasm_custom_section", Whitelisted, Gated(Stability::Unstable,
+                                 "wasm_custom_section",
+                                 "attribute is currently unstable",
+                                 cfg_fn!(wasm_custom_section))),
+
     // Crate level attributes
     ("crate_name", CrateLevel, Ungated),
     ("crate_type", CrateLevel, Ungated),
diff --git a/src/test/run-make/a-b-a-linker-guard/Makefile b/src/test/run-make-fulldeps/a-b-a-linker-guard/Makefile
index 0962ebfbff5..0962ebfbff5 100644
--- a/src/test/run-make/a-b-a-linker-guard/Makefile
+++ b/src/test/run-make-fulldeps/a-b-a-linker-guard/Makefile
diff --git a/src/test/run-make/a-b-a-linker-guard/a.rs b/src/test/run-make-fulldeps/a-b-a-linker-guard/a.rs
index c6680a78819..c6680a78819 100644
--- a/src/test/run-make/a-b-a-linker-guard/a.rs
+++ b/src/test/run-make-fulldeps/a-b-a-linker-guard/a.rs
diff --git a/src/test/run-make/a-b-a-linker-guard/b.rs b/src/test/run-make-fulldeps/a-b-a-linker-guard/b.rs
index 89fd48de5bb..89fd48de5bb 100644
--- a/src/test/run-make/a-b-a-linker-guard/b.rs
+++ b/src/test/run-make-fulldeps/a-b-a-linker-guard/b.rs
diff --git a/src/test/run-make/alloc-extern-crates/Makefile b/src/test/run-make-fulldeps/alloc-extern-crates/Makefile
index 7197f4e17e3..7197f4e17e3 100644
--- a/src/test/run-make/alloc-extern-crates/Makefile
+++ b/src/test/run-make-fulldeps/alloc-extern-crates/Makefile
diff --git a/src/test/run-make/alloc-extern-crates/fakealloc.rs b/src/test/run-make-fulldeps/alloc-extern-crates/fakealloc.rs
index 43f97489314..43f97489314 100644
--- a/src/test/run-make/alloc-extern-crates/fakealloc.rs
+++ b/src/test/run-make-fulldeps/alloc-extern-crates/fakealloc.rs
diff --git a/src/test/run-make/allow-non-lint-warnings-cmdline/Makefile b/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile
index c14006cc2e0..c14006cc2e0 100644
--- a/src/test/run-make/allow-non-lint-warnings-cmdline/Makefile
+++ b/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile
diff --git a/src/test/run-make/allow-non-lint-warnings-cmdline/foo.rs b/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs
index a9e18f5a8f1..a9e18f5a8f1 100644
--- a/src/test/run-make/allow-non-lint-warnings-cmdline/foo.rs
+++ b/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs
diff --git a/src/test/run-make/allow-warnings-cmdline-stability/Makefile b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile
index 3eecaf93142..3eecaf93142 100644
--- a/src/test/run-make/allow-warnings-cmdline-stability/Makefile
+++ b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile
diff --git a/src/test/run-make/allow-warnings-cmdline-stability/bar.rs b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs
index fed1405b7f4..fed1405b7f4 100644
--- a/src/test/run-make/allow-warnings-cmdline-stability/bar.rs
+++ b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs
diff --git a/src/test/run-make/allow-warnings-cmdline-stability/foo.rs b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs
index a36cc474c2b..a36cc474c2b 100644
--- a/src/test/run-make/allow-warnings-cmdline-stability/foo.rs
+++ b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs
diff --git a/src/test/run-make/archive-duplicate-names/Makefile b/src/test/run-make-fulldeps/archive-duplicate-names/Makefile
index 93711c41d79..93711c41d79 100644
--- a/src/test/run-make/archive-duplicate-names/Makefile
+++ b/src/test/run-make-fulldeps/archive-duplicate-names/Makefile
diff --git a/src/test/run-make/archive-duplicate-names/bar.c b/src/test/run-make-fulldeps/archive-duplicate-names/bar.c
index a25fa10f4d3..a25fa10f4d3 100644
--- a/src/test/run-make/archive-duplicate-names/bar.c
+++ b/src/test/run-make-fulldeps/archive-duplicate-names/bar.c
diff --git a/src/test/run-make/archive-duplicate-names/bar.rs b/src/test/run-make-fulldeps/archive-duplicate-names/bar.rs
index 1200a6de8e2..1200a6de8e2 100644
--- a/src/test/run-make/archive-duplicate-names/bar.rs
+++ b/src/test/run-make-fulldeps/archive-duplicate-names/bar.rs
diff --git a/src/test/run-make/archive-duplicate-names/foo.c b/src/test/run-make-fulldeps/archive-duplicate-names/foo.c
index 61d5d154078..61d5d154078 100644
--- a/src/test/run-make/archive-duplicate-names/foo.c
+++ b/src/test/run-make-fulldeps/archive-duplicate-names/foo.c
diff --git a/src/test/run-make/archive-duplicate-names/foo.rs b/src/test/run-make-fulldeps/archive-duplicate-names/foo.rs
index 24b4734f2cd..24b4734f2cd 100644
--- a/src/test/run-make/archive-duplicate-names/foo.rs
+++ b/src/test/run-make-fulldeps/archive-duplicate-names/foo.rs
diff --git a/src/test/run-make/atomic-lock-free/Makefile b/src/test/run-make-fulldeps/atomic-lock-free/Makefile
index a7df821f92d..a7df821f92d 100644
--- a/src/test/run-make/atomic-lock-free/Makefile
+++ b/src/test/run-make-fulldeps/atomic-lock-free/Makefile
diff --git a/src/test/run-make/atomic-lock-free/atomic_lock_free.rs b/src/test/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs
index b41e8e9226b..b41e8e9226b 100644
--- a/src/test/run-make/atomic-lock-free/atomic_lock_free.rs
+++ b/src/test/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs
diff --git a/src/test/run-make/bare-outfile/Makefile b/src/test/run-make-fulldeps/bare-outfile/Makefile
index baa4c1c0237..baa4c1c0237 100644
--- a/src/test/run-make/bare-outfile/Makefile
+++ b/src/test/run-make-fulldeps/bare-outfile/Makefile
diff --git a/src/test/run-make/bare-outfile/foo.rs b/src/test/run-make-fulldeps/bare-outfile/foo.rs
index 63e747901ae..63e747901ae 100644
--- a/src/test/run-make/bare-outfile/foo.rs
+++ b/src/test/run-make-fulldeps/bare-outfile/foo.rs
diff --git a/src/test/run-make/c-dynamic-dylib/Makefile b/src/test/run-make-fulldeps/c-dynamic-dylib/Makefile
index 83bddd4c73c..83bddd4c73c 100644
--- a/src/test/run-make/c-dynamic-dylib/Makefile
+++ b/src/test/run-make-fulldeps/c-dynamic-dylib/Makefile
diff --git a/src/test/run-make/c-dynamic-dylib/bar.rs b/src/test/run-make-fulldeps/c-dynamic-dylib/bar.rs
index 37b120decd1..37b120decd1 100644
--- a/src/test/run-make/c-dynamic-dylib/bar.rs
+++ b/src/test/run-make-fulldeps/c-dynamic-dylib/bar.rs
diff --git a/src/test/run-make/c-dynamic-dylib/cfoo.c b/src/test/run-make-fulldeps/c-dynamic-dylib/cfoo.c
index a9755493541..a9755493541 100644
--- a/src/test/run-make/c-dynamic-dylib/cfoo.c
+++ b/src/test/run-make-fulldeps/c-dynamic-dylib/cfoo.c
diff --git a/src/test/run-make/c-dynamic-dylib/foo.rs b/src/test/run-make-fulldeps/c-dynamic-dylib/foo.rs
index 04253be71d4..04253be71d4 100644
--- a/src/test/run-make/c-dynamic-dylib/foo.rs
+++ b/src/test/run-make-fulldeps/c-dynamic-dylib/foo.rs
diff --git a/src/test/run-make/c-dynamic-rlib/Makefile b/src/test/run-make-fulldeps/c-dynamic-rlib/Makefile
index e15cfd34d6c..e15cfd34d6c 100644
--- a/src/test/run-make/c-dynamic-rlib/Makefile
+++ b/src/test/run-make-fulldeps/c-dynamic-rlib/Makefile
diff --git a/src/test/run-make/c-dynamic-rlib/bar.rs b/src/test/run-make-fulldeps/c-dynamic-rlib/bar.rs
index 37b120decd1..37b120decd1 100644
--- a/src/test/run-make/c-dynamic-rlib/bar.rs
+++ b/src/test/run-make-fulldeps/c-dynamic-rlib/bar.rs
diff --git a/src/test/run-make/c-dynamic-rlib/cfoo.c b/src/test/run-make-fulldeps/c-dynamic-rlib/cfoo.c
index b2849326a75..b2849326a75 100644
--- a/src/test/run-make/c-dynamic-rlib/cfoo.c
+++ b/src/test/run-make-fulldeps/c-dynamic-rlib/cfoo.c
diff --git a/src/test/run-make/c-dynamic-rlib/foo.rs b/src/test/run-make-fulldeps/c-dynamic-rlib/foo.rs
index a1f01bd2b62..a1f01bd2b62 100644
--- a/src/test/run-make/c-dynamic-rlib/foo.rs
+++ b/src/test/run-make-fulldeps/c-dynamic-rlib/foo.rs
diff --git a/src/test/run-make/c-link-to-rust-dylib/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-dylib/Makefile
index 98e112a3744..98e112a3744 100644
--- a/src/test/run-make/c-link-to-rust-dylib/Makefile
+++ b/src/test/run-make-fulldeps/c-link-to-rust-dylib/Makefile
diff --git a/src/test/run-make/c-link-to-rust-dylib/bar.c b/src/test/run-make-fulldeps/c-link-to-rust-dylib/bar.c
index 5729d411c5b..5729d411c5b 100644
--- a/src/test/run-make/c-link-to-rust-dylib/bar.c
+++ b/src/test/run-make-fulldeps/c-link-to-rust-dylib/bar.c
diff --git a/src/test/run-make/c-link-to-rust-dylib/foo.rs b/src/test/run-make-fulldeps/c-link-to-rust-dylib/foo.rs
index 32675bcba1e..32675bcba1e 100644
--- a/src/test/run-make/c-link-to-rust-dylib/foo.rs
+++ b/src/test/run-make-fulldeps/c-link-to-rust-dylib/foo.rs
diff --git a/src/test/run-make/c-link-to-rust-staticlib/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/Makefile
index 47264e82165..47264e82165 100644
--- a/src/test/run-make/c-link-to-rust-staticlib/Makefile
+++ b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/Makefile
diff --git a/src/test/run-make/c-link-to-rust-staticlib/bar.c b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/bar.c
index 5729d411c5b..5729d411c5b 100644
--- a/src/test/run-make/c-link-to-rust-staticlib/bar.c
+++ b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/bar.c
diff --git a/src/test/run-make/c-link-to-rust-staticlib/foo.rs b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs
index 1bb19016700..1bb19016700 100644
--- a/src/test/run-make/c-link-to-rust-staticlib/foo.rs
+++ b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs
diff --git a/src/test/run-make/c-static-dylib/Makefile b/src/test/run-make-fulldeps/c-static-dylib/Makefile
index f88786857cc..f88786857cc 100644
--- a/src/test/run-make/c-static-dylib/Makefile
+++ b/src/test/run-make-fulldeps/c-static-dylib/Makefile
diff --git a/src/test/run-make/c-static-dylib/bar.rs b/src/test/run-make-fulldeps/c-static-dylib/bar.rs
index 37b120decd1..37b120decd1 100644
--- a/src/test/run-make/c-static-dylib/bar.rs
+++ b/src/test/run-make-fulldeps/c-static-dylib/bar.rs
diff --git a/src/test/run-make/c-static-dylib/cfoo.c b/src/test/run-make-fulldeps/c-static-dylib/cfoo.c
index 113717a776a..113717a776a 100644
--- a/src/test/run-make/c-static-dylib/cfoo.c
+++ b/src/test/run-make-fulldeps/c-static-dylib/cfoo.c
diff --git a/src/test/run-make/c-static-dylib/foo.rs b/src/test/run-make-fulldeps/c-static-dylib/foo.rs
index 44be5ac890d..44be5ac890d 100644
--- a/src/test/run-make/c-static-dylib/foo.rs
+++ b/src/test/run-make-fulldeps/c-static-dylib/foo.rs
diff --git a/src/test/run-make/c-static-rlib/Makefile b/src/test/run-make-fulldeps/c-static-rlib/Makefile
index be22b2728f0..be22b2728f0 100644
--- a/src/test/run-make/c-static-rlib/Makefile
+++ b/src/test/run-make-fulldeps/c-static-rlib/Makefile
diff --git a/src/test/run-make/c-static-rlib/bar.rs b/src/test/run-make-fulldeps/c-static-rlib/bar.rs
index 37b120decd1..37b120decd1 100644
--- a/src/test/run-make/c-static-rlib/bar.rs
+++ b/src/test/run-make-fulldeps/c-static-rlib/bar.rs
diff --git a/src/test/run-make/c-static-rlib/cfoo.c b/src/test/run-make-fulldeps/c-static-rlib/cfoo.c
index 113717a776a..113717a776a 100644
--- a/src/test/run-make/c-static-rlib/cfoo.c
+++ b/src/test/run-make-fulldeps/c-static-rlib/cfoo.c
diff --git a/src/test/run-make/c-static-rlib/foo.rs b/src/test/run-make-fulldeps/c-static-rlib/foo.rs
index cbd7b020bd8..cbd7b020bd8 100644
--- a/src/test/run-make/c-static-rlib/foo.rs
+++ b/src/test/run-make-fulldeps/c-static-rlib/foo.rs
diff --git a/src/test/run-make/cat-and-grep-sanity-check/Makefile b/src/test/run-make-fulldeps/cat-and-grep-sanity-check/Makefile
index fead197ce39..fead197ce39 100644
--- a/src/test/run-make/cat-and-grep-sanity-check/Makefile
+++ b/src/test/run-make-fulldeps/cat-and-grep-sanity-check/Makefile
diff --git a/src/test/run-make/cdylib-fewer-symbols/Makefile b/src/test/run-make-fulldeps/cdylib-fewer-symbols/Makefile
index 1a0664dfafd..1a0664dfafd 100644
--- a/src/test/run-make/cdylib-fewer-symbols/Makefile
+++ b/src/test/run-make-fulldeps/cdylib-fewer-symbols/Makefile
diff --git a/src/test/run-make/cdylib-fewer-symbols/foo.rs b/src/test/run-make-fulldeps/cdylib-fewer-symbols/foo.rs
index 4ec8d4ee860..4ec8d4ee860 100644
--- a/src/test/run-make/cdylib-fewer-symbols/foo.rs
+++ b/src/test/run-make-fulldeps/cdylib-fewer-symbols/foo.rs
diff --git a/src/test/run-make/cdylib/Makefile b/src/test/run-make-fulldeps/cdylib/Makefile
index 47ec762b3e9..47ec762b3e9 100644
--- a/src/test/run-make/cdylib/Makefile
+++ b/src/test/run-make-fulldeps/cdylib/Makefile
diff --git a/src/test/run-make/cdylib/bar.rs b/src/test/run-make-fulldeps/cdylib/bar.rs
index 2c97298604c..2c97298604c 100644
--- a/src/test/run-make/cdylib/bar.rs
+++ b/src/test/run-make-fulldeps/cdylib/bar.rs
diff --git a/src/test/run-make/cdylib/foo.c b/src/test/run-make-fulldeps/cdylib/foo.c
index 1c950427c65..1c950427c65 100644
--- a/src/test/run-make/cdylib/foo.c
+++ b/src/test/run-make-fulldeps/cdylib/foo.c
diff --git a/src/test/run-make/cdylib/foo.rs b/src/test/run-make-fulldeps/cdylib/foo.rs
index cdac6d19035..cdac6d19035 100644
--- a/src/test/run-make/cdylib/foo.rs
+++ b/src/test/run-make-fulldeps/cdylib/foo.rs
diff --git a/src/test/run-make/codegen-options-parsing/Makefile b/src/test/run-make-fulldeps/codegen-options-parsing/Makefile
index fda96a8b1fb..fda96a8b1fb 100644
--- a/src/test/run-make/codegen-options-parsing/Makefile
+++ b/src/test/run-make-fulldeps/codegen-options-parsing/Makefile
diff --git a/src/test/run-make/codegen-options-parsing/dummy.rs b/src/test/run-make-fulldeps/codegen-options-parsing/dummy.rs
index 8ae3d072362..8ae3d072362 100644
--- a/src/test/run-make/codegen-options-parsing/dummy.rs
+++ b/src/test/run-make-fulldeps/codegen-options-parsing/dummy.rs
diff --git a/src/test/run-make/compile-stdin/Makefile b/src/test/run-make-fulldeps/compile-stdin/Makefile
index 1442224cf9a..1442224cf9a 100644
--- a/src/test/run-make/compile-stdin/Makefile
+++ b/src/test/run-make-fulldeps/compile-stdin/Makefile
diff --git a/src/test/run-make/compiler-lookup-paths-2/Makefile b/src/test/run-make-fulldeps/compiler-lookup-paths-2/Makefile
index bd7f62d5c2d..bd7f62d5c2d 100644
--- a/src/test/run-make/compiler-lookup-paths-2/Makefile
+++ b/src/test/run-make-fulldeps/compiler-lookup-paths-2/Makefile
diff --git a/src/test/run-make/compiler-lookup-paths-2/a.rs b/src/test/run-make-fulldeps/compiler-lookup-paths-2/a.rs
index e7572a5f615..e7572a5f615 100644
--- a/src/test/run-make/compiler-lookup-paths-2/a.rs
+++ b/src/test/run-make-fulldeps/compiler-lookup-paths-2/a.rs
diff --git a/src/test/run-make/compiler-lookup-paths-2/b.rs b/src/test/run-make-fulldeps/compiler-lookup-paths-2/b.rs
index fee0da9b4c1..fee0da9b4c1 100644
--- a/src/test/run-make/compiler-lookup-paths-2/b.rs
+++ b/src/test/run-make-fulldeps/compiler-lookup-paths-2/b.rs
diff --git a/src/test/run-make/compiler-lookup-paths-2/c.rs b/src/test/run-make-fulldeps/compiler-lookup-paths-2/c.rs
index 66fe51d1099..66fe51d1099 100644
--- a/src/test/run-make/compiler-lookup-paths-2/c.rs
+++ b/src/test/run-make-fulldeps/compiler-lookup-paths-2/c.rs
diff --git a/src/test/run-make/compiler-lookup-paths/Makefile b/src/test/run-make-fulldeps/compiler-lookup-paths/Makefile
index e22b937a087..e22b937a087 100644
--- a/src/test/run-make/compiler-lookup-paths/Makefile
+++ b/src/test/run-make-fulldeps/compiler-lookup-paths/Makefile
diff --git a/src/test/run-make/compiler-lookup-paths/a.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/a.rs
index 4ddf231fba2..4ddf231fba2 100644
--- a/src/test/run-make/compiler-lookup-paths/a.rs
+++ b/src/test/run-make-fulldeps/compiler-lookup-paths/a.rs
diff --git a/src/test/run-make/compiler-lookup-paths/b.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/b.rs
index c38300f976e..c38300f976e 100644
--- a/src/test/run-make/compiler-lookup-paths/b.rs
+++ b/src/test/run-make-fulldeps/compiler-lookup-paths/b.rs
diff --git a/src/test/run-make/compiler-lookup-paths/c.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/c.rs
index b5c54558a4f..b5c54558a4f 100644
--- a/src/test/run-make/compiler-lookup-paths/c.rs
+++ b/src/test/run-make-fulldeps/compiler-lookup-paths/c.rs
diff --git a/src/test/run-make/compiler-lookup-paths/d.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/d.rs
index 295b6e00e41..295b6e00e41 100644
--- a/src/test/run-make/compiler-lookup-paths/d.rs
+++ b/src/test/run-make-fulldeps/compiler-lookup-paths/d.rs
diff --git a/src/test/run-make/compiler-lookup-paths/e.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/e.rs
index c0407aba7c9..c0407aba7c9 100644
--- a/src/test/run-make/compiler-lookup-paths/e.rs
+++ b/src/test/run-make-fulldeps/compiler-lookup-paths/e.rs
diff --git a/src/test/run-make/compiler-lookup-paths/e2.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/e2.rs
index f8c8c029c0b..f8c8c029c0b 100644
--- a/src/test/run-make/compiler-lookup-paths/e2.rs
+++ b/src/test/run-make-fulldeps/compiler-lookup-paths/e2.rs
diff --git a/src/test/run-make/compiler-lookup-paths/f.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/f.rs
index e6160422576..e6160422576 100644
--- a/src/test/run-make/compiler-lookup-paths/f.rs
+++ b/src/test/run-make-fulldeps/compiler-lookup-paths/f.rs
diff --git a/src/test/run-make/compiler-lookup-paths/native.c b/src/test/run-make-fulldeps/compiler-lookup-paths/native.c
index 30669470522..30669470522 100644
--- a/src/test/run-make/compiler-lookup-paths/native.c
+++ b/src/test/run-make-fulldeps/compiler-lookup-paths/native.c
diff --git a/src/test/run-make/compiler-rt-works-on-mingw/Makefile b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile
index 06d1bb6698e..06d1bb6698e 100644
--- a/src/test/run-make/compiler-rt-works-on-mingw/Makefile
+++ b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile
diff --git a/src/test/run-make/compiler-rt-works-on-mingw/foo.cpp b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp
index aac3ba42201..aac3ba42201 100644
--- a/src/test/run-make/compiler-rt-works-on-mingw/foo.cpp
+++ b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp
diff --git a/src/test/run-make/compiler-rt-works-on-mingw/foo.rs b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs
index 293f9d58294..293f9d58294 100644
--- a/src/test/run-make/compiler-rt-works-on-mingw/foo.rs
+++ b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs
diff --git a/src/test/run-make/crate-data-smoke/Makefile b/src/test/run-make-fulldeps/crate-data-smoke/Makefile
index 1afda457411..1afda457411 100644
--- a/src/test/run-make/crate-data-smoke/Makefile
+++ b/src/test/run-make-fulldeps/crate-data-smoke/Makefile
diff --git a/src/test/run-make/crate-data-smoke/crate.rs b/src/test/run-make-fulldeps/crate-data-smoke/crate.rs
index 305b3dc70a6..305b3dc70a6 100644
--- a/src/test/run-make/crate-data-smoke/crate.rs
+++ b/src/test/run-make-fulldeps/crate-data-smoke/crate.rs
diff --git a/src/test/run-make/crate-data-smoke/lib.rs b/src/test/run-make-fulldeps/crate-data-smoke/lib.rs
index 639a5d0387b..639a5d0387b 100644
--- a/src/test/run-make/crate-data-smoke/lib.rs
+++ b/src/test/run-make-fulldeps/crate-data-smoke/lib.rs
diff --git a/src/test/run-make/crate-data-smoke/rlib.rs b/src/test/run-make-fulldeps/crate-data-smoke/rlib.rs
index 4e093748600..4e093748600 100644
--- a/src/test/run-make/crate-data-smoke/rlib.rs
+++ b/src/test/run-make-fulldeps/crate-data-smoke/rlib.rs
diff --git a/src/test/run-make/crate-name-priority/Makefile b/src/test/run-make-fulldeps/crate-name-priority/Makefile
index 17ecb33ab28..17ecb33ab28 100644
--- a/src/test/run-make/crate-name-priority/Makefile
+++ b/src/test/run-make-fulldeps/crate-name-priority/Makefile
diff --git a/src/test/run-make/crate-name-priority/foo.rs b/src/test/run-make-fulldeps/crate-name-priority/foo.rs
index 8ae3d072362..8ae3d072362 100644
--- a/src/test/run-make/crate-name-priority/foo.rs
+++ b/src/test/run-make-fulldeps/crate-name-priority/foo.rs
diff --git a/src/test/run-make/crate-name-priority/foo1.rs b/src/test/run-make-fulldeps/crate-name-priority/foo1.rs
index a397d6bc749..a397d6bc749 100644
--- a/src/test/run-make/crate-name-priority/foo1.rs
+++ b/src/test/run-make-fulldeps/crate-name-priority/foo1.rs
diff --git a/src/test/run-make/debug-assertions/Makefile b/src/test/run-make-fulldeps/debug-assertions/Makefile
index 76ada90f1e2..76ada90f1e2 100644
--- a/src/test/run-make/debug-assertions/Makefile
+++ b/src/test/run-make-fulldeps/debug-assertions/Makefile
diff --git a/src/test/run-make/debug-assertions/debug.rs b/src/test/run-make-fulldeps/debug-assertions/debug.rs
index 65682cb86c3..65682cb86c3 100644
--- a/src/test/run-make/debug-assertions/debug.rs
+++ b/src/test/run-make-fulldeps/debug-assertions/debug.rs
diff --git a/src/test/run-make/dep-info-doesnt-run-much/Makefile b/src/test/run-make-fulldeps/dep-info-doesnt-run-much/Makefile
index 2fd84639f21..2fd84639f21 100644
--- a/src/test/run-make/dep-info-doesnt-run-much/Makefile
+++ b/src/test/run-make-fulldeps/dep-info-doesnt-run-much/Makefile
diff --git a/src/test/run-make/dep-info-doesnt-run-much/foo.rs b/src/test/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs
index 35911821044..35911821044 100644
--- a/src/test/run-make/dep-info-doesnt-run-much/foo.rs
+++ b/src/test/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs
diff --git a/src/test/run-make/dep-info-spaces/Makefile b/src/test/run-make-fulldeps/dep-info-spaces/Makefile
index 82686ffdd9d..82686ffdd9d 100644
--- a/src/test/run-make/dep-info-spaces/Makefile
+++ b/src/test/run-make-fulldeps/dep-info-spaces/Makefile
diff --git a/src/test/run-make/dep-info-spaces/Makefile.foo b/src/test/run-make-fulldeps/dep-info-spaces/Makefile.foo
index 80a5d4333cd..80a5d4333cd 100644
--- a/src/test/run-make/dep-info-spaces/Makefile.foo
+++ b/src/test/run-make-fulldeps/dep-info-spaces/Makefile.foo
diff --git a/src/test/run-make/dep-info-spaces/bar.rs b/src/test/run-make-fulldeps/dep-info-spaces/bar.rs
index 4c79f7e2855..4c79f7e2855 100644
--- a/src/test/run-make/dep-info-spaces/bar.rs
+++ b/src/test/run-make-fulldeps/dep-info-spaces/bar.rs
diff --git a/src/test/run-make/dep-info-spaces/foo foo.rs b/src/test/run-make-fulldeps/dep-info-spaces/foo foo.rs
index 2661b1f4eb4..2661b1f4eb4 100644
--- a/src/test/run-make/dep-info-spaces/foo foo.rs
+++ b/src/test/run-make-fulldeps/dep-info-spaces/foo foo.rs
diff --git a/src/test/run-make/dep-info-spaces/lib.rs b/src/test/run-make-fulldeps/dep-info-spaces/lib.rs
index bfbe41baeac..bfbe41baeac 100644
--- a/src/test/run-make/dep-info-spaces/lib.rs
+++ b/src/test/run-make-fulldeps/dep-info-spaces/lib.rs
diff --git a/src/test/run-make/dep-info/Makefile b/src/test/run-make-fulldeps/dep-info/Makefile
index 9b79d1af521..9b79d1af521 100644
--- a/src/test/run-make/dep-info/Makefile
+++ b/src/test/run-make-fulldeps/dep-info/Makefile
diff --git a/src/test/run-make/dep-info/Makefile.foo b/src/test/run-make-fulldeps/dep-info/Makefile.foo
index e5df31f88c1..e5df31f88c1 100644
--- a/src/test/run-make/dep-info/Makefile.foo
+++ b/src/test/run-make-fulldeps/dep-info/Makefile.foo
diff --git a/src/test/run-make/dep-info/bar.rs b/src/test/run-make-fulldeps/dep-info/bar.rs
index 4c79f7e2855..4c79f7e2855 100644
--- a/src/test/run-make/dep-info/bar.rs
+++ b/src/test/run-make-fulldeps/dep-info/bar.rs
diff --git a/src/test/run-make/dep-info/foo.rs b/src/test/run-make-fulldeps/dep-info/foo.rs
index 2661b1f4eb4..2661b1f4eb4 100644
--- a/src/test/run-make/dep-info/foo.rs
+++ b/src/test/run-make-fulldeps/dep-info/foo.rs
diff --git a/src/test/run-make/dep-info/lib.rs b/src/test/run-make-fulldeps/dep-info/lib.rs
index 7c15785bbb2..7c15785bbb2 100644
--- a/src/test/run-make/dep-info/lib.rs
+++ b/src/test/run-make-fulldeps/dep-info/lib.rs
diff --git a/src/test/run-make/dep-info/lib2.rs b/src/test/run-make-fulldeps/dep-info/lib2.rs
index 1b70fb4eb4b..1b70fb4eb4b 100644
--- a/src/test/run-make/dep-info/lib2.rs
+++ b/src/test/run-make-fulldeps/dep-info/lib2.rs
diff --git a/src/test/run-make/duplicate-output-flavors/Makefile b/src/test/run-make-fulldeps/duplicate-output-flavors/Makefile
index e33279966c9..e33279966c9 100644
--- a/src/test/run-make/duplicate-output-flavors/Makefile
+++ b/src/test/run-make-fulldeps/duplicate-output-flavors/Makefile
diff --git a/src/test/run-make/duplicate-output-flavors/foo.rs b/src/test/run-make-fulldeps/duplicate-output-flavors/foo.rs
index 04d3ae67207..04d3ae67207 100644
--- a/src/test/run-make/duplicate-output-flavors/foo.rs
+++ b/src/test/run-make-fulldeps/duplicate-output-flavors/foo.rs
diff --git a/src/test/run-make/dylib-chain/Makefile b/src/test/run-make-fulldeps/dylib-chain/Makefile
index a33177197b1..a33177197b1 100644
--- a/src/test/run-make/dylib-chain/Makefile
+++ b/src/test/run-make-fulldeps/dylib-chain/Makefile
diff --git a/src/test/run-make/dylib-chain/m1.rs b/src/test/run-make-fulldeps/dylib-chain/m1.rs
index 5437c935c4e..5437c935c4e 100644
--- a/src/test/run-make/dylib-chain/m1.rs
+++ b/src/test/run-make-fulldeps/dylib-chain/m1.rs
diff --git a/src/test/run-make/dylib-chain/m2.rs b/src/test/run-make-fulldeps/dylib-chain/m2.rs
index b464f32eae2..b464f32eae2 100644
--- a/src/test/run-make/dylib-chain/m2.rs
+++ b/src/test/run-make-fulldeps/dylib-chain/m2.rs
diff --git a/src/test/run-make/dylib-chain/m3.rs b/src/test/run-make-fulldeps/dylib-chain/m3.rs
index bf431cc827b..bf431cc827b 100644
--- a/src/test/run-make/dylib-chain/m3.rs
+++ b/src/test/run-make-fulldeps/dylib-chain/m3.rs
diff --git a/src/test/run-make/dylib-chain/m4.rs b/src/test/run-make-fulldeps/dylib-chain/m4.rs
index 6c2a6685802..6c2a6685802 100644
--- a/src/test/run-make/dylib-chain/m4.rs
+++ b/src/test/run-make-fulldeps/dylib-chain/m4.rs
diff --git a/src/test/run-make/emit/Makefile b/src/test/run-make-fulldeps/emit/Makefile
index e0b57107e5b..e0b57107e5b 100644
--- a/src/test/run-make/emit/Makefile
+++ b/src/test/run-make-fulldeps/emit/Makefile
diff --git a/src/test/run-make/emit/test-24876.rs b/src/test/run-make-fulldeps/emit/test-24876.rs
index ab69decbf00..ab69decbf00 100644
--- a/src/test/run-make/emit/test-24876.rs
+++ b/src/test/run-make-fulldeps/emit/test-24876.rs
diff --git a/src/test/run-make/emit/test-26235.rs b/src/test/run-make-fulldeps/emit/test-26235.rs
index 97b58a3671b..97b58a3671b 100644
--- a/src/test/run-make/emit/test-26235.rs
+++ b/src/test/run-make-fulldeps/emit/test-26235.rs
diff --git a/src/test/run-make/error-found-staticlib-instead-crate/Makefile b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile
index fef12c4da67..fef12c4da67 100644
--- a/src/test/run-make/error-found-staticlib-instead-crate/Makefile
+++ b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile
diff --git a/src/test/run-make/error-found-staticlib-instead-crate/bar.rs b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs
index 5ab3e5ee99d..5ab3e5ee99d 100644
--- a/src/test/run-make/error-found-staticlib-instead-crate/bar.rs
+++ b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs
diff --git a/src/test/run-make/error-found-staticlib-instead-crate/foo.rs b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs
index 222d98a12de..222d98a12de 100644
--- a/src/test/run-make/error-found-staticlib-instead-crate/foo.rs
+++ b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs
diff --git a/src/test/run-make/error-writing-dependencies/Makefile b/src/test/run-make-fulldeps/error-writing-dependencies/Makefile
index cbc96901a38..cbc96901a38 100644
--- a/src/test/run-make/error-writing-dependencies/Makefile
+++ b/src/test/run-make-fulldeps/error-writing-dependencies/Makefile
diff --git a/src/test/run-make/error-writing-dependencies/foo.rs b/src/test/run-make-fulldeps/error-writing-dependencies/foo.rs
index 8ae3d072362..8ae3d072362 100644
--- a/src/test/run-make/error-writing-dependencies/foo.rs
+++ b/src/test/run-make-fulldeps/error-writing-dependencies/foo.rs
diff --git a/src/test/run-make/extern-diff-internal-name/Makefile b/src/test/run-make-fulldeps/extern-diff-internal-name/Makefile
index b84e930757b..b84e930757b 100644
--- a/src/test/run-make/extern-diff-internal-name/Makefile
+++ b/src/test/run-make-fulldeps/extern-diff-internal-name/Makefile
diff --git a/src/test/run-make/extern-diff-internal-name/lib.rs b/src/test/run-make-fulldeps/extern-diff-internal-name/lib.rs
index e8779bba13c..e8779bba13c 100644
--- a/src/test/run-make/extern-diff-internal-name/lib.rs
+++ b/src/test/run-make-fulldeps/extern-diff-internal-name/lib.rs
diff --git a/src/test/run-make/extern-diff-internal-name/test.rs b/src/test/run-make-fulldeps/extern-diff-internal-name/test.rs
index 11e042c8c4a..11e042c8c4a 100644
--- a/src/test/run-make/extern-diff-internal-name/test.rs
+++ b/src/test/run-make-fulldeps/extern-diff-internal-name/test.rs
diff --git a/src/test/run-make/extern-flag-disambiguates/Makefile b/src/test/run-make-fulldeps/extern-flag-disambiguates/Makefile
index 81930e969a9..81930e969a9 100644
--- a/src/test/run-make/extern-flag-disambiguates/Makefile
+++ b/src/test/run-make-fulldeps/extern-flag-disambiguates/Makefile
diff --git a/src/test/run-make/extern-flag-disambiguates/a.rs b/src/test/run-make-fulldeps/extern-flag-disambiguates/a.rs
index ac92aede789..ac92aede789 100644
--- a/src/test/run-make/extern-flag-disambiguates/a.rs
+++ b/src/test/run-make-fulldeps/extern-flag-disambiguates/a.rs
diff --git a/src/test/run-make/extern-flag-disambiguates/b.rs b/src/test/run-make-fulldeps/extern-flag-disambiguates/b.rs
index 8ae238f5a48..8ae238f5a48 100644
--- a/src/test/run-make/extern-flag-disambiguates/b.rs
+++ b/src/test/run-make-fulldeps/extern-flag-disambiguates/b.rs
diff --git a/src/test/run-make/extern-flag-disambiguates/c.rs b/src/test/run-make-fulldeps/extern-flag-disambiguates/c.rs
index 6eccdf7e5c8..6eccdf7e5c8 100644
--- a/src/test/run-make/extern-flag-disambiguates/c.rs
+++ b/src/test/run-make-fulldeps/extern-flag-disambiguates/c.rs
diff --git a/src/test/run-make/extern-flag-disambiguates/d.rs b/src/test/run-make-fulldeps/extern-flag-disambiguates/d.rs
index 9923ff83a91..9923ff83a91 100644
--- a/src/test/run-make/extern-flag-disambiguates/d.rs
+++ b/src/test/run-make-fulldeps/extern-flag-disambiguates/d.rs
diff --git a/src/test/run-make/extern-flag-fun/Makefile b/src/test/run-make-fulldeps/extern-flag-fun/Makefile
index a9f25853350..a9f25853350 100644
--- a/src/test/run-make/extern-flag-fun/Makefile
+++ b/src/test/run-make-fulldeps/extern-flag-fun/Makefile
diff --git a/src/test/run-make/extern-flag-fun/bar-alt.rs b/src/test/run-make-fulldeps/extern-flag-fun/bar-alt.rs
index d6ebd9d896f..d6ebd9d896f 100644
--- a/src/test/run-make/extern-flag-fun/bar-alt.rs
+++ b/src/test/run-make-fulldeps/extern-flag-fun/bar-alt.rs
diff --git a/src/test/run-make/extern-flag-fun/bar.rs b/src/test/run-make-fulldeps/extern-flag-fun/bar.rs
index e6c76025738..e6c76025738 100644
--- a/src/test/run-make/extern-flag-fun/bar.rs
+++ b/src/test/run-make-fulldeps/extern-flag-fun/bar.rs
diff --git a/src/test/run-make/extern-flag-fun/foo.rs b/src/test/run-make-fulldeps/extern-flag-fun/foo.rs
index 52741668640..52741668640 100644
--- a/src/test/run-make/extern-flag-fun/foo.rs
+++ b/src/test/run-make-fulldeps/extern-flag-fun/foo.rs
diff --git a/src/test/run-make/extern-fn-generic/Makefile b/src/test/run-make-fulldeps/extern-fn-generic/Makefile
index cf897dba1f2..cf897dba1f2 100644
--- a/src/test/run-make/extern-fn-generic/Makefile
+++ b/src/test/run-make-fulldeps/extern-fn-generic/Makefile
diff --git a/src/test/run-make/extern-fn-generic/test.c b/src/test/run-make-fulldeps/extern-fn-generic/test.c
index f9faef64afc..f9faef64afc 100644
--- a/src/test/run-make/extern-fn-generic/test.c
+++ b/src/test/run-make-fulldeps/extern-fn-generic/test.c
diff --git a/src/test/run-make/extern-fn-generic/test.rs b/src/test/run-make-fulldeps/extern-fn-generic/test.rs
index 8f5ff091b3b..8f5ff091b3b 100644
--- a/src/test/run-make/extern-fn-generic/test.rs
+++ b/src/test/run-make-fulldeps/extern-fn-generic/test.rs
diff --git a/src/test/run-make/extern-fn-generic/testcrate.rs b/src/test/run-make-fulldeps/extern-fn-generic/testcrate.rs
index d02c05047c0..d02c05047c0 100644
--- a/src/test/run-make/extern-fn-generic/testcrate.rs
+++ b/src/test/run-make-fulldeps/extern-fn-generic/testcrate.rs
diff --git a/src/test/run-make/extern-fn-mangle/Makefile b/src/test/run-make-fulldeps/extern-fn-mangle/Makefile
index 042048ec25f..042048ec25f 100644
--- a/src/test/run-make/extern-fn-mangle/Makefile
+++ b/src/test/run-make-fulldeps/extern-fn-mangle/Makefile
diff --git a/src/test/run-make/extern-fn-mangle/test.c b/src/test/run-make-fulldeps/extern-fn-mangle/test.c
index 1a9855dedec..1a9855dedec 100644
--- a/src/test/run-make/extern-fn-mangle/test.c
+++ b/src/test/run-make-fulldeps/extern-fn-mangle/test.c
diff --git a/src/test/run-make/extern-fn-mangle/test.rs b/src/test/run-make-fulldeps/extern-fn-mangle/test.rs
index 35b5a9278a4..35b5a9278a4 100644
--- a/src/test/run-make/extern-fn-mangle/test.rs
+++ b/src/test/run-make-fulldeps/extern-fn-mangle/test.rs
diff --git a/src/test/run-make/extern-fn-reachable/Makefile b/src/test/run-make-fulldeps/extern-fn-reachable/Makefile
index 79a9a3c640f..79a9a3c640f 100644
--- a/src/test/run-make/extern-fn-reachable/Makefile
+++ b/src/test/run-make-fulldeps/extern-fn-reachable/Makefile
diff --git a/src/test/run-make/extern-fn-reachable/dylib.rs b/src/test/run-make-fulldeps/extern-fn-reachable/dylib.rs
index f24265e7a52..f24265e7a52 100644
--- a/src/test/run-make/extern-fn-reachable/dylib.rs
+++ b/src/test/run-make-fulldeps/extern-fn-reachable/dylib.rs
diff --git a/src/test/run-make/extern-fn-reachable/main.rs b/src/test/run-make-fulldeps/extern-fn-reachable/main.rs
index 27387332c1c..27387332c1c 100644
--- a/src/test/run-make/extern-fn-reachable/main.rs
+++ b/src/test/run-make-fulldeps/extern-fn-reachable/main.rs
diff --git a/src/test/run-make/extern-fn-struct-passing-abi/Makefile b/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile
index 042048ec25f..042048ec25f 100644
--- a/src/test/run-make/extern-fn-struct-passing-abi/Makefile
+++ b/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile
diff --git a/src/test/run-make/extern-fn-struct-passing-abi/test.c b/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.c
index 25cd6da10b8..25cd6da10b8 100644
--- a/src/test/run-make/extern-fn-struct-passing-abi/test.c
+++ b/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.c
diff --git a/src/test/run-make/extern-fn-struct-passing-abi/test.rs b/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs
index 54a4f868eb4..54a4f868eb4 100644
--- a/src/test/run-make/extern-fn-struct-passing-abi/test.rs
+++ b/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs
diff --git a/src/test/run-make/extern-fn-with-extern-types/Makefile b/src/test/run-make-fulldeps/extern-fn-with-extern-types/Makefile
index 8977e14c3ad..8977e14c3ad 100644
--- a/src/test/run-make/extern-fn-with-extern-types/Makefile
+++ b/src/test/run-make-fulldeps/extern-fn-with-extern-types/Makefile
diff --git a/src/test/run-make/extern-fn-with-extern-types/ctest.c b/src/test/run-make-fulldeps/extern-fn-with-extern-types/ctest.c
index c3d6166fb12..c3d6166fb12 100644
--- a/src/test/run-make/extern-fn-with-extern-types/ctest.c
+++ b/src/test/run-make-fulldeps/extern-fn-with-extern-types/ctest.c
diff --git a/src/test/run-make/extern-fn-with-extern-types/test.rs b/src/test/run-make-fulldeps/extern-fn-with-extern-types/test.rs
index 9d6c87885b1..9d6c87885b1 100644
--- a/src/test/run-make/extern-fn-with-extern-types/test.rs
+++ b/src/test/run-make-fulldeps/extern-fn-with-extern-types/test.rs
diff --git a/src/test/run-make/extern-fn-with-packed-struct/Makefile b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/Makefile
index 042048ec25f..042048ec25f 100644
--- a/src/test/run-make/extern-fn-with-packed-struct/Makefile
+++ b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/Makefile
diff --git a/src/test/run-make/extern-fn-with-packed-struct/test.c b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.c
index 4124e202c1d..4124e202c1d 100644
--- a/src/test/run-make/extern-fn-with-packed-struct/test.c
+++ b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.c
diff --git a/src/test/run-make/extern-fn-with-packed-struct/test.rs b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.rs
index d2540ad6154..d2540ad6154 100644
--- a/src/test/run-make/extern-fn-with-packed-struct/test.rs
+++ b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.rs
diff --git a/src/test/run-make/extern-fn-with-union/Makefile b/src/test/run-make-fulldeps/extern-fn-with-union/Makefile
index 71a5407e882..71a5407e882 100644
--- a/src/test/run-make/extern-fn-with-union/Makefile
+++ b/src/test/run-make-fulldeps/extern-fn-with-union/Makefile
diff --git a/src/test/run-make/extern-fn-with-union/ctest.c b/src/test/run-make-fulldeps/extern-fn-with-union/ctest.c
index 8c87c230693..8c87c230693 100644
--- a/src/test/run-make/extern-fn-with-union/ctest.c
+++ b/src/test/run-make-fulldeps/extern-fn-with-union/ctest.c
diff --git a/src/test/run-make/extern-fn-with-union/test.rs b/src/test/run-make-fulldeps/extern-fn-with-union/test.rs
index f9277ba11f4..f9277ba11f4 100644
--- a/src/test/run-make/extern-fn-with-union/test.rs
+++ b/src/test/run-make-fulldeps/extern-fn-with-union/test.rs
diff --git a/src/test/run-make/extern-fn-with-union/testcrate.rs b/src/test/run-make-fulldeps/extern-fn-with-union/testcrate.rs
index 66978c38511..66978c38511 100644
--- a/src/test/run-make/extern-fn-with-union/testcrate.rs
+++ b/src/test/run-make-fulldeps/extern-fn-with-union/testcrate.rs
diff --git a/src/test/run-make/extern-multiple-copies/Makefile b/src/test/run-make-fulldeps/extern-multiple-copies/Makefile
index 1631aa806af..1631aa806af 100644
--- a/src/test/run-make/extern-multiple-copies/Makefile
+++ b/src/test/run-make-fulldeps/extern-multiple-copies/Makefile
diff --git a/src/test/run-make/extern-multiple-copies/bar.rs b/src/test/run-make-fulldeps/extern-multiple-copies/bar.rs
index a50f5de384c..a50f5de384c 100644
--- a/src/test/run-make/extern-multiple-copies/bar.rs
+++ b/src/test/run-make-fulldeps/extern-multiple-copies/bar.rs
diff --git a/src/test/run-make/extern-multiple-copies/foo1.rs b/src/test/run-make-fulldeps/extern-multiple-copies/foo1.rs
index 0be200ddcd2..0be200ddcd2 100644
--- a/src/test/run-make/extern-multiple-copies/foo1.rs
+++ b/src/test/run-make-fulldeps/extern-multiple-copies/foo1.rs
diff --git a/src/test/run-make/extern-multiple-copies/foo2.rs b/src/test/run-make-fulldeps/extern-multiple-copies/foo2.rs
index 0be200ddcd2..0be200ddcd2 100644
--- a/src/test/run-make/extern-multiple-copies/foo2.rs
+++ b/src/test/run-make-fulldeps/extern-multiple-copies/foo2.rs
diff --git a/src/test/run-make/extern-multiple-copies2/Makefile b/src/test/run-make-fulldeps/extern-multiple-copies2/Makefile
index 567d7e78a57..567d7e78a57 100644
--- a/src/test/run-make/extern-multiple-copies2/Makefile
+++ b/src/test/run-make-fulldeps/extern-multiple-copies2/Makefile
diff --git a/src/test/run-make/extern-multiple-copies2/bar.rs b/src/test/run-make-fulldeps/extern-multiple-copies2/bar.rs
index b8ac34aa53e..b8ac34aa53e 100644
--- a/src/test/run-make/extern-multiple-copies2/bar.rs
+++ b/src/test/run-make-fulldeps/extern-multiple-copies2/bar.rs
diff --git a/src/test/run-make/extern-multiple-copies2/foo1.rs b/src/test/run-make-fulldeps/extern-multiple-copies2/foo1.rs
index 1787772053b..1787772053b 100644
--- a/src/test/run-make/extern-multiple-copies2/foo1.rs
+++ b/src/test/run-make-fulldeps/extern-multiple-copies2/foo1.rs
diff --git a/src/test/run-make/extern-multiple-copies2/foo2.rs b/src/test/run-make-fulldeps/extern-multiple-copies2/foo2.rs
index bad10304387..bad10304387 100644
--- a/src/test/run-make/extern-multiple-copies2/foo2.rs
+++ b/src/test/run-make-fulldeps/extern-multiple-copies2/foo2.rs
diff --git a/src/test/run-make/extern-overrides-distribution/Makefile b/src/test/run-make-fulldeps/extern-overrides-distribution/Makefile
index 7d063a4c83c..7d063a4c83c 100644
--- a/src/test/run-make/extern-overrides-distribution/Makefile
+++ b/src/test/run-make-fulldeps/extern-overrides-distribution/Makefile
diff --git a/src/test/run-make/extern-overrides-distribution/libc.rs b/src/test/run-make-fulldeps/extern-overrides-distribution/libc.rs
index a489d834a92..a489d834a92 100644
--- a/src/test/run-make/extern-overrides-distribution/libc.rs
+++ b/src/test/run-make-fulldeps/extern-overrides-distribution/libc.rs
diff --git a/src/test/run-make/extern-overrides-distribution/main.rs b/src/test/run-make-fulldeps/extern-overrides-distribution/main.rs
index 451841e7368..451841e7368 100644
--- a/src/test/run-make/extern-overrides-distribution/main.rs
+++ b/src/test/run-make-fulldeps/extern-overrides-distribution/main.rs
diff --git a/src/test/run-make/extra-filename-with-temp-outputs/Makefile b/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile
index 6de4f97df0c..6de4f97df0c 100644
--- a/src/test/run-make/extra-filename-with-temp-outputs/Makefile
+++ b/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile
diff --git a/src/test/run-make/extra-filename-with-temp-outputs/foo.rs b/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs
index 8ae3d072362..8ae3d072362 100644
--- a/src/test/run-make/extra-filename-with-temp-outputs/foo.rs
+++ b/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs
diff --git a/src/test/run-make/fpic/Makefile b/src/test/run-make-fulldeps/fpic/Makefile
index 6de58c2db18..6de58c2db18 100644
--- a/src/test/run-make/fpic/Makefile
+++ b/src/test/run-make-fulldeps/fpic/Makefile
diff --git a/src/test/run-make/fpic/hello.rs b/src/test/run-make-fulldeps/fpic/hello.rs
index a9e231b0ea8..a9e231b0ea8 100644
--- a/src/test/run-make/fpic/hello.rs
+++ b/src/test/run-make-fulldeps/fpic/hello.rs
diff --git a/src/test/run-make/hir-tree/Makefile b/src/test/run-make-fulldeps/hir-tree/Makefile
index 2e100b269e1..2e100b269e1 100644
--- a/src/test/run-make/hir-tree/Makefile
+++ b/src/test/run-make-fulldeps/hir-tree/Makefile
diff --git a/src/test/run-make/hir-tree/input.rs b/src/test/run-make-fulldeps/hir-tree/input.rs
index 12adc083bcd..12adc083bcd 100644
--- a/src/test/run-make/hir-tree/input.rs
+++ b/src/test/run-make-fulldeps/hir-tree/input.rs
diff --git a/src/test/run-make/hotplug_codegen_backend/Makefile b/src/test/run-make-fulldeps/hotplug_codegen_backend/Makefile
index 2ddf3aa5439..2ddf3aa5439 100644
--- a/src/test/run-make/hotplug_codegen_backend/Makefile
+++ b/src/test/run-make-fulldeps/hotplug_codegen_backend/Makefile
diff --git a/src/test/run-make/hotplug_codegen_backend/some_crate.rs b/src/test/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs
index 26ffce01b2e..26ffce01b2e 100644
--- a/src/test/run-make/hotplug_codegen_backend/some_crate.rs
+++ b/src/test/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs
diff --git a/src/test/run-make/hotplug_codegen_backend/the_backend.rs b/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs
index e266b0f5e83..e266b0f5e83 100644
--- a/src/test/run-make/hotplug_codegen_backend/the_backend.rs
+++ b/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs
diff --git a/src/test/run-make/include_bytes_deps/Makefile b/src/test/run-make-fulldeps/include_bytes_deps/Makefile
index 1293695b799..1293695b799 100644
--- a/src/test/run-make/include_bytes_deps/Makefile
+++ b/src/test/run-make-fulldeps/include_bytes_deps/Makefile
diff --git a/src/test/run-make/include_bytes_deps/input.bin b/src/test/run-make-fulldeps/include_bytes_deps/input.bin
index cd0875583aa..cd0875583aa 100644
--- a/src/test/run-make/include_bytes_deps/input.bin
+++ b/src/test/run-make-fulldeps/include_bytes_deps/input.bin
diff --git a/src/test/run-make/include_bytes_deps/input.md b/src/test/run-make-fulldeps/include_bytes_deps/input.md
index 2a19b7405f7..2a19b7405f7 100644
--- a/src/test/run-make/include_bytes_deps/input.md
+++ b/src/test/run-make-fulldeps/include_bytes_deps/input.md
diff --git a/src/test/run-make/include_bytes_deps/input.txt b/src/test/run-make-fulldeps/include_bytes_deps/input.txt
index cd0875583aa..cd0875583aa 100644
--- a/src/test/run-make/include_bytes_deps/input.txt
+++ b/src/test/run-make-fulldeps/include_bytes_deps/input.txt
diff --git a/src/test/run-make/include_bytes_deps/main.rs b/src/test/run-make-fulldeps/include_bytes_deps/main.rs
index 27ca1a46a50..27ca1a46a50 100644
--- a/src/test/run-make/include_bytes_deps/main.rs
+++ b/src/test/run-make-fulldeps/include_bytes_deps/main.rs
diff --git a/src/test/run-make/inline-always-many-cgu/Makefile b/src/test/run-make-fulldeps/inline-always-many-cgu/Makefile
index 0cab955f644..0cab955f644 100644
--- a/src/test/run-make/inline-always-many-cgu/Makefile
+++ b/src/test/run-make-fulldeps/inline-always-many-cgu/Makefile
diff --git a/src/test/run-make/inline-always-many-cgu/foo.rs b/src/test/run-make-fulldeps/inline-always-many-cgu/foo.rs
index 539dcdfa9b3..539dcdfa9b3 100644
--- a/src/test/run-make/inline-always-many-cgu/foo.rs
+++ b/src/test/run-make-fulldeps/inline-always-many-cgu/foo.rs
diff --git a/src/test/run-make/interdependent-c-libraries/Makefile b/src/test/run-make-fulldeps/interdependent-c-libraries/Makefile
index 1268022e37b..1268022e37b 100644
--- a/src/test/run-make/interdependent-c-libraries/Makefile
+++ b/src/test/run-make-fulldeps/interdependent-c-libraries/Makefile
diff --git a/src/test/run-make/interdependent-c-libraries/bar.c b/src/test/run-make-fulldeps/interdependent-c-libraries/bar.c
index c761f029eff..c761f029eff 100644
--- a/src/test/run-make/interdependent-c-libraries/bar.c
+++ b/src/test/run-make-fulldeps/interdependent-c-libraries/bar.c
diff --git a/src/test/run-make/interdependent-c-libraries/bar.rs b/src/test/run-make-fulldeps/interdependent-c-libraries/bar.rs
index 1963976b4b0..1963976b4b0 100644
--- a/src/test/run-make/interdependent-c-libraries/bar.rs
+++ b/src/test/run-make-fulldeps/interdependent-c-libraries/bar.rs
diff --git a/src/test/run-make/interdependent-c-libraries/foo.c b/src/test/run-make-fulldeps/interdependent-c-libraries/foo.c
index 2895ad473bf..2895ad473bf 100644
--- a/src/test/run-make/interdependent-c-libraries/foo.c
+++ b/src/test/run-make-fulldeps/interdependent-c-libraries/foo.c
diff --git a/src/test/run-make/interdependent-c-libraries/foo.rs b/src/test/run-make-fulldeps/interdependent-c-libraries/foo.rs
index 7a0fe6bb18f..7a0fe6bb18f 100644
--- a/src/test/run-make/interdependent-c-libraries/foo.rs
+++ b/src/test/run-make-fulldeps/interdependent-c-libraries/foo.rs
diff --git a/src/test/run-make/interdependent-c-libraries/main.rs b/src/test/run-make-fulldeps/interdependent-c-libraries/main.rs
index f42e3dd44a9..f42e3dd44a9 100644
--- a/src/test/run-make/interdependent-c-libraries/main.rs
+++ b/src/test/run-make-fulldeps/interdependent-c-libraries/main.rs
diff --git a/src/test/run-make/intrinsic-unreachable/Makefile b/src/test/run-make-fulldeps/intrinsic-unreachable/Makefile
index 305e8a7ddc9..305e8a7ddc9 100644
--- a/src/test/run-make/intrinsic-unreachable/Makefile
+++ b/src/test/run-make-fulldeps/intrinsic-unreachable/Makefile
diff --git a/src/test/run-make/intrinsic-unreachable/exit-ret.rs b/src/test/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs
index 1b8b644dd78..1b8b644dd78 100644
--- a/src/test/run-make/intrinsic-unreachable/exit-ret.rs
+++ b/src/test/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs
diff --git a/src/test/run-make/intrinsic-unreachable/exit-unreachable.rs b/src/test/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs
index de63809ab66..de63809ab66 100644
--- a/src/test/run-make/intrinsic-unreachable/exit-unreachable.rs
+++ b/src/test/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs
diff --git a/src/test/run-make/invalid-library/Makefile b/src/test/run-make-fulldeps/invalid-library/Makefile
index b6fb122d98b..b6fb122d98b 100644
--- a/src/test/run-make/invalid-library/Makefile
+++ b/src/test/run-make-fulldeps/invalid-library/Makefile
diff --git a/src/test/run-make/invalid-library/foo.rs b/src/test/run-make-fulldeps/invalid-library/foo.rs
index 6316cfa3bba..6316cfa3bba 100644
--- a/src/test/run-make/invalid-library/foo.rs
+++ b/src/test/run-make-fulldeps/invalid-library/foo.rs
diff --git a/src/test/run-make/invalid-staticlib/Makefile b/src/test/run-make-fulldeps/invalid-staticlib/Makefile
index 3a91902ccce..3a91902ccce 100644
--- a/src/test/run-make/invalid-staticlib/Makefile
+++ b/src/test/run-make-fulldeps/invalid-staticlib/Makefile
diff --git a/src/test/run-make/issue-11908/Makefile b/src/test/run-make-fulldeps/issue-11908/Makefile
index cf6572c27ad..cf6572c27ad 100644
--- a/src/test/run-make/issue-11908/Makefile
+++ b/src/test/run-make-fulldeps/issue-11908/Makefile
diff --git a/src/test/run-make/issue-11908/bar.rs b/src/test/run-make-fulldeps/issue-11908/bar.rs
index 6316cfa3bba..6316cfa3bba 100644
--- a/src/test/run-make/issue-11908/bar.rs
+++ b/src/test/run-make-fulldeps/issue-11908/bar.rs
diff --git a/src/test/run-make/issue-11908/foo.rs b/src/test/run-make-fulldeps/issue-11908/foo.rs
index 0858d3c4e47..0858d3c4e47 100644
--- a/src/test/run-make/issue-11908/foo.rs
+++ b/src/test/run-make-fulldeps/issue-11908/foo.rs
diff --git a/src/test/run-make/issue-14500/Makefile b/src/test/run-make-fulldeps/issue-14500/Makefile
index bd94db09520..bd94db09520 100644
--- a/src/test/run-make/issue-14500/Makefile
+++ b/src/test/run-make-fulldeps/issue-14500/Makefile
diff --git a/src/test/run-make/issue-14500/bar.rs b/src/test/run-make-fulldeps/issue-14500/bar.rs
index 4b4916fe96d..4b4916fe96d 100644
--- a/src/test/run-make/issue-14500/bar.rs
+++ b/src/test/run-make-fulldeps/issue-14500/bar.rs
diff --git a/src/test/run-make/issue-14500/foo.c b/src/test/run-make-fulldeps/issue-14500/foo.c
index e84b5509c50..e84b5509c50 100644
--- a/src/test/run-make/issue-14500/foo.c
+++ b/src/test/run-make-fulldeps/issue-14500/foo.c
diff --git a/src/test/run-make/issue-14500/foo.rs b/src/test/run-make-fulldeps/issue-14500/foo.rs
index a91d8d6a21d..a91d8d6a21d 100644
--- a/src/test/run-make/issue-14500/foo.rs
+++ b/src/test/run-make-fulldeps/issue-14500/foo.rs
diff --git a/src/test/run-make/issue-14698/Makefile b/src/test/run-make-fulldeps/issue-14698/Makefile
index dbe8317dbc4..dbe8317dbc4 100644
--- a/src/test/run-make/issue-14698/Makefile
+++ b/src/test/run-make-fulldeps/issue-14698/Makefile
diff --git a/src/test/run-make/issue-14698/foo.rs b/src/test/run-make-fulldeps/issue-14698/foo.rs
index 7dc79f2043b..7dc79f2043b 100644
--- a/src/test/run-make/issue-14698/foo.rs
+++ b/src/test/run-make-fulldeps/issue-14698/foo.rs
diff --git a/src/test/run-make/issue-15460/Makefile b/src/test/run-make-fulldeps/issue-15460/Makefile
index 846805686a1..846805686a1 100644
--- a/src/test/run-make/issue-15460/Makefile
+++ b/src/test/run-make-fulldeps/issue-15460/Makefile
diff --git a/src/test/run-make/issue-15460/bar.rs b/src/test/run-make-fulldeps/issue-15460/bar.rs
index 46777f7fbd2..46777f7fbd2 100644
--- a/src/test/run-make/issue-15460/bar.rs
+++ b/src/test/run-make-fulldeps/issue-15460/bar.rs
diff --git a/src/test/run-make/issue-15460/foo.c b/src/test/run-make-fulldeps/issue-15460/foo.c
index fdf595b574e..fdf595b574e 100644
--- a/src/test/run-make/issue-15460/foo.c
+++ b/src/test/run-make-fulldeps/issue-15460/foo.c
diff --git a/src/test/run-make/issue-15460/foo.rs b/src/test/run-make-fulldeps/issue-15460/foo.rs
index 6917fa55579..6917fa55579 100644
--- a/src/test/run-make/issue-15460/foo.rs
+++ b/src/test/run-make-fulldeps/issue-15460/foo.rs
diff --git a/src/test/run-make/issue-18943/Makefile b/src/test/run-make-fulldeps/issue-18943/Makefile
index bef70a0edaa..bef70a0edaa 100644
--- a/src/test/run-make/issue-18943/Makefile
+++ b/src/test/run-make-fulldeps/issue-18943/Makefile
diff --git a/src/test/run-make/issue-18943/foo.rs b/src/test/run-make-fulldeps/issue-18943/foo.rs
index aadf0f593e7..aadf0f593e7 100644
--- a/src/test/run-make/issue-18943/foo.rs
+++ b/src/test/run-make-fulldeps/issue-18943/foo.rs
diff --git a/src/test/run-make/issue-19371/Makefile b/src/test/run-make-fulldeps/issue-19371/Makefile
index 9f3ec78465b..9f3ec78465b 100644
--- a/src/test/run-make/issue-19371/Makefile
+++ b/src/test/run-make-fulldeps/issue-19371/Makefile
diff --git a/src/test/run-make/issue-19371/foo.rs b/src/test/run-make-fulldeps/issue-19371/foo.rs
index e0db2627d85..e0db2627d85 100644
--- a/src/test/run-make/issue-19371/foo.rs
+++ b/src/test/run-make-fulldeps/issue-19371/foo.rs
diff --git a/src/test/run-make/issue-20626/Makefile b/src/test/run-make-fulldeps/issue-20626/Makefile
index 0487b240400..0487b240400 100644
--- a/src/test/run-make/issue-20626/Makefile
+++ b/src/test/run-make-fulldeps/issue-20626/Makefile
diff --git a/src/test/run-make/issue-20626/foo.rs b/src/test/run-make-fulldeps/issue-20626/foo.rs
index 9f727607e4e..9f727607e4e 100644
--- a/src/test/run-make/issue-20626/foo.rs
+++ b/src/test/run-make-fulldeps/issue-20626/foo.rs
diff --git a/src/test/run-make/issue-22131/Makefile b/src/test/run-make-fulldeps/issue-22131/Makefile
index 6db737a9e72..6db737a9e72 100644
--- a/src/test/run-make/issue-22131/Makefile
+++ b/src/test/run-make-fulldeps/issue-22131/Makefile
diff --git a/src/test/run-make/issue-22131/foo.rs b/src/test/run-make-fulldeps/issue-22131/foo.rs
index 50c63abc0d4..50c63abc0d4 100644
--- a/src/test/run-make/issue-22131/foo.rs
+++ b/src/test/run-make-fulldeps/issue-22131/foo.rs
diff --git a/src/test/run-make/issue-24445/Makefile b/src/test/run-make-fulldeps/issue-24445/Makefile
index 2ed971bf7d9..2ed971bf7d9 100644
--- a/src/test/run-make/issue-24445/Makefile
+++ b/src/test/run-make-fulldeps/issue-24445/Makefile
diff --git a/src/test/run-make/issue-24445/foo.c b/src/test/run-make-fulldeps/issue-24445/foo.c
index 775e151f236..775e151f236 100644
--- a/src/test/run-make/issue-24445/foo.c
+++ b/src/test/run-make-fulldeps/issue-24445/foo.c
diff --git a/src/test/run-make/issue-24445/foo.rs b/src/test/run-make-fulldeps/issue-24445/foo.rs
index 65e505df5ef..65e505df5ef 100644
--- a/src/test/run-make/issue-24445/foo.rs
+++ b/src/test/run-make-fulldeps/issue-24445/foo.rs
diff --git a/src/test/run-make/issue-25581/Makefile b/src/test/run-make-fulldeps/issue-25581/Makefile
index 042048ec25f..042048ec25f 100644
--- a/src/test/run-make/issue-25581/Makefile
+++ b/src/test/run-make-fulldeps/issue-25581/Makefile
diff --git a/src/test/run-make/issue-25581/test.c b/src/test/run-make-fulldeps/issue-25581/test.c
index 5736b173021..5736b173021 100644
--- a/src/test/run-make/issue-25581/test.c
+++ b/src/test/run-make-fulldeps/issue-25581/test.c
diff --git a/src/test/run-make/issue-25581/test.rs b/src/test/run-make-fulldeps/issue-25581/test.rs
index 6717d16cb7c..6717d16cb7c 100644
--- a/src/test/run-make/issue-25581/test.rs
+++ b/src/test/run-make-fulldeps/issue-25581/test.rs
diff --git a/src/test/run-make/issue-26006/Makefile b/src/test/run-make-fulldeps/issue-26006/Makefile
index 66aa78d5386..66aa78d5386 100644
--- a/src/test/run-make/issue-26006/Makefile
+++ b/src/test/run-make-fulldeps/issue-26006/Makefile
diff --git a/src/test/run-make/issue-26006/in/libc/lib.rs b/src/test/run-make-fulldeps/issue-26006/in/libc/lib.rs
index 177ffdce062..177ffdce062 100644
--- a/src/test/run-make/issue-26006/in/libc/lib.rs
+++ b/src/test/run-make-fulldeps/issue-26006/in/libc/lib.rs
diff --git a/src/test/run-make/issue-26006/in/time/lib.rs b/src/test/run-make-fulldeps/issue-26006/in/time/lib.rs
index b1d07d57337..b1d07d57337 100644
--- a/src/test/run-make/issue-26006/in/time/lib.rs
+++ b/src/test/run-make-fulldeps/issue-26006/in/time/lib.rs
diff --git a/src/test/run-make/issue-26092/Makefile b/src/test/run-make-fulldeps/issue-26092/Makefile
index 27631c31c4a..27631c31c4a 100644
--- a/src/test/run-make/issue-26092/Makefile
+++ b/src/test/run-make-fulldeps/issue-26092/Makefile
diff --git a/src/test/run-make/issue-26092/blank.rs b/src/test/run-make-fulldeps/issue-26092/blank.rs
index 8ae3d072362..8ae3d072362 100644
--- a/src/test/run-make/issue-26092/blank.rs
+++ b/src/test/run-make-fulldeps/issue-26092/blank.rs
diff --git a/src/test/run-make/issue-28595/Makefile b/src/test/run-make-fulldeps/issue-28595/Makefile
index 61e9d0c6547..61e9d0c6547 100644
--- a/src/test/run-make/issue-28595/Makefile
+++ b/src/test/run-make-fulldeps/issue-28595/Makefile
diff --git a/src/test/run-make/issue-28595/a.c b/src/test/run-make-fulldeps/issue-28595/a.c
index feacd7bc313..feacd7bc313 100644
--- a/src/test/run-make/issue-28595/a.c
+++ b/src/test/run-make-fulldeps/issue-28595/a.c
diff --git a/src/test/run-make/issue-28595/a.rs b/src/test/run-make-fulldeps/issue-28595/a.rs
index 7377a9f3416..7377a9f3416 100644
--- a/src/test/run-make/issue-28595/a.rs
+++ b/src/test/run-make-fulldeps/issue-28595/a.rs
diff --git a/src/test/run-make/issue-28595/b.c b/src/test/run-make-fulldeps/issue-28595/b.c
index de81fbcaa60..de81fbcaa60 100644
--- a/src/test/run-make/issue-28595/b.c
+++ b/src/test/run-make-fulldeps/issue-28595/b.c
diff --git a/src/test/run-make/issue-28595/b.rs b/src/test/run-make-fulldeps/issue-28595/b.rs
index 37ff346c3f3..37ff346c3f3 100644
--- a/src/test/run-make/issue-28595/b.rs
+++ b/src/test/run-make-fulldeps/issue-28595/b.rs
diff --git a/src/test/run-make/issue-28766/Makefile b/src/test/run-make-fulldeps/issue-28766/Makefile
index 1f47ef15b27..1f47ef15b27 100644
--- a/src/test/run-make/issue-28766/Makefile
+++ b/src/test/run-make-fulldeps/issue-28766/Makefile
diff --git a/src/test/run-make/issue-28766/foo.rs b/src/test/run-make-fulldeps/issue-28766/foo.rs
index 3ed0a6bfc74..3ed0a6bfc74 100644
--- a/src/test/run-make/issue-28766/foo.rs
+++ b/src/test/run-make-fulldeps/issue-28766/foo.rs
diff --git a/src/test/run-make/issue-28766/main.rs b/src/test/run-make-fulldeps/issue-28766/main.rs
index d1dadbdc7ad..d1dadbdc7ad 100644
--- a/src/test/run-make/issue-28766/main.rs
+++ b/src/test/run-make-fulldeps/issue-28766/main.rs
diff --git a/src/test/run-make/issue-30063/Makefile b/src/test/run-make-fulldeps/issue-30063/Makefile
index a76051dc81e..a76051dc81e 100644
--- a/src/test/run-make/issue-30063/Makefile
+++ b/src/test/run-make-fulldeps/issue-30063/Makefile
diff --git a/src/test/run-make/issue-30063/foo.rs b/src/test/run-make-fulldeps/issue-30063/foo.rs
index 45f7a2c2aa6..45f7a2c2aa6 100644
--- a/src/test/run-make/issue-30063/foo.rs
+++ b/src/test/run-make-fulldeps/issue-30063/foo.rs
diff --git a/src/test/run-make/issue-33329/Makefile b/src/test/run-make-fulldeps/issue-33329/Makefile
index 591e4e3dda3..591e4e3dda3 100644
--- a/src/test/run-make/issue-33329/Makefile
+++ b/src/test/run-make-fulldeps/issue-33329/Makefile
diff --git a/src/test/run-make/issue-33329/main.rs b/src/test/run-make-fulldeps/issue-33329/main.rs
index e06c0a5ec2a..e06c0a5ec2a 100644
--- a/src/test/run-make/issue-33329/main.rs
+++ b/src/test/run-make-fulldeps/issue-33329/main.rs
diff --git a/src/test/run-make/issue-35164/Makefile b/src/test/run-make-fulldeps/issue-35164/Makefile
index 6a451656dcb..6a451656dcb 100644
--- a/src/test/run-make/issue-35164/Makefile
+++ b/src/test/run-make-fulldeps/issue-35164/Makefile
diff --git a/src/test/run-make/issue-35164/main.rs b/src/test/run-make-fulldeps/issue-35164/main.rs
index 24322a2484f..24322a2484f 100644
--- a/src/test/run-make/issue-35164/main.rs
+++ b/src/test/run-make-fulldeps/issue-35164/main.rs
diff --git a/src/test/run-make/issue-35164/submodule/mod.rs b/src/test/run-make-fulldeps/issue-35164/submodule/mod.rs
index 7847c13af78..7847c13af78 100644
--- a/src/test/run-make/issue-35164/submodule/mod.rs
+++ b/src/test/run-make-fulldeps/issue-35164/submodule/mod.rs
diff --git a/src/test/run-make/issue-37839/Makefile b/src/test/run-make-fulldeps/issue-37839/Makefile
index 8b3355b9622..8b3355b9622 100644
--- a/src/test/run-make/issue-37839/Makefile
+++ b/src/test/run-make-fulldeps/issue-37839/Makefile
diff --git a/src/test/run-make/issue-37839/a.rs b/src/test/run-make-fulldeps/issue-37839/a.rs
index 052317438c2..052317438c2 100644
--- a/src/test/run-make/issue-37839/a.rs
+++ b/src/test/run-make-fulldeps/issue-37839/a.rs
diff --git a/src/test/run-make/issue-37839/b.rs b/src/test/run-make-fulldeps/issue-37839/b.rs
index 82f48f6d8d6..82f48f6d8d6 100644
--- a/src/test/run-make/issue-37839/b.rs
+++ b/src/test/run-make-fulldeps/issue-37839/b.rs
diff --git a/src/test/run-make/issue-37839/c.rs b/src/test/run-make-fulldeps/issue-37839/c.rs
index 85bece51427..85bece51427 100644
--- a/src/test/run-make/issue-37839/c.rs
+++ b/src/test/run-make-fulldeps/issue-37839/c.rs
diff --git a/src/test/run-make/issue-37893/Makefile b/src/test/run-make-fulldeps/issue-37893/Makefile
index c7732cc2682..c7732cc2682 100644
--- a/src/test/run-make/issue-37893/Makefile
+++ b/src/test/run-make-fulldeps/issue-37893/Makefile
diff --git a/src/test/run-make/issue-37893/a.rs b/src/test/run-make-fulldeps/issue-37893/a.rs
index 052317438c2..052317438c2 100644
--- a/src/test/run-make/issue-37893/a.rs
+++ b/src/test/run-make-fulldeps/issue-37893/a.rs
diff --git a/src/test/run-make/issue-37893/b.rs b/src/test/run-make-fulldeps/issue-37893/b.rs
index 82f48f6d8d6..82f48f6d8d6 100644
--- a/src/test/run-make/issue-37893/b.rs
+++ b/src/test/run-make-fulldeps/issue-37893/b.rs
diff --git a/src/test/run-make/issue-37893/c.rs b/src/test/run-make-fulldeps/issue-37893/c.rs
index eee55cc2369..eee55cc2369 100644
--- a/src/test/run-make/issue-37893/c.rs
+++ b/src/test/run-make-fulldeps/issue-37893/c.rs
diff --git a/src/test/run-make/issue-38237/Makefile b/src/test/run-make-fulldeps/issue-38237/Makefile
index 855d958b344..855d958b344 100644
--- a/src/test/run-make/issue-38237/Makefile
+++ b/src/test/run-make-fulldeps/issue-38237/Makefile
diff --git a/src/test/run-make/issue-38237/bar.rs b/src/test/run-make-fulldeps/issue-38237/bar.rs
index 794e08c2fe3..794e08c2fe3 100644
--- a/src/test/run-make/issue-38237/bar.rs
+++ b/src/test/run-make-fulldeps/issue-38237/bar.rs
diff --git a/src/test/run-make/issue-38237/baz.rs b/src/test/run-make-fulldeps/issue-38237/baz.rs
index c2a2c89db01..c2a2c89db01 100644
--- a/src/test/run-make/issue-38237/baz.rs
+++ b/src/test/run-make-fulldeps/issue-38237/baz.rs
diff --git a/src/test/run-make/issue-38237/foo.rs b/src/test/run-make-fulldeps/issue-38237/foo.rs
index 6fb315731de..6fb315731de 100644
--- a/src/test/run-make/issue-38237/foo.rs
+++ b/src/test/run-make-fulldeps/issue-38237/foo.rs
diff --git a/src/test/run-make/issue-40535/Makefile b/src/test/run-make-fulldeps/issue-40535/Makefile
index 49db1d43e47..49db1d43e47 100644
--- a/src/test/run-make/issue-40535/Makefile
+++ b/src/test/run-make-fulldeps/issue-40535/Makefile
diff --git a/src/test/run-make/issue-40535/bar.rs b/src/test/run-make-fulldeps/issue-40535/bar.rs
index 4c22f181975..4c22f181975 100644
--- a/src/test/run-make/issue-40535/bar.rs
+++ b/src/test/run-make-fulldeps/issue-40535/bar.rs
diff --git a/src/test/run-make/issue-40535/baz.rs b/src/test/run-make-fulldeps/issue-40535/baz.rs
index 737a918a039..737a918a039 100644
--- a/src/test/run-make/issue-40535/baz.rs
+++ b/src/test/run-make-fulldeps/issue-40535/baz.rs
diff --git a/src/test/run-make/issue-40535/foo.rs b/src/test/run-make-fulldeps/issue-40535/foo.rs
index 53a8c8636b1..53a8c8636b1 100644
--- a/src/test/run-make/issue-40535/foo.rs
+++ b/src/test/run-make-fulldeps/issue-40535/foo.rs
diff --git a/src/test/run-make/issue-46239/Makefile b/src/test/run-make-fulldeps/issue-46239/Makefile
index 698a605f7e9..698a605f7e9 100644
--- a/src/test/run-make/issue-46239/Makefile
+++ b/src/test/run-make-fulldeps/issue-46239/Makefile
diff --git a/src/test/run-make/issue-46239/main.rs b/src/test/run-make-fulldeps/issue-46239/main.rs
index 3b3289168ab..3b3289168ab 100644
--- a/src/test/run-make/issue-46239/main.rs
+++ b/src/test/run-make-fulldeps/issue-46239/main.rs
diff --git a/src/test/run-make/issue-7349/Makefile b/src/test/run-make-fulldeps/issue-7349/Makefile
index 50dc63b1deb..50dc63b1deb 100644
--- a/src/test/run-make/issue-7349/Makefile
+++ b/src/test/run-make-fulldeps/issue-7349/Makefile
diff --git a/src/test/run-make/issue-7349/foo.rs b/src/test/run-make-fulldeps/issue-7349/foo.rs
index b75c82afb53..b75c82afb53 100644
--- a/src/test/run-make/issue-7349/foo.rs
+++ b/src/test/run-make-fulldeps/issue-7349/foo.rs
diff --git a/src/test/run-make/issues-41478-43796/Makefile b/src/test/run-make-fulldeps/issues-41478-43796/Makefile
index f9735253ab6..f9735253ab6 100644
--- a/src/test/run-make/issues-41478-43796/Makefile
+++ b/src/test/run-make-fulldeps/issues-41478-43796/Makefile
diff --git a/src/test/run-make/issues-41478-43796/a.rs b/src/test/run-make-fulldeps/issues-41478-43796/a.rs
index 9d95f8b2585..9d95f8b2585 100644
--- a/src/test/run-make/issues-41478-43796/a.rs
+++ b/src/test/run-make-fulldeps/issues-41478-43796/a.rs
diff --git a/src/test/run-make/libs-and-bins/Makefile b/src/test/run-make-fulldeps/libs-and-bins/Makefile
index cc3b257a5c5..cc3b257a5c5 100644
--- a/src/test/run-make/libs-and-bins/Makefile
+++ b/src/test/run-make-fulldeps/libs-and-bins/Makefile
diff --git a/src/test/run-make/libs-and-bins/foo.rs b/src/test/run-make-fulldeps/libs-and-bins/foo.rs
index 2ebe63928ca..2ebe63928ca 100644
--- a/src/test/run-make/libs-and-bins/foo.rs
+++ b/src/test/run-make-fulldeps/libs-and-bins/foo.rs
diff --git a/src/test/run-make/libs-through-symlinks/Makefile b/src/test/run-make-fulldeps/libs-through-symlinks/Makefile
index 2f425121f66..2f425121f66 100644
--- a/src/test/run-make/libs-through-symlinks/Makefile
+++ b/src/test/run-make-fulldeps/libs-through-symlinks/Makefile
diff --git a/src/test/run-make/libs-through-symlinks/bar.rs b/src/test/run-make-fulldeps/libs-through-symlinks/bar.rs
index 6316cfa3bba..6316cfa3bba 100644
--- a/src/test/run-make/libs-through-symlinks/bar.rs
+++ b/src/test/run-make-fulldeps/libs-through-symlinks/bar.rs
diff --git a/src/test/run-make/libs-through-symlinks/foo.rs b/src/test/run-make-fulldeps/libs-through-symlinks/foo.rs
index dd818cf8798..dd818cf8798 100644
--- a/src/test/run-make/libs-through-symlinks/foo.rs
+++ b/src/test/run-make-fulldeps/libs-through-symlinks/foo.rs
diff --git a/src/test/run-make/libtest-json/Makefile b/src/test/run-make-fulldeps/libtest-json/Makefile
index ec91ddfb9f9..ec91ddfb9f9 100644
--- a/src/test/run-make/libtest-json/Makefile
+++ b/src/test/run-make-fulldeps/libtest-json/Makefile
diff --git a/src/test/run-make/libtest-json/f.rs b/src/test/run-make-fulldeps/libtest-json/f.rs
index 5cff1f1a5b1..5cff1f1a5b1 100644
--- a/src/test/run-make/libtest-json/f.rs
+++ b/src/test/run-make-fulldeps/libtest-json/f.rs
diff --git a/src/test/run-make/libtest-json/output.json b/src/test/run-make-fulldeps/libtest-json/output.json
index 235f8cd7c72..235f8cd7c72 100644
--- a/src/test/run-make/libtest-json/output.json
+++ b/src/test/run-make-fulldeps/libtest-json/output.json
diff --git a/src/test/run-make/libtest-json/validate_json.py b/src/test/run-make-fulldeps/libtest-json/validate_json.py
index 1e97639b524..1e97639b524 100755
--- a/src/test/run-make/libtest-json/validate_json.py
+++ b/src/test/run-make-fulldeps/libtest-json/validate_json.py
diff --git a/src/test/run-make/link-arg/Makefile b/src/test/run-make-fulldeps/link-arg/Makefile
index d7c9fd27112..d7c9fd27112 100644
--- a/src/test/run-make/link-arg/Makefile
+++ b/src/test/run-make-fulldeps/link-arg/Makefile
diff --git a/src/test/run-make/link-arg/empty.rs b/src/test/run-make-fulldeps/link-arg/empty.rs
index 2b76fb24e5f..2b76fb24e5f 100644
--- a/src/test/run-make/link-arg/empty.rs
+++ b/src/test/run-make-fulldeps/link-arg/empty.rs
diff --git a/src/test/run-make/link-cfg/Makefile b/src/test/run-make-fulldeps/link-cfg/Makefile
index 188cba5fe41..188cba5fe41 100644
--- a/src/test/run-make/link-cfg/Makefile
+++ b/src/test/run-make-fulldeps/link-cfg/Makefile
diff --git a/src/test/run-make/link-cfg/dep-with-staticlib.rs b/src/test/run-make-fulldeps/link-cfg/dep-with-staticlib.rs
index ecc2365ddb0..ecc2365ddb0 100644
--- a/src/test/run-make/link-cfg/dep-with-staticlib.rs
+++ b/src/test/run-make-fulldeps/link-cfg/dep-with-staticlib.rs
diff --git a/src/test/run-make/link-cfg/dep.rs b/src/test/run-make-fulldeps/link-cfg/dep.rs
index 7da879c2bfa..7da879c2bfa 100644
--- a/src/test/run-make/link-cfg/dep.rs
+++ b/src/test/run-make-fulldeps/link-cfg/dep.rs
diff --git a/src/test/run-make/link-cfg/no-deps.rs b/src/test/run-make-fulldeps/link-cfg/no-deps.rs
index 6b114106744..6b114106744 100644
--- a/src/test/run-make/link-cfg/no-deps.rs
+++ b/src/test/run-make-fulldeps/link-cfg/no-deps.rs
diff --git a/src/test/run-make/link-cfg/return1.c b/src/test/run-make-fulldeps/link-cfg/return1.c
index a2a3d051dd1..a2a3d051dd1 100644
--- a/src/test/run-make/link-cfg/return1.c
+++ b/src/test/run-make-fulldeps/link-cfg/return1.c
diff --git a/src/test/run-make/link-cfg/return2.c b/src/test/run-make-fulldeps/link-cfg/return2.c
index d6ddcccf2fb..d6ddcccf2fb 100644
--- a/src/test/run-make/link-cfg/return2.c
+++ b/src/test/run-make-fulldeps/link-cfg/return2.c
diff --git a/src/test/run-make/link-cfg/return3.c b/src/test/run-make-fulldeps/link-cfg/return3.c
index 6a3b695f208..6a3b695f208 100644
--- a/src/test/run-make/link-cfg/return3.c
+++ b/src/test/run-make-fulldeps/link-cfg/return3.c
diff --git a/src/test/run-make/link-cfg/with-deps.rs b/src/test/run-make-fulldeps/link-cfg/with-deps.rs
index 799555c500a..799555c500a 100644
--- a/src/test/run-make/link-cfg/with-deps.rs
+++ b/src/test/run-make-fulldeps/link-cfg/with-deps.rs
diff --git a/src/test/run-make/link-cfg/with-staticlib-deps.rs b/src/test/run-make-fulldeps/link-cfg/with-staticlib-deps.rs
index 33a9c7720e2..33a9c7720e2 100644
--- a/src/test/run-make/link-cfg/with-staticlib-deps.rs
+++ b/src/test/run-make-fulldeps/link-cfg/with-staticlib-deps.rs
diff --git a/src/test/run-make/link-path-order/Makefile b/src/test/run-make-fulldeps/link-path-order/Makefile
index eeea0e3714e..eeea0e3714e 100644
--- a/src/test/run-make/link-path-order/Makefile
+++ b/src/test/run-make-fulldeps/link-path-order/Makefile
diff --git a/src/test/run-make/link-path-order/correct.c b/src/test/run-make-fulldeps/link-path-order/correct.c
index a595939f92e..a595939f92e 100644
--- a/src/test/run-make/link-path-order/correct.c
+++ b/src/test/run-make-fulldeps/link-path-order/correct.c
diff --git a/src/test/run-make/link-path-order/main.rs b/src/test/run-make-fulldeps/link-path-order/main.rs
index aaac3927f1c..aaac3927f1c 100644
--- a/src/test/run-make/link-path-order/main.rs
+++ b/src/test/run-make-fulldeps/link-path-order/main.rs
diff --git a/src/test/run-make/link-path-order/wrong.c b/src/test/run-make-fulldeps/link-path-order/wrong.c
index c53e7e3c48c..c53e7e3c48c 100644
--- a/src/test/run-make/link-path-order/wrong.c
+++ b/src/test/run-make-fulldeps/link-path-order/wrong.c
diff --git a/src/test/run-make/linkage-attr-on-static/Makefile b/src/test/run-make-fulldeps/linkage-attr-on-static/Makefile
index 4befbe14465..4befbe14465 100644
--- a/src/test/run-make/linkage-attr-on-static/Makefile
+++ b/src/test/run-make-fulldeps/linkage-attr-on-static/Makefile
diff --git a/src/test/run-make/linkage-attr-on-static/bar.rs b/src/test/run-make-fulldeps/linkage-attr-on-static/bar.rs
index 274401c448b..274401c448b 100644
--- a/src/test/run-make/linkage-attr-on-static/bar.rs
+++ b/src/test/run-make-fulldeps/linkage-attr-on-static/bar.rs
diff --git a/src/test/run-make/linkage-attr-on-static/foo.c b/src/test/run-make-fulldeps/linkage-attr-on-static/foo.c
index d7d33ea12e8..d7d33ea12e8 100644
--- a/src/test/run-make/linkage-attr-on-static/foo.c
+++ b/src/test/run-make-fulldeps/linkage-attr-on-static/foo.c
diff --git a/src/test/run-make/linker-output-non-utf8/Makefile b/src/test/run-make-fulldeps/linker-output-non-utf8/Makefile
index 5f1577ab44d..5f1577ab44d 100644
--- a/src/test/run-make/linker-output-non-utf8/Makefile
+++ b/src/test/run-make-fulldeps/linker-output-non-utf8/Makefile
diff --git a/src/test/run-make/linker-output-non-utf8/exec.rs b/src/test/run-make-fulldeps/linker-output-non-utf8/exec.rs
index 1c03eb479fd..1c03eb479fd 100644
--- a/src/test/run-make/linker-output-non-utf8/exec.rs
+++ b/src/test/run-make-fulldeps/linker-output-non-utf8/exec.rs
diff --git a/src/test/run-make/linker-output-non-utf8/library.rs b/src/test/run-make-fulldeps/linker-output-non-utf8/library.rs
index 194be26424a..194be26424a 100644
--- a/src/test/run-make/linker-output-non-utf8/library.rs
+++ b/src/test/run-make-fulldeps/linker-output-non-utf8/library.rs
diff --git a/src/test/run-make/llvm-pass/Makefile b/src/test/run-make-fulldeps/llvm-pass/Makefile
index 8a18aadf36a..8a18aadf36a 100644
--- a/src/test/run-make/llvm-pass/Makefile
+++ b/src/test/run-make-fulldeps/llvm-pass/Makefile
diff --git a/src/test/run-make/llvm-pass/llvm-function-pass.so.cc b/src/test/run-make-fulldeps/llvm-pass/llvm-function-pass.so.cc
index 880c9bce562..880c9bce562 100644
--- a/src/test/run-make/llvm-pass/llvm-function-pass.so.cc
+++ b/src/test/run-make-fulldeps/llvm-pass/llvm-function-pass.so.cc
diff --git a/src/test/run-make/llvm-pass/llvm-module-pass.so.cc b/src/test/run-make-fulldeps/llvm-pass/llvm-module-pass.so.cc
index 280eca7e8f0..280eca7e8f0 100644
--- a/src/test/run-make/llvm-pass/llvm-module-pass.so.cc
+++ b/src/test/run-make-fulldeps/llvm-pass/llvm-module-pass.so.cc
diff --git a/src/test/run-make/llvm-pass/main.rs b/src/test/run-make-fulldeps/llvm-pass/main.rs
index 5b5ab94bcef..5b5ab94bcef 100644
--- a/src/test/run-make/llvm-pass/main.rs
+++ b/src/test/run-make-fulldeps/llvm-pass/main.rs
diff --git a/src/test/run-make/llvm-pass/plugin.rs b/src/test/run-make-fulldeps/llvm-pass/plugin.rs
index f77b2fca857..f77b2fca857 100644
--- a/src/test/run-make/llvm-pass/plugin.rs
+++ b/src/test/run-make-fulldeps/llvm-pass/plugin.rs
diff --git a/src/test/run-make/long-linker-command-lines-cmd-exe/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile
index debe9e93824..debe9e93824 100644
--- a/src/test/run-make/long-linker-command-lines-cmd-exe/Makefile
+++ b/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile
diff --git a/src/test/run-make/long-linker-command-lines-cmd-exe/foo.bat b/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.bat
index a9350f12bbb..a9350f12bbb 100644
--- a/src/test/run-make/long-linker-command-lines-cmd-exe/foo.bat
+++ b/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.bat
diff --git a/src/test/run-make/long-linker-command-lines-cmd-exe/foo.rs b/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs
index 67d8ad0b672..67d8ad0b672 100644
--- a/src/test/run-make/long-linker-command-lines-cmd-exe/foo.rs
+++ b/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs
diff --git a/src/test/run-make/long-linker-command-lines/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
index 5876fbc94bc..5876fbc94bc 100644
--- a/src/test/run-make/long-linker-command-lines/Makefile
+++ b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
diff --git a/src/test/run-make/long-linker-command-lines/foo.rs b/src/test/run-make-fulldeps/long-linker-command-lines/foo.rs
index 2ac240982af..2ac240982af 100644
--- a/src/test/run-make/long-linker-command-lines/foo.rs
+++ b/src/test/run-make-fulldeps/long-linker-command-lines/foo.rs
diff --git a/src/test/run-make/longjmp-across-rust/Makefile b/src/test/run-make-fulldeps/longjmp-across-rust/Makefile
index 9d71ed8fcf3..9d71ed8fcf3 100644
--- a/src/test/run-make/longjmp-across-rust/Makefile
+++ b/src/test/run-make-fulldeps/longjmp-across-rust/Makefile
diff --git a/src/test/run-make/longjmp-across-rust/foo.c b/src/test/run-make-fulldeps/longjmp-across-rust/foo.c
index eb993957674..eb993957674 100644
--- a/src/test/run-make/longjmp-across-rust/foo.c
+++ b/src/test/run-make-fulldeps/longjmp-across-rust/foo.c
diff --git a/src/test/run-make/longjmp-across-rust/main.rs b/src/test/run-make-fulldeps/longjmp-across-rust/main.rs
index c420473a560..c420473a560 100644
--- a/src/test/run-make/longjmp-across-rust/main.rs
+++ b/src/test/run-make-fulldeps/longjmp-across-rust/main.rs
diff --git a/src/test/run-make/ls-metadata/Makefile b/src/test/run-make-fulldeps/ls-metadata/Makefile
index fc3f5bce0cd..fc3f5bce0cd 100644
--- a/src/test/run-make/ls-metadata/Makefile
+++ b/src/test/run-make-fulldeps/ls-metadata/Makefile
diff --git a/src/test/run-make/ls-metadata/foo.rs b/src/test/run-make-fulldeps/ls-metadata/foo.rs
index 8ae3d072362..8ae3d072362 100644
--- a/src/test/run-make/ls-metadata/foo.rs
+++ b/src/test/run-make-fulldeps/ls-metadata/foo.rs
diff --git a/src/test/run-make/lto-no-link-whole-rlib/Makefile b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/Makefile
index 1d45cb413c5..1d45cb413c5 100644
--- a/src/test/run-make/lto-no-link-whole-rlib/Makefile
+++ b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/Makefile
diff --git a/src/test/run-make/lto-no-link-whole-rlib/bar.c b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/bar.c
index 716d1abcf34..716d1abcf34 100644
--- a/src/test/run-make/lto-no-link-whole-rlib/bar.c
+++ b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/bar.c
diff --git a/src/test/run-make/lto-no-link-whole-rlib/foo.c b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/foo.c
index 1b36874581a..1b36874581a 100644
--- a/src/test/run-make/lto-no-link-whole-rlib/foo.c
+++ b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/foo.c
diff --git a/src/test/run-make/lto-no-link-whole-rlib/lib1.rs b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs
index 0a87c8e4725..0a87c8e4725 100644
--- a/src/test/run-make/lto-no-link-whole-rlib/lib1.rs
+++ b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs
diff --git a/src/test/run-make/lto-no-link-whole-rlib/lib2.rs b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs
index 6e3f382b3fd..6e3f382b3fd 100644
--- a/src/test/run-make/lto-no-link-whole-rlib/lib2.rs
+++ b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs
diff --git a/src/test/run-make/lto-no-link-whole-rlib/main.rs b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/main.rs
index 8417af63be9..8417af63be9 100644
--- a/src/test/run-make/lto-no-link-whole-rlib/main.rs
+++ b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/main.rs
diff --git a/src/test/run-make/lto-readonly-lib/Makefile b/src/test/run-make-fulldeps/lto-readonly-lib/Makefile
index 0afbbc3450a..0afbbc3450a 100644
--- a/src/test/run-make/lto-readonly-lib/Makefile
+++ b/src/test/run-make-fulldeps/lto-readonly-lib/Makefile
diff --git a/src/test/run-make/lto-readonly-lib/lib.rs b/src/test/run-make-fulldeps/lto-readonly-lib/lib.rs
index 04d3ae67207..04d3ae67207 100644
--- a/src/test/run-make/lto-readonly-lib/lib.rs
+++ b/src/test/run-make-fulldeps/lto-readonly-lib/lib.rs
diff --git a/src/test/run-make/lto-readonly-lib/main.rs b/src/test/run-make-fulldeps/lto-readonly-lib/main.rs
index e12ac9e01dc..e12ac9e01dc 100644
--- a/src/test/run-make/lto-readonly-lib/main.rs
+++ b/src/test/run-make-fulldeps/lto-readonly-lib/main.rs
diff --git a/src/test/run-make/lto-smoke-c/Makefile b/src/test/run-make-fulldeps/lto-smoke-c/Makefile
index 0f61f5de938..0f61f5de938 100644
--- a/src/test/run-make/lto-smoke-c/Makefile
+++ b/src/test/run-make-fulldeps/lto-smoke-c/Makefile
diff --git a/src/test/run-make/lto-smoke-c/bar.c b/src/test/run-make-fulldeps/lto-smoke-c/bar.c
index 5729d411c5b..5729d411c5b 100644
--- a/src/test/run-make/lto-smoke-c/bar.c
+++ b/src/test/run-make-fulldeps/lto-smoke-c/bar.c
diff --git a/src/test/run-make/lto-smoke-c/foo.rs b/src/test/run-make-fulldeps/lto-smoke-c/foo.rs
index 1bb19016700..1bb19016700 100644
--- a/src/test/run-make/lto-smoke-c/foo.rs
+++ b/src/test/run-make-fulldeps/lto-smoke-c/foo.rs
diff --git a/src/test/run-make/lto-smoke/Makefile b/src/test/run-make-fulldeps/lto-smoke/Makefile
index 020252e1f8c..020252e1f8c 100644
--- a/src/test/run-make/lto-smoke/Makefile
+++ b/src/test/run-make-fulldeps/lto-smoke/Makefile
diff --git a/src/test/run-make/lto-smoke/lib.rs b/src/test/run-make-fulldeps/lto-smoke/lib.rs
index 04d3ae67207..04d3ae67207 100644
--- a/src/test/run-make/lto-smoke/lib.rs
+++ b/src/test/run-make-fulldeps/lto-smoke/lib.rs
diff --git a/src/test/run-make/lto-smoke/main.rs b/src/test/run-make-fulldeps/lto-smoke/main.rs
index e12ac9e01dc..e12ac9e01dc 100644
--- a/src/test/run-make/lto-smoke/main.rs
+++ b/src/test/run-make-fulldeps/lto-smoke/main.rs
diff --git a/src/test/run-make/manual-crate-name/Makefile b/src/test/run-make-fulldeps/manual-crate-name/Makefile
index 1d1419997a2..1d1419997a2 100644
--- a/src/test/run-make/manual-crate-name/Makefile
+++ b/src/test/run-make-fulldeps/manual-crate-name/Makefile
diff --git a/src/test/run-make/manual-crate-name/bar.rs b/src/test/run-make-fulldeps/manual-crate-name/bar.rs
index 04d3ae67207..04d3ae67207 100644
--- a/src/test/run-make/manual-crate-name/bar.rs
+++ b/src/test/run-make-fulldeps/manual-crate-name/bar.rs
diff --git a/src/test/run-make/manual-link/Makefile b/src/test/run-make-fulldeps/manual-link/Makefile
index dccf0d99b0f..dccf0d99b0f 100644
--- a/src/test/run-make/manual-link/Makefile
+++ b/src/test/run-make-fulldeps/manual-link/Makefile
diff --git a/src/test/run-make/manual-link/bar.c b/src/test/run-make-fulldeps/manual-link/bar.c
index 3c167b45af9..3c167b45af9 100644
--- a/src/test/run-make/manual-link/bar.c
+++ b/src/test/run-make-fulldeps/manual-link/bar.c
diff --git a/src/test/run-make/manual-link/foo.c b/src/test/run-make-fulldeps/manual-link/foo.c
index 3c167b45af9..3c167b45af9 100644
--- a/src/test/run-make/manual-link/foo.c
+++ b/src/test/run-make-fulldeps/manual-link/foo.c
diff --git a/src/test/run-make/manual-link/foo.rs b/src/test/run-make-fulldeps/manual-link/foo.rs
index d67a4057afb..d67a4057afb 100644
--- a/src/test/run-make/manual-link/foo.rs
+++ b/src/test/run-make-fulldeps/manual-link/foo.rs
diff --git a/src/test/run-make/manual-link/main.rs b/src/test/run-make-fulldeps/manual-link/main.rs
index 756a47f386a..756a47f386a 100644
--- a/src/test/run-make/manual-link/main.rs
+++ b/src/test/run-make-fulldeps/manual-link/main.rs
diff --git a/src/test/run-make/many-crates-but-no-match/Makefile b/src/test/run-make-fulldeps/many-crates-but-no-match/Makefile
index 03a797d95f9..03a797d95f9 100644
--- a/src/test/run-make/many-crates-but-no-match/Makefile
+++ b/src/test/run-make-fulldeps/many-crates-but-no-match/Makefile
diff --git a/src/test/run-make/many-crates-but-no-match/crateA1.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA1.rs
index dbfe920c85b..dbfe920c85b 100644
--- a/src/test/run-make/many-crates-but-no-match/crateA1.rs
+++ b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA1.rs
diff --git a/src/test/run-make/many-crates-but-no-match/crateA2.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA2.rs
index 857c36aee60..857c36aee60 100644
--- a/src/test/run-make/many-crates-but-no-match/crateA2.rs
+++ b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA2.rs
diff --git a/src/test/run-make/many-crates-but-no-match/crateA3.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA3.rs
index 8b8dac5e862..8b8dac5e862 100644
--- a/src/test/run-make/many-crates-but-no-match/crateA3.rs
+++ b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA3.rs
diff --git a/src/test/run-make/many-crates-but-no-match/crateB.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateB.rs
index bf55017c646..bf55017c646 100644
--- a/src/test/run-make/many-crates-but-no-match/crateB.rs
+++ b/src/test/run-make-fulldeps/many-crates-but-no-match/crateB.rs
diff --git a/src/test/run-make/many-crates-but-no-match/crateC.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateC.rs
index 174d9382b76..174d9382b76 100644
--- a/src/test/run-make/many-crates-but-no-match/crateC.rs
+++ b/src/test/run-make-fulldeps/many-crates-but-no-match/crateC.rs
diff --git a/src/test/run-make/metadata-flag-frobs-symbols/Makefile b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile
index 09e6ae0bbf7..09e6ae0bbf7 100644
--- a/src/test/run-make/metadata-flag-frobs-symbols/Makefile
+++ b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile
diff --git a/src/test/run-make/metadata-flag-frobs-symbols/bar.rs b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/bar.rs
index 44b9e2f874a..44b9e2f874a 100644
--- a/src/test/run-make/metadata-flag-frobs-symbols/bar.rs
+++ b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/bar.rs
diff --git a/src/test/run-make/metadata-flag-frobs-symbols/foo.rs b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs
index baabdc9ad7b..baabdc9ad7b 100644
--- a/src/test/run-make/metadata-flag-frobs-symbols/foo.rs
+++ b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs
diff --git a/src/test/run-make/min-global-align/Makefile b/src/test/run-make-fulldeps/min-global-align/Makefile
index 2eacc36f380..2eacc36f380 100644
--- a/src/test/run-make/min-global-align/Makefile
+++ b/src/test/run-make-fulldeps/min-global-align/Makefile
diff --git a/src/test/run-make/min-global-align/min_global_align.rs b/src/test/run-make-fulldeps/min-global-align/min_global_align.rs
index 3d4f9001a74..3d4f9001a74 100644
--- a/src/test/run-make/min-global-align/min_global_align.rs
+++ b/src/test/run-make-fulldeps/min-global-align/min_global_align.rs
diff --git a/src/test/run-make/mismatching-target-triples/Makefile b/src/test/run-make-fulldeps/mismatching-target-triples/Makefile
index 1636e41b056..1636e41b056 100644
--- a/src/test/run-make/mismatching-target-triples/Makefile
+++ b/src/test/run-make-fulldeps/mismatching-target-triples/Makefile
diff --git a/src/test/run-make/mismatching-target-triples/bar.rs b/src/test/run-make-fulldeps/mismatching-target-triples/bar.rs
index 0dc5c0a3a8e..0dc5c0a3a8e 100644
--- a/src/test/run-make/mismatching-target-triples/bar.rs
+++ b/src/test/run-make-fulldeps/mismatching-target-triples/bar.rs
diff --git a/src/test/run-make/mismatching-target-triples/foo.rs b/src/test/run-make-fulldeps/mismatching-target-triples/foo.rs
index a2169d0c631..a2169d0c631 100644
--- a/src/test/run-make/mismatching-target-triples/foo.rs
+++ b/src/test/run-make-fulldeps/mismatching-target-triples/foo.rs
diff --git a/src/test/run-make/missing-crate-dependency/Makefile b/src/test/run-make-fulldeps/missing-crate-dependency/Makefile
index b5a5bf492ab..b5a5bf492ab 100644
--- a/src/test/run-make/missing-crate-dependency/Makefile
+++ b/src/test/run-make-fulldeps/missing-crate-dependency/Makefile
diff --git a/src/test/run-make/missing-crate-dependency/crateA.rs b/src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs
index 4e111f29e8a..4e111f29e8a 100644
--- a/src/test/run-make/missing-crate-dependency/crateA.rs
+++ b/src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs
diff --git a/src/test/run-make/missing-crate-dependency/crateB.rs b/src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs
index bf55017c646..bf55017c646 100644
--- a/src/test/run-make/missing-crate-dependency/crateB.rs
+++ b/src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs
diff --git a/src/test/run-make/missing-crate-dependency/crateC.rs b/src/test/run-make-fulldeps/missing-crate-dependency/crateC.rs
index 174d9382b76..174d9382b76 100644
--- a/src/test/run-make/missing-crate-dependency/crateC.rs
+++ b/src/test/run-make-fulldeps/missing-crate-dependency/crateC.rs
diff --git a/src/test/run-make/mixing-deps/Makefile b/src/test/run-make-fulldeps/mixing-deps/Makefile
index 0e52d4a8bef..0e52d4a8bef 100644
--- a/src/test/run-make/mixing-deps/Makefile
+++ b/src/test/run-make-fulldeps/mixing-deps/Makefile
diff --git a/src/test/run-make/mixing-deps/both.rs b/src/test/run-make-fulldeps/mixing-deps/both.rs
index c44335e2bbc..c44335e2bbc 100644
--- a/src/test/run-make/mixing-deps/both.rs
+++ b/src/test/run-make-fulldeps/mixing-deps/both.rs
diff --git a/src/test/run-make/mixing-deps/dylib.rs b/src/test/run-make-fulldeps/mixing-deps/dylib.rs
index 78af525f386..78af525f386 100644
--- a/src/test/run-make/mixing-deps/dylib.rs
+++ b/src/test/run-make-fulldeps/mixing-deps/dylib.rs
diff --git a/src/test/run-make/mixing-deps/prog.rs b/src/test/run-make-fulldeps/mixing-deps/prog.rs
index c3d88016fda..c3d88016fda 100644
--- a/src/test/run-make/mixing-deps/prog.rs
+++ b/src/test/run-make-fulldeps/mixing-deps/prog.rs
diff --git a/src/test/run-make/mixing-formats/Makefile b/src/test/run-make-fulldeps/mixing-formats/Makefile
index 48257669baf..48257669baf 100644
--- a/src/test/run-make/mixing-formats/Makefile
+++ b/src/test/run-make-fulldeps/mixing-formats/Makefile
diff --git a/src/test/run-make/mixing-formats/bar1.rs b/src/test/run-make-fulldeps/mixing-formats/bar1.rs
index 4b4916fe96d..4b4916fe96d 100644
--- a/src/test/run-make/mixing-formats/bar1.rs
+++ b/src/test/run-make-fulldeps/mixing-formats/bar1.rs
diff --git a/src/test/run-make/mixing-formats/bar2.rs b/src/test/run-make-fulldeps/mixing-formats/bar2.rs
index 4b4916fe96d..4b4916fe96d 100644
--- a/src/test/run-make/mixing-formats/bar2.rs
+++ b/src/test/run-make-fulldeps/mixing-formats/bar2.rs
diff --git a/src/test/run-make/mixing-formats/baz.rs b/src/test/run-make-fulldeps/mixing-formats/baz.rs
index 3fb90f6a854..3fb90f6a854 100644
--- a/src/test/run-make/mixing-formats/baz.rs
+++ b/src/test/run-make-fulldeps/mixing-formats/baz.rs
diff --git a/src/test/run-make/mixing-formats/baz2.rs b/src/test/run-make-fulldeps/mixing-formats/baz2.rs
index c5066ccd656..c5066ccd656 100644
--- a/src/test/run-make/mixing-formats/baz2.rs
+++ b/src/test/run-make-fulldeps/mixing-formats/baz2.rs
diff --git a/src/test/run-make/mixing-formats/foo.rs b/src/test/run-make-fulldeps/mixing-formats/foo.rs
index e6c76025738..e6c76025738 100644
--- a/src/test/run-make/mixing-formats/foo.rs
+++ b/src/test/run-make-fulldeps/mixing-formats/foo.rs
diff --git a/src/test/run-make/mixing-libs/Makefile b/src/test/run-make-fulldeps/mixing-libs/Makefile
index babeeef164d..babeeef164d 100644
--- a/src/test/run-make/mixing-libs/Makefile
+++ b/src/test/run-make-fulldeps/mixing-libs/Makefile
diff --git a/src/test/run-make/mixing-libs/dylib.rs b/src/test/run-make-fulldeps/mixing-libs/dylib.rs
index 1a5bd658cd9..1a5bd658cd9 100644
--- a/src/test/run-make/mixing-libs/dylib.rs
+++ b/src/test/run-make-fulldeps/mixing-libs/dylib.rs
diff --git a/src/test/run-make/mixing-libs/prog.rs b/src/test/run-make-fulldeps/mixing-libs/prog.rs
index 5e1a4274756..5e1a4274756 100644
--- a/src/test/run-make/mixing-libs/prog.rs
+++ b/src/test/run-make-fulldeps/mixing-libs/prog.rs
diff --git a/src/test/run-make/mixing-libs/rlib.rs b/src/test/run-make-fulldeps/mixing-libs/rlib.rs
index ad0ea67b9ab..ad0ea67b9ab 100644
--- a/src/test/run-make/mixing-libs/rlib.rs
+++ b/src/test/run-make-fulldeps/mixing-libs/rlib.rs
diff --git a/src/test/run-make/msvc-opt-minsize/Makefile b/src/test/run-make-fulldeps/msvc-opt-minsize/Makefile
index 1095a047dd1..1095a047dd1 100644
--- a/src/test/run-make/msvc-opt-minsize/Makefile
+++ b/src/test/run-make-fulldeps/msvc-opt-minsize/Makefile
diff --git a/src/test/run-make/msvc-opt-minsize/foo.rs b/src/test/run-make-fulldeps/msvc-opt-minsize/foo.rs
index 30b12691afe..30b12691afe 100644
--- a/src/test/run-make/msvc-opt-minsize/foo.rs
+++ b/src/test/run-make-fulldeps/msvc-opt-minsize/foo.rs
diff --git a/src/test/run-make/multiple-emits/Makefile b/src/test/run-make-fulldeps/multiple-emits/Makefile
index e126422835c..e126422835c 100644
--- a/src/test/run-make/multiple-emits/Makefile
+++ b/src/test/run-make-fulldeps/multiple-emits/Makefile
diff --git a/src/test/run-make/multiple-emits/foo.rs b/src/test/run-make-fulldeps/multiple-emits/foo.rs
index 8ae3d072362..8ae3d072362 100644
--- a/src/test/run-make/multiple-emits/foo.rs
+++ b/src/test/run-make-fulldeps/multiple-emits/foo.rs
diff --git a/src/test/run-make/no-builtins-lto/Makefile b/src/test/run-make-fulldeps/no-builtins-lto/Makefile
index b9688f16c64..b9688f16c64 100644
--- a/src/test/run-make/no-builtins-lto/Makefile
+++ b/src/test/run-make-fulldeps/no-builtins-lto/Makefile
diff --git a/src/test/run-make/no-builtins-lto/main.rs b/src/test/run-make-fulldeps/no-builtins-lto/main.rs
index e960c726a98..e960c726a98 100644
--- a/src/test/run-make/no-builtins-lto/main.rs
+++ b/src/test/run-make-fulldeps/no-builtins-lto/main.rs
diff --git a/src/test/run-make/no-builtins-lto/no_builtins.rs b/src/test/run-make-fulldeps/no-builtins-lto/no_builtins.rs
index be95e7c5521..be95e7c5521 100644
--- a/src/test/run-make/no-builtins-lto/no_builtins.rs
+++ b/src/test/run-make-fulldeps/no-builtins-lto/no_builtins.rs
diff --git a/src/test/run-make/no-duplicate-libs/Makefile b/src/test/run-make-fulldeps/no-duplicate-libs/Makefile
index 13d8366c60a..13d8366c60a 100644
--- a/src/test/run-make/no-duplicate-libs/Makefile
+++ b/src/test/run-make-fulldeps/no-duplicate-libs/Makefile
diff --git a/src/test/run-make/no-duplicate-libs/bar.c b/src/test/run-make-fulldeps/no-duplicate-libs/bar.c
index b9dcd0f5e5e..b9dcd0f5e5e 100644
--- a/src/test/run-make/no-duplicate-libs/bar.c
+++ b/src/test/run-make-fulldeps/no-duplicate-libs/bar.c
diff --git a/src/test/run-make/no-duplicate-libs/foo.c b/src/test/run-make-fulldeps/no-duplicate-libs/foo.c
index 906cd5682b8..906cd5682b8 100644
--- a/src/test/run-make/no-duplicate-libs/foo.c
+++ b/src/test/run-make-fulldeps/no-duplicate-libs/foo.c
diff --git a/src/test/run-make/no-duplicate-libs/main.rs b/src/test/run-make-fulldeps/no-duplicate-libs/main.rs
index 824946fe9c2..824946fe9c2 100644
--- a/src/test/run-make/no-duplicate-libs/main.rs
+++ b/src/test/run-make-fulldeps/no-duplicate-libs/main.rs
diff --git a/src/test/run-make/no-integrated-as/Makefile b/src/test/run-make-fulldeps/no-integrated-as/Makefile
index 78e3025b99a..78e3025b99a 100644
--- a/src/test/run-make/no-integrated-as/Makefile
+++ b/src/test/run-make-fulldeps/no-integrated-as/Makefile
diff --git a/src/test/run-make/no-integrated-as/hello.rs b/src/test/run-make-fulldeps/no-integrated-as/hello.rs
index 68e7f6d94d1..68e7f6d94d1 100644
--- a/src/test/run-make/no-integrated-as/hello.rs
+++ b/src/test/run-make-fulldeps/no-integrated-as/hello.rs
diff --git a/src/test/run-make/no-intermediate-extras/Makefile b/src/test/run-make-fulldeps/no-intermediate-extras/Makefile
index 258cbf04c61..258cbf04c61 100644
--- a/src/test/run-make/no-intermediate-extras/Makefile
+++ b/src/test/run-make-fulldeps/no-intermediate-extras/Makefile
diff --git a/src/test/run-make/no-intermediate-extras/foo.rs b/src/test/run-make-fulldeps/no-intermediate-extras/foo.rs
index e6c76025738..e6c76025738 100644
--- a/src/test/run-make/no-intermediate-extras/foo.rs
+++ b/src/test/run-make-fulldeps/no-intermediate-extras/foo.rs
diff --git a/src/test/run-make/obey-crate-type-flag/Makefile b/src/test/run-make-fulldeps/obey-crate-type-flag/Makefile
index 903349152df..903349152df 100644
--- a/src/test/run-make/obey-crate-type-flag/Makefile
+++ b/src/test/run-make-fulldeps/obey-crate-type-flag/Makefile
diff --git a/src/test/run-make/obey-crate-type-flag/test.rs b/src/test/run-make-fulldeps/obey-crate-type-flag/test.rs
index e6c8b8eb179..e6c8b8eb179 100644
--- a/src/test/run-make/obey-crate-type-flag/test.rs
+++ b/src/test/run-make-fulldeps/obey-crate-type-flag/test.rs
diff --git a/src/test/run-make/output-filename-conflicts-with-directory/Makefile b/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile
index 74e5dcfcf36..74e5dcfcf36 100644
--- a/src/test/run-make/output-filename-conflicts-with-directory/Makefile
+++ b/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile
diff --git a/src/test/run-make/output-filename-conflicts-with-directory/foo.rs b/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs
index 3f07b46791d..3f07b46791d 100644
--- a/src/test/run-make/output-filename-conflicts-with-directory/foo.rs
+++ b/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs
diff --git a/src/test/run-make/output-filename-overwrites-input/Makefile b/src/test/run-make-fulldeps/output-filename-overwrites-input/Makefile
index 6377038b7be..6377038b7be 100644
--- a/src/test/run-make/output-filename-overwrites-input/Makefile
+++ b/src/test/run-make-fulldeps/output-filename-overwrites-input/Makefile
diff --git a/src/test/run-make/output-filename-overwrites-input/bar.rs b/src/test/run-make-fulldeps/output-filename-overwrites-input/bar.rs
index 8e4e35fdee6..8e4e35fdee6 100644
--- a/src/test/run-make/output-filename-overwrites-input/bar.rs
+++ b/src/test/run-make-fulldeps/output-filename-overwrites-input/bar.rs
diff --git a/src/test/run-make/output-filename-overwrites-input/foo.rs b/src/test/run-make-fulldeps/output-filename-overwrites-input/foo.rs
index 3f07b46791d..3f07b46791d 100644
--- a/src/test/run-make/output-filename-overwrites-input/foo.rs
+++ b/src/test/run-make-fulldeps/output-filename-overwrites-input/foo.rs
diff --git a/src/test/run-make/output-type-permutations/Makefile b/src/test/run-make-fulldeps/output-type-permutations/Makefile
index c2715027bc1..c2715027bc1 100644
--- a/src/test/run-make/output-type-permutations/Makefile
+++ b/src/test/run-make-fulldeps/output-type-permutations/Makefile
diff --git a/src/test/run-make/output-type-permutations/foo.rs b/src/test/run-make-fulldeps/output-type-permutations/foo.rs
index bb5796bd873..bb5796bd873 100644
--- a/src/test/run-make/output-type-permutations/foo.rs
+++ b/src/test/run-make-fulldeps/output-type-permutations/foo.rs
diff --git a/src/test/run-make/output-with-hyphens/Makefile b/src/test/run-make-fulldeps/output-with-hyphens/Makefile
index 783d826a53d..783d826a53d 100644
--- a/src/test/run-make/output-with-hyphens/Makefile
+++ b/src/test/run-make-fulldeps/output-with-hyphens/Makefile
diff --git a/src/test/run-make/output-with-hyphens/foo-bar.rs b/src/test/run-make-fulldeps/output-with-hyphens/foo-bar.rs
index 2f93b2d1ead..2f93b2d1ead 100644
--- a/src/test/run-make/output-with-hyphens/foo-bar.rs
+++ b/src/test/run-make-fulldeps/output-with-hyphens/foo-bar.rs
diff --git a/src/test/run-make/prefer-dylib/Makefile b/src/test/run-make-fulldeps/prefer-dylib/Makefile
index bd44feecf2a..bd44feecf2a 100644
--- a/src/test/run-make/prefer-dylib/Makefile
+++ b/src/test/run-make-fulldeps/prefer-dylib/Makefile
diff --git a/src/test/run-make/prefer-dylib/bar.rs b/src/test/run-make-fulldeps/prefer-dylib/bar.rs
index 4c79f7e2855..4c79f7e2855 100644
--- a/src/test/run-make/prefer-dylib/bar.rs
+++ b/src/test/run-make-fulldeps/prefer-dylib/bar.rs
diff --git a/src/test/run-make/prefer-dylib/foo.rs b/src/test/run-make-fulldeps/prefer-dylib/foo.rs
index 858ef492ace..858ef492ace 100644
--- a/src/test/run-make/prefer-dylib/foo.rs
+++ b/src/test/run-make-fulldeps/prefer-dylib/foo.rs
diff --git a/src/test/run-make/prefer-rlib/Makefile b/src/test/run-make-fulldeps/prefer-rlib/Makefile
index c6a239eef08..c6a239eef08 100644
--- a/src/test/run-make/prefer-rlib/Makefile
+++ b/src/test/run-make-fulldeps/prefer-rlib/Makefile
diff --git a/src/test/run-make/prefer-rlib/bar.rs b/src/test/run-make-fulldeps/prefer-rlib/bar.rs
index 4c79f7e2855..4c79f7e2855 100644
--- a/src/test/run-make/prefer-rlib/bar.rs
+++ b/src/test/run-make-fulldeps/prefer-rlib/bar.rs
diff --git a/src/test/run-make/prefer-rlib/foo.rs b/src/test/run-make-fulldeps/prefer-rlib/foo.rs
index 858ef492ace..858ef492ace 100644
--- a/src/test/run-make/prefer-rlib/foo.rs
+++ b/src/test/run-make-fulldeps/prefer-rlib/foo.rs
diff --git a/src/test/run-make/pretty-expanded-hygiene/Makefile b/src/test/run-make-fulldeps/pretty-expanded-hygiene/Makefile
index 136d7643ade..136d7643ade 100644
--- a/src/test/run-make/pretty-expanded-hygiene/Makefile
+++ b/src/test/run-make-fulldeps/pretty-expanded-hygiene/Makefile
diff --git a/src/test/run-make/pretty-expanded-hygiene/input.pp.rs b/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.rs
index 3d2dd380e48..3d2dd380e48 100644
--- a/src/test/run-make/pretty-expanded-hygiene/input.pp.rs
+++ b/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.rs
diff --git a/src/test/run-make/pretty-expanded-hygiene/input.rs b/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.rs
index 422fbdb0884..422fbdb0884 100644
--- a/src/test/run-make/pretty-expanded-hygiene/input.rs
+++ b/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.rs
diff --git a/src/test/run-make/pretty-expanded/Makefile b/src/test/run-make-fulldeps/pretty-expanded/Makefile
index 7a8dc8d871c..7a8dc8d871c 100644
--- a/src/test/run-make/pretty-expanded/Makefile
+++ b/src/test/run-make-fulldeps/pretty-expanded/Makefile
diff --git a/src/test/run-make/pretty-expanded/input.rs b/src/test/run-make-fulldeps/pretty-expanded/input.rs
index 04bf17dc28a..04bf17dc28a 100644
--- a/src/test/run-make/pretty-expanded/input.rs
+++ b/src/test/run-make-fulldeps/pretty-expanded/input.rs
diff --git a/src/test/run-make/pretty-print-path-suffix/Makefile b/src/test/run-make-fulldeps/pretty-print-path-suffix/Makefile
index 899457fc748..899457fc748 100644
--- a/src/test/run-make/pretty-print-path-suffix/Makefile
+++ b/src/test/run-make-fulldeps/pretty-print-path-suffix/Makefile
diff --git a/src/test/run-make/pretty-print-path-suffix/foo.pp b/src/test/run-make-fulldeps/pretty-print-path-suffix/foo.pp
index f3130a8044a..f3130a8044a 100644
--- a/src/test/run-make/pretty-print-path-suffix/foo.pp
+++ b/src/test/run-make-fulldeps/pretty-print-path-suffix/foo.pp
diff --git a/src/test/run-make/pretty-print-path-suffix/foo_method.pp b/src/test/run-make-fulldeps/pretty-print-path-suffix/foo_method.pp
index fae13498687..fae13498687 100644
--- a/src/test/run-make/pretty-print-path-suffix/foo_method.pp
+++ b/src/test/run-make-fulldeps/pretty-print-path-suffix/foo_method.pp
diff --git a/src/test/run-make/pretty-print-path-suffix/input.rs b/src/test/run-make-fulldeps/pretty-print-path-suffix/input.rs
index 8ea86a94f93..8ea86a94f93 100644
--- a/src/test/run-make/pretty-print-path-suffix/input.rs
+++ b/src/test/run-make-fulldeps/pretty-print-path-suffix/input.rs
diff --git a/src/test/run-make/pretty-print-path-suffix/nest_foo.pp b/src/test/run-make-fulldeps/pretty-print-path-suffix/nest_foo.pp
index 88eaa062b03..88eaa062b03 100644
--- a/src/test/run-make/pretty-print-path-suffix/nest_foo.pp
+++ b/src/test/run-make-fulldeps/pretty-print-path-suffix/nest_foo.pp
diff --git a/src/test/run-make/pretty-print-to-file/Makefile b/src/test/run-make-fulldeps/pretty-print-to-file/Makefile
index 8909dee11f0..8909dee11f0 100644
--- a/src/test/run-make/pretty-print-to-file/Makefile
+++ b/src/test/run-make-fulldeps/pretty-print-to-file/Makefile
diff --git a/src/test/run-make/pretty-print-to-file/input.pp b/src/test/run-make-fulldeps/pretty-print-to-file/input.pp
index a6dd6b6778e..a6dd6b6778e 100644
--- a/src/test/run-make/pretty-print-to-file/input.pp
+++ b/src/test/run-make-fulldeps/pretty-print-to-file/input.pp
diff --git a/src/test/run-make/pretty-print-to-file/input.rs b/src/test/run-make-fulldeps/pretty-print-to-file/input.rs
index 8e3ec363187..8e3ec363187 100644
--- a/src/test/run-make/pretty-print-to-file/input.rs
+++ b/src/test/run-make-fulldeps/pretty-print-to-file/input.rs
diff --git a/src/test/run-make/print-cfg/Makefile b/src/test/run-make-fulldeps/print-cfg/Makefile
index 08303a46d19..08303a46d19 100644
--- a/src/test/run-make/print-cfg/Makefile
+++ b/src/test/run-make-fulldeps/print-cfg/Makefile
diff --git a/src/test/run-make/print-target-list/Makefile b/src/test/run-make-fulldeps/print-target-list/Makefile
index 144c5ba10cc..144c5ba10cc 100644
--- a/src/test/run-make/print-target-list/Makefile
+++ b/src/test/run-make-fulldeps/print-target-list/Makefile
diff --git a/src/test/run-make/profile/Makefile b/src/test/run-make-fulldeps/profile/Makefile
index 7300bfc9553..7300bfc9553 100644
--- a/src/test/run-make/profile/Makefile
+++ b/src/test/run-make-fulldeps/profile/Makefile
diff --git a/src/test/run-make/profile/test.rs b/src/test/run-make-fulldeps/profile/test.rs
index 046d27a9f0f..046d27a9f0f 100644
--- a/src/test/run-make/profile/test.rs
+++ b/src/test/run-make-fulldeps/profile/test.rs
diff --git a/src/test/run-make/prune-link-args/Makefile b/src/test/run-make-fulldeps/prune-link-args/Makefile
index a6e219873df..a6e219873df 100644
--- a/src/test/run-make/prune-link-args/Makefile
+++ b/src/test/run-make-fulldeps/prune-link-args/Makefile
diff --git a/src/test/run-make/prune-link-args/empty.rs b/src/test/run-make-fulldeps/prune-link-args/empty.rs
index a9e231b0ea8..a9e231b0ea8 100644
--- a/src/test/run-make/prune-link-args/empty.rs
+++ b/src/test/run-make-fulldeps/prune-link-args/empty.rs
diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make-fulldeps/relocation-model/Makefile
index 485ecbb4b5a..485ecbb4b5a 100644
--- a/src/test/run-make/relocation-model/Makefile
+++ b/src/test/run-make-fulldeps/relocation-model/Makefile
diff --git a/src/test/run-make/relocation-model/foo.rs b/src/test/run-make-fulldeps/relocation-model/foo.rs
index e06d81cd60b..e06d81cd60b 100644
--- a/src/test/run-make/relocation-model/foo.rs
+++ b/src/test/run-make-fulldeps/relocation-model/foo.rs
diff --git a/src/test/run-make/relro-levels/Makefile b/src/test/run-make-fulldeps/relro-levels/Makefile
index 673ba9a9a02..673ba9a9a02 100644
--- a/src/test/run-make/relro-levels/Makefile
+++ b/src/test/run-make-fulldeps/relro-levels/Makefile
diff --git a/src/test/run-make/relro-levels/hello.rs b/src/test/run-make-fulldeps/relro-levels/hello.rs
index 41782851a1a..41782851a1a 100644
--- a/src/test/run-make/relro-levels/hello.rs
+++ b/src/test/run-make-fulldeps/relro-levels/hello.rs
diff --git a/src/test/run-make/reproducible-build/Makefile b/src/test/run-make-fulldeps/reproducible-build/Makefile
index ca76a5e5d77..ca76a5e5d77 100644
--- a/src/test/run-make/reproducible-build/Makefile
+++ b/src/test/run-make-fulldeps/reproducible-build/Makefile
diff --git a/src/test/run-make/reproducible-build/linker.rs b/src/test/run-make-fulldeps/reproducible-build/linker.rs
index fd8946708bf..fd8946708bf 100644
--- a/src/test/run-make/reproducible-build/linker.rs
+++ b/src/test/run-make-fulldeps/reproducible-build/linker.rs
diff --git a/src/test/run-make/reproducible-build/reproducible-build-aux.rs b/src/test/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs
index 9ef853e7996..9ef853e7996 100644
--- a/src/test/run-make/reproducible-build/reproducible-build-aux.rs
+++ b/src/test/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs
diff --git a/src/test/run-make/reproducible-build/reproducible-build.rs b/src/test/run-make-fulldeps/reproducible-build/reproducible-build.rs
index a040c0f858d..a040c0f858d 100644
--- a/src/test/run-make/reproducible-build/reproducible-build.rs
+++ b/src/test/run-make-fulldeps/reproducible-build/reproducible-build.rs
diff --git a/src/test/run-make/rlib-chain/Makefile b/src/test/run-make-fulldeps/rlib-chain/Makefile
index 30b6811a388..30b6811a388 100644
--- a/src/test/run-make/rlib-chain/Makefile
+++ b/src/test/run-make-fulldeps/rlib-chain/Makefile
diff --git a/src/test/run-make/rlib-chain/m1.rs b/src/test/run-make-fulldeps/rlib-chain/m1.rs
index e3afa352938..e3afa352938 100644
--- a/src/test/run-make/rlib-chain/m1.rs
+++ b/src/test/run-make-fulldeps/rlib-chain/m1.rs
diff --git a/src/test/run-make/rlib-chain/m2.rs b/src/test/run-make-fulldeps/rlib-chain/m2.rs
index 2b4c181134b..2b4c181134b 100644
--- a/src/test/run-make/rlib-chain/m2.rs
+++ b/src/test/run-make-fulldeps/rlib-chain/m2.rs
diff --git a/src/test/run-make/rlib-chain/m3.rs b/src/test/run-make-fulldeps/rlib-chain/m3.rs
index 6323a9e65aa..6323a9e65aa 100644
--- a/src/test/run-make/rlib-chain/m3.rs
+++ b/src/test/run-make-fulldeps/rlib-chain/m3.rs
diff --git a/src/test/run-make/rlib-chain/m4.rs b/src/test/run-make-fulldeps/rlib-chain/m4.rs
index 6c2a6685802..6c2a6685802 100644
--- a/src/test/run-make/rlib-chain/m4.rs
+++ b/src/test/run-make-fulldeps/rlib-chain/m4.rs
diff --git a/src/test/run-make/rustc-macro-dep-files/Makefile b/src/test/run-make-fulldeps/rustc-macro-dep-files/Makefile
index d2c8e7fd043..d2c8e7fd043 100644
--- a/src/test/run-make/rustc-macro-dep-files/Makefile
+++ b/src/test/run-make-fulldeps/rustc-macro-dep-files/Makefile
diff --git a/src/test/run-make/rustc-macro-dep-files/bar.rs b/src/test/run-make-fulldeps/rustc-macro-dep-files/bar.rs
index 03330c3d170..03330c3d170 100644
--- a/src/test/run-make/rustc-macro-dep-files/bar.rs
+++ b/src/test/run-make-fulldeps/rustc-macro-dep-files/bar.rs
diff --git a/src/test/run-make/rustc-macro-dep-files/foo.rs b/src/test/run-make-fulldeps/rustc-macro-dep-files/foo.rs
index 2f2524f6ef1..2f2524f6ef1 100644
--- a/src/test/run-make/rustc-macro-dep-files/foo.rs
+++ b/src/test/run-make-fulldeps/rustc-macro-dep-files/foo.rs
diff --git a/src/test/run-make/rustdoc-error-lines/Makefile b/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile
index 0019e5ee794..0019e5ee794 100644
--- a/src/test/run-make/rustdoc-error-lines/Makefile
+++ b/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile
diff --git a/src/test/run-make/rustdoc-error-lines/input.rs b/src/test/run-make-fulldeps/rustdoc-error-lines/input.rs
index 6dc7060bc48..6dc7060bc48 100644
--- a/src/test/run-make/rustdoc-error-lines/input.rs
+++ b/src/test/run-make-fulldeps/rustdoc-error-lines/input.rs
diff --git a/src/test/run-make/rustdoc-output-path/Makefile b/src/test/run-make-fulldeps/rustdoc-output-path/Makefile
index 8ce1c699526..8ce1c699526 100644
--- a/src/test/run-make/rustdoc-output-path/Makefile
+++ b/src/test/run-make-fulldeps/rustdoc-output-path/Makefile
diff --git a/src/test/run-make/rustdoc-output-path/foo.rs b/src/test/run-make-fulldeps/rustdoc-output-path/foo.rs
index 11fc2cd2b8d..11fc2cd2b8d 100644
--- a/src/test/run-make/rustdoc-output-path/foo.rs
+++ b/src/test/run-make-fulldeps/rustdoc-output-path/foo.rs
diff --git a/src/test/run-make/sanitizer-address/Makefile b/src/test/run-make-fulldeps/sanitizer-address/Makefile
index 207615bfbd5..207615bfbd5 100644
--- a/src/test/run-make/sanitizer-address/Makefile
+++ b/src/test/run-make-fulldeps/sanitizer-address/Makefile
diff --git a/src/test/run-make/sanitizer-address/overflow.rs b/src/test/run-make-fulldeps/sanitizer-address/overflow.rs
index 1f3c64c8c32..1f3c64c8c32 100644
--- a/src/test/run-make/sanitizer-address/overflow.rs
+++ b/src/test/run-make-fulldeps/sanitizer-address/overflow.rs
diff --git a/src/test/run-make/sanitizer-cdylib-link/Makefile b/src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile
index bea5519ec5f..bea5519ec5f 100644
--- a/src/test/run-make/sanitizer-cdylib-link/Makefile
+++ b/src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile
diff --git a/src/test/run-make/sanitizer-cdylib-link/library.rs b/src/test/run-make-fulldeps/sanitizer-cdylib-link/library.rs
index 4ceef5d3f52..4ceef5d3f52 100644
--- a/src/test/run-make/sanitizer-cdylib-link/library.rs
+++ b/src/test/run-make-fulldeps/sanitizer-cdylib-link/library.rs
diff --git a/src/test/run-make/sanitizer-cdylib-link/program.rs b/src/test/run-make-fulldeps/sanitizer-cdylib-link/program.rs
index 9f52817c851..9f52817c851 100644
--- a/src/test/run-make/sanitizer-cdylib-link/program.rs
+++ b/src/test/run-make-fulldeps/sanitizer-cdylib-link/program.rs
diff --git a/src/test/run-make/sanitizer-dylib-link/Makefile b/src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile
index 0cc8f73da8b..0cc8f73da8b 100644
--- a/src/test/run-make/sanitizer-dylib-link/Makefile
+++ b/src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile
diff --git a/src/test/run-make/sanitizer-dylib-link/library.rs b/src/test/run-make-fulldeps/sanitizer-dylib-link/library.rs
index 4ceef5d3f52..4ceef5d3f52 100644
--- a/src/test/run-make/sanitizer-dylib-link/library.rs
+++ b/src/test/run-make-fulldeps/sanitizer-dylib-link/library.rs
diff --git a/src/test/run-make/sanitizer-dylib-link/program.rs b/src/test/run-make-fulldeps/sanitizer-dylib-link/program.rs
index 9f52817c851..9f52817c851 100644
--- a/src/test/run-make/sanitizer-dylib-link/program.rs
+++ b/src/test/run-make-fulldeps/sanitizer-dylib-link/program.rs
diff --git a/src/test/run-make/sanitizer-invalid-cratetype/Makefile b/src/test/run-make-fulldeps/sanitizer-invalid-cratetype/Makefile
index dc37c0d0bc9..dc37c0d0bc9 100644
--- a/src/test/run-make/sanitizer-invalid-cratetype/Makefile
+++ b/src/test/run-make-fulldeps/sanitizer-invalid-cratetype/Makefile
diff --git a/src/test/run-make/sanitizer-invalid-cratetype/hello.rs b/src/test/run-make-fulldeps/sanitizer-invalid-cratetype/hello.rs
index 41782851a1a..41782851a1a 100644
--- a/src/test/run-make/sanitizer-invalid-cratetype/hello.rs
+++ b/src/test/run-make-fulldeps/sanitizer-invalid-cratetype/hello.rs
diff --git a/src/test/run-make/sanitizer-invalid-target/Makefile b/src/test/run-make-fulldeps/sanitizer-invalid-target/Makefile
index df8afee15ce..df8afee15ce 100644
--- a/src/test/run-make/sanitizer-invalid-target/Makefile
+++ b/src/test/run-make-fulldeps/sanitizer-invalid-target/Makefile
diff --git a/src/test/run-make/sanitizer-invalid-target/hello.rs b/src/test/run-make-fulldeps/sanitizer-invalid-target/hello.rs
index e9e46b7702a..e9e46b7702a 100644
--- a/src/test/run-make/sanitizer-invalid-target/hello.rs
+++ b/src/test/run-make-fulldeps/sanitizer-invalid-target/hello.rs
diff --git a/src/test/run-make/sanitizer-leak/Makefile b/src/test/run-make-fulldeps/sanitizer-leak/Makefile
index ab43fac2e99..ab43fac2e99 100644
--- a/src/test/run-make/sanitizer-leak/Makefile
+++ b/src/test/run-make-fulldeps/sanitizer-leak/Makefile
diff --git a/src/test/run-make/sanitizer-leak/leak.rs b/src/test/run-make-fulldeps/sanitizer-leak/leak.rs
index 279da6aaae7..279da6aaae7 100644
--- a/src/test/run-make/sanitizer-leak/leak.rs
+++ b/src/test/run-make-fulldeps/sanitizer-leak/leak.rs
diff --git a/src/test/run-make/sanitizer-memory/Makefile b/src/test/run-make-fulldeps/sanitizer-memory/Makefile
index 3507ca2bef2..3507ca2bef2 100644
--- a/src/test/run-make/sanitizer-memory/Makefile
+++ b/src/test/run-make-fulldeps/sanitizer-memory/Makefile
diff --git a/src/test/run-make/sanitizer-memory/uninit.rs b/src/test/run-make-fulldeps/sanitizer-memory/uninit.rs
index 8350c7de3ac..8350c7de3ac 100644
--- a/src/test/run-make/sanitizer-memory/uninit.rs
+++ b/src/test/run-make-fulldeps/sanitizer-memory/uninit.rs
diff --git a/src/test/run-make/sanitizer-staticlib-link/Makefile b/src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile
index 2b444d667bf..2b444d667bf 100644
--- a/src/test/run-make/sanitizer-staticlib-link/Makefile
+++ b/src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile
diff --git a/src/test/run-make/sanitizer-staticlib-link/library.rs b/src/test/run-make-fulldeps/sanitizer-staticlib-link/library.rs
index 4ceef5d3f52..4ceef5d3f52 100644
--- a/src/test/run-make/sanitizer-staticlib-link/library.rs
+++ b/src/test/run-make-fulldeps/sanitizer-staticlib-link/library.rs
diff --git a/src/test/run-make/sanitizer-staticlib-link/program.c b/src/test/run-make-fulldeps/sanitizer-staticlib-link/program.c
index abd5d508e72..abd5d508e72 100644
--- a/src/test/run-make/sanitizer-staticlib-link/program.c
+++ b/src/test/run-make-fulldeps/sanitizer-staticlib-link/program.c
diff --git a/src/test/run-make/save-analysis-fail/Makefile b/src/test/run-make-fulldeps/save-analysis-fail/Makefile
index f29f907cf38..f29f907cf38 100644
--- a/src/test/run-make/save-analysis-fail/Makefile
+++ b/src/test/run-make-fulldeps/save-analysis-fail/Makefile
diff --git a/src/test/run-make/save-analysis-fail/SameDir.rs b/src/test/run-make-fulldeps/save-analysis-fail/SameDir.rs
index fe70ac1edef..fe70ac1edef 100644
--- a/src/test/run-make/save-analysis-fail/SameDir.rs
+++ b/src/test/run-make-fulldeps/save-analysis-fail/SameDir.rs
diff --git a/src/test/run-make/save-analysis-fail/SameDir3.rs b/src/test/run-make-fulldeps/save-analysis-fail/SameDir3.rs
index 315f900868b..315f900868b 100644
--- a/src/test/run-make/save-analysis-fail/SameDir3.rs
+++ b/src/test/run-make-fulldeps/save-analysis-fail/SameDir3.rs
diff --git a/src/test/run-make/save-analysis-fail/SubDir/mod.rs b/src/test/run-make-fulldeps/save-analysis-fail/SubDir/mod.rs
index fe84db08da9..fe84db08da9 100644
--- a/src/test/run-make/save-analysis-fail/SubDir/mod.rs
+++ b/src/test/run-make-fulldeps/save-analysis-fail/SubDir/mod.rs
diff --git a/src/test/run-make/save-analysis-fail/foo.rs b/src/test/run-make-fulldeps/save-analysis-fail/foo.rs
index b844f2e49e7..b844f2e49e7 100644
--- a/src/test/run-make/save-analysis-fail/foo.rs
+++ b/src/test/run-make-fulldeps/save-analysis-fail/foo.rs
diff --git a/src/test/run-make/save-analysis-fail/krate2.rs b/src/test/run-make-fulldeps/save-analysis-fail/krate2.rs
index 2c6f517ff38..2c6f517ff38 100644
--- a/src/test/run-make/save-analysis-fail/krate2.rs
+++ b/src/test/run-make-fulldeps/save-analysis-fail/krate2.rs
diff --git a/src/test/run-make/save-analysis/Makefile b/src/test/run-make-fulldeps/save-analysis/Makefile
index 7296fb9cc59..7296fb9cc59 100644
--- a/src/test/run-make/save-analysis/Makefile
+++ b/src/test/run-make-fulldeps/save-analysis/Makefile
diff --git a/src/test/run-make/save-analysis/SameDir.rs b/src/test/run-make-fulldeps/save-analysis/SameDir.rs
index fe70ac1edef..fe70ac1edef 100644
--- a/src/test/run-make/save-analysis/SameDir.rs
+++ b/src/test/run-make-fulldeps/save-analysis/SameDir.rs
diff --git a/src/test/run-make/save-analysis/SameDir3.rs b/src/test/run-make-fulldeps/save-analysis/SameDir3.rs
index 315f900868b..315f900868b 100644
--- a/src/test/run-make/save-analysis/SameDir3.rs
+++ b/src/test/run-make-fulldeps/save-analysis/SameDir3.rs
diff --git a/src/test/run-make/save-analysis/SubDir/mod.rs b/src/test/run-make-fulldeps/save-analysis/SubDir/mod.rs
index fe84db08da9..fe84db08da9 100644
--- a/src/test/run-make/save-analysis/SubDir/mod.rs
+++ b/src/test/run-make-fulldeps/save-analysis/SubDir/mod.rs
diff --git a/src/test/run-make/save-analysis/extra-docs.md b/src/test/run-make-fulldeps/save-analysis/extra-docs.md
index 0605ca517ff..0605ca517ff 100644
--- a/src/test/run-make/save-analysis/extra-docs.md
+++ b/src/test/run-make-fulldeps/save-analysis/extra-docs.md
diff --git a/src/test/run-make/save-analysis/foo.rs b/src/test/run-make-fulldeps/save-analysis/foo.rs
index 5b4e4802957..5b4e4802957 100644
--- a/src/test/run-make/save-analysis/foo.rs
+++ b/src/test/run-make-fulldeps/save-analysis/foo.rs
diff --git a/src/test/run-make/save-analysis/krate2.rs b/src/test/run-make-fulldeps/save-analysis/krate2.rs
index 2c6f517ff38..2c6f517ff38 100644
--- a/src/test/run-make/save-analysis/krate2.rs
+++ b/src/test/run-make-fulldeps/save-analysis/krate2.rs
diff --git a/src/test/run-make/sepcomp-cci-copies/Makefile b/src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile
index 36f913ff3fa..36f913ff3fa 100644
--- a/src/test/run-make/sepcomp-cci-copies/Makefile
+++ b/src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile
diff --git a/src/test/run-make/sepcomp-cci-copies/cci_lib.rs b/src/test/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs
index 62bc3294286..62bc3294286 100644
--- a/src/test/run-make/sepcomp-cci-copies/cci_lib.rs
+++ b/src/test/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs
diff --git a/src/test/run-make/sepcomp-cci-copies/foo.rs b/src/test/run-make-fulldeps/sepcomp-cci-copies/foo.rs
index e00cab20f6b..e00cab20f6b 100644
--- a/src/test/run-make/sepcomp-cci-copies/foo.rs
+++ b/src/test/run-make-fulldeps/sepcomp-cci-copies/foo.rs
diff --git a/src/test/run-make/sepcomp-inlining/Makefile b/src/test/run-make-fulldeps/sepcomp-inlining/Makefile
index 1d20d940000..1d20d940000 100644
--- a/src/test/run-make/sepcomp-inlining/Makefile
+++ b/src/test/run-make-fulldeps/sepcomp-inlining/Makefile
diff --git a/src/test/run-make/sepcomp-inlining/foo.rs b/src/test/run-make-fulldeps/sepcomp-inlining/foo.rs
index 5b62c1b0626..5b62c1b0626 100644
--- a/src/test/run-make/sepcomp-inlining/foo.rs
+++ b/src/test/run-make-fulldeps/sepcomp-inlining/foo.rs
diff --git a/src/test/run-make/sepcomp-separate/Makefile b/src/test/run-make-fulldeps/sepcomp-separate/Makefile
index 5b8bdb0fad8..5b8bdb0fad8 100644
--- a/src/test/run-make/sepcomp-separate/Makefile
+++ b/src/test/run-make-fulldeps/sepcomp-separate/Makefile
diff --git a/src/test/run-make/sepcomp-separate/foo.rs b/src/test/run-make-fulldeps/sepcomp-separate/foo.rs
index 64a76e9e0ed..64a76e9e0ed 100644
--- a/src/test/run-make/sepcomp-separate/foo.rs
+++ b/src/test/run-make-fulldeps/sepcomp-separate/foo.rs
diff --git a/src/test/run-make/simd-ffi/Makefile b/src/test/run-make-fulldeps/simd-ffi/Makefile
index e9c974a0137..e9c974a0137 100644
--- a/src/test/run-make/simd-ffi/Makefile
+++ b/src/test/run-make-fulldeps/simd-ffi/Makefile
diff --git a/src/test/run-make/simd-ffi/simd.rs b/src/test/run-make-fulldeps/simd-ffi/simd.rs
index 94b91c711cc..94b91c711cc 100644
--- a/src/test/run-make/simd-ffi/simd.rs
+++ b/src/test/run-make-fulldeps/simd-ffi/simd.rs
diff --git a/src/test/run-make/simple-dylib/Makefile b/src/test/run-make-fulldeps/simple-dylib/Makefile
index 26730820fea..26730820fea 100644
--- a/src/test/run-make/simple-dylib/Makefile
+++ b/src/test/run-make-fulldeps/simple-dylib/Makefile
diff --git a/src/test/run-make/simple-dylib/bar.rs b/src/test/run-make-fulldeps/simple-dylib/bar.rs
index 4c79f7e2855..4c79f7e2855 100644
--- a/src/test/run-make/simple-dylib/bar.rs
+++ b/src/test/run-make-fulldeps/simple-dylib/bar.rs
diff --git a/src/test/run-make/simple-dylib/foo.rs b/src/test/run-make-fulldeps/simple-dylib/foo.rs
index 858ef492ace..858ef492ace 100644
--- a/src/test/run-make/simple-dylib/foo.rs
+++ b/src/test/run-make-fulldeps/simple-dylib/foo.rs
diff --git a/src/test/run-make/simple-rlib/Makefile b/src/test/run-make-fulldeps/simple-rlib/Makefile
index 7b156cb8748..7b156cb8748 100644
--- a/src/test/run-make/simple-rlib/Makefile
+++ b/src/test/run-make-fulldeps/simple-rlib/Makefile
diff --git a/src/test/run-make/simple-rlib/bar.rs b/src/test/run-make-fulldeps/simple-rlib/bar.rs
index 4c79f7e2855..4c79f7e2855 100644
--- a/src/test/run-make/simple-rlib/bar.rs
+++ b/src/test/run-make-fulldeps/simple-rlib/bar.rs
diff --git a/src/test/run-make/simple-rlib/foo.rs b/src/test/run-make-fulldeps/simple-rlib/foo.rs
index 858ef492ace..858ef492ace 100644
--- a/src/test/run-make/simple-rlib/foo.rs
+++ b/src/test/run-make-fulldeps/simple-rlib/foo.rs
diff --git a/src/test/run-make/stable-symbol-names/Makefile b/src/test/run-make-fulldeps/stable-symbol-names/Makefile
index 3cbc5593ac0..3cbc5593ac0 100644
--- a/src/test/run-make/stable-symbol-names/Makefile
+++ b/src/test/run-make-fulldeps/stable-symbol-names/Makefile
diff --git a/src/test/run-make/stable-symbol-names/stable-symbol-names1.rs b/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs
index 7344bdf49f6..7344bdf49f6 100644
--- a/src/test/run-make/stable-symbol-names/stable-symbol-names1.rs
+++ b/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs
diff --git a/src/test/run-make/stable-symbol-names/stable-symbol-names2.rs b/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs
index eacba4ddb25..eacba4ddb25 100644
--- a/src/test/run-make/stable-symbol-names/stable-symbol-names2.rs
+++ b/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs
diff --git a/src/test/run-make/static-dylib-by-default/Makefile b/src/test/run-make-fulldeps/static-dylib-by-default/Makefile
index 6409aa66ae0..6409aa66ae0 100644
--- a/src/test/run-make/static-dylib-by-default/Makefile
+++ b/src/test/run-make-fulldeps/static-dylib-by-default/Makefile
diff --git a/src/test/run-make/static-dylib-by-default/bar.rs b/src/test/run-make-fulldeps/static-dylib-by-default/bar.rs
index 63da277dece..63da277dece 100644
--- a/src/test/run-make/static-dylib-by-default/bar.rs
+++ b/src/test/run-make-fulldeps/static-dylib-by-default/bar.rs
diff --git a/src/test/run-make/static-dylib-by-default/foo.rs b/src/test/run-make-fulldeps/static-dylib-by-default/foo.rs
index 341040e653c..341040e653c 100644
--- a/src/test/run-make/static-dylib-by-default/foo.rs
+++ b/src/test/run-make-fulldeps/static-dylib-by-default/foo.rs
diff --git a/src/test/run-make/static-dylib-by-default/main.c b/src/test/run-make-fulldeps/static-dylib-by-default/main.c
index 30bb0783edf..30bb0783edf 100644
--- a/src/test/run-make/static-dylib-by-default/main.c
+++ b/src/test/run-make-fulldeps/static-dylib-by-default/main.c
diff --git a/src/test/run-make/static-nobundle/Makefile b/src/test/run-make-fulldeps/static-nobundle/Makefile
index abc32d4423b..abc32d4423b 100644
--- a/src/test/run-make/static-nobundle/Makefile
+++ b/src/test/run-make-fulldeps/static-nobundle/Makefile
diff --git a/src/test/run-make/static-nobundle/aaa.c b/src/test/run-make-fulldeps/static-nobundle/aaa.c
index 806ef878c70..806ef878c70 100644
--- a/src/test/run-make/static-nobundle/aaa.c
+++ b/src/test/run-make-fulldeps/static-nobundle/aaa.c
diff --git a/src/test/run-make/static-nobundle/bbb.rs b/src/test/run-make-fulldeps/static-nobundle/bbb.rs
index 2bd69c99327..2bd69c99327 100644
--- a/src/test/run-make/static-nobundle/bbb.rs
+++ b/src/test/run-make-fulldeps/static-nobundle/bbb.rs
diff --git a/src/test/run-make/static-nobundle/ccc.rs b/src/test/run-make-fulldeps/static-nobundle/ccc.rs
index bd34753a00d..bd34753a00d 100644
--- a/src/test/run-make/static-nobundle/ccc.rs
+++ b/src/test/run-make-fulldeps/static-nobundle/ccc.rs
diff --git a/src/test/run-make/static-nobundle/ddd.rs b/src/test/run-make-fulldeps/static-nobundle/ddd.rs
index f7d23a899f7..f7d23a899f7 100644
--- a/src/test/run-make/static-nobundle/ddd.rs
+++ b/src/test/run-make-fulldeps/static-nobundle/ddd.rs
diff --git a/src/test/run-make/static-unwinding/Makefile b/src/test/run-make-fulldeps/static-unwinding/Makefile
index cb039744265..cb039744265 100644
--- a/src/test/run-make/static-unwinding/Makefile
+++ b/src/test/run-make-fulldeps/static-unwinding/Makefile
diff --git a/src/test/run-make/static-unwinding/lib.rs b/src/test/run-make-fulldeps/static-unwinding/lib.rs
index 12c72d54c09..12c72d54c09 100644
--- a/src/test/run-make/static-unwinding/lib.rs
+++ b/src/test/run-make-fulldeps/static-unwinding/lib.rs
diff --git a/src/test/run-make/static-unwinding/main.rs b/src/test/run-make-fulldeps/static-unwinding/main.rs
index 1cd785334f6..1cd785334f6 100644
--- a/src/test/run-make/static-unwinding/main.rs
+++ b/src/test/run-make-fulldeps/static-unwinding/main.rs
diff --git a/src/test/run-make/staticlib-blank-lib/Makefile b/src/test/run-make-fulldeps/staticlib-blank-lib/Makefile
index 92a278825c2..92a278825c2 100644
--- a/src/test/run-make/staticlib-blank-lib/Makefile
+++ b/src/test/run-make-fulldeps/staticlib-blank-lib/Makefile
diff --git a/src/test/run-make/staticlib-blank-lib/foo.rs b/src/test/run-make-fulldeps/staticlib-blank-lib/foo.rs
index 6010e60e95c..6010e60e95c 100644
--- a/src/test/run-make/staticlib-blank-lib/foo.rs
+++ b/src/test/run-make-fulldeps/staticlib-blank-lib/foo.rs
diff --git a/src/test/run-make/stdin-non-utf8/Makefile b/src/test/run-make-fulldeps/stdin-non-utf8/Makefile
index 7948c442616..7948c442616 100644
--- a/src/test/run-make/stdin-non-utf8/Makefile
+++ b/src/test/run-make-fulldeps/stdin-non-utf8/Makefile
diff --git a/src/test/run-make/stdin-non-utf8/non-utf8 b/src/test/run-make-fulldeps/stdin-non-utf8/non-utf8
index bc87051a852..bc87051a852 100644
--- a/src/test/run-make/stdin-non-utf8/non-utf8
+++ b/src/test/run-make-fulldeps/stdin-non-utf8/non-utf8
diff --git a/src/test/run-make/suspicious-library/Makefile b/src/test/run-make-fulldeps/suspicious-library/Makefile
index 12f437075fb..12f437075fb 100644
--- a/src/test/run-make/suspicious-library/Makefile
+++ b/src/test/run-make-fulldeps/suspicious-library/Makefile
diff --git a/src/test/run-make/suspicious-library/bar.rs b/src/test/run-make-fulldeps/suspicious-library/bar.rs
index ed0e8a7e23e..ed0e8a7e23e 100644
--- a/src/test/run-make/suspicious-library/bar.rs
+++ b/src/test/run-make-fulldeps/suspicious-library/bar.rs
diff --git a/src/test/run-make/suspicious-library/foo.rs b/src/test/run-make-fulldeps/suspicious-library/foo.rs
index 2ec6e3834a1..2ec6e3834a1 100644
--- a/src/test/run-make/suspicious-library/foo.rs
+++ b/src/test/run-make-fulldeps/suspicious-library/foo.rs
diff --git a/src/test/run-make/symbol-visibility/Makefile b/src/test/run-make-fulldeps/symbol-visibility/Makefile
index f1ada814bdb..f1ada814bdb 100644
--- a/src/test/run-make/symbol-visibility/Makefile
+++ b/src/test/run-make-fulldeps/symbol-visibility/Makefile
diff --git a/src/test/run-make/symbol-visibility/a_cdylib.rs b/src/test/run-make-fulldeps/symbol-visibility/a_cdylib.rs
index 9a70542c06c..9a70542c06c 100644
--- a/src/test/run-make/symbol-visibility/a_cdylib.rs
+++ b/src/test/run-make-fulldeps/symbol-visibility/a_cdylib.rs
diff --git a/src/test/run-make/symbol-visibility/a_rust_dylib.rs b/src/test/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs
index b826211c9a4..b826211c9a4 100644
--- a/src/test/run-make/symbol-visibility/a_rust_dylib.rs
+++ b/src/test/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs
diff --git a/src/test/run-make/symbol-visibility/an_executable.rs b/src/test/run-make-fulldeps/symbol-visibility/an_executable.rs
index 73059c5e374..73059c5e374 100644
--- a/src/test/run-make/symbol-visibility/an_executable.rs
+++ b/src/test/run-make-fulldeps/symbol-visibility/an_executable.rs
diff --git a/src/test/run-make/symbol-visibility/an_rlib.rs b/src/test/run-make-fulldeps/symbol-visibility/an_rlib.rs
index cd19500d140..cd19500d140 100644
--- a/src/test/run-make/symbol-visibility/an_rlib.rs
+++ b/src/test/run-make-fulldeps/symbol-visibility/an_rlib.rs
diff --git a/src/test/run-make/symbols-are-reasonable/Makefile b/src/test/run-make-fulldeps/symbols-are-reasonable/Makefile
index a6d294d2a1c..a6d294d2a1c 100644
--- a/src/test/run-make/symbols-are-reasonable/Makefile
+++ b/src/test/run-make-fulldeps/symbols-are-reasonable/Makefile
diff --git a/src/test/run-make/symbols-are-reasonable/lib.rs b/src/test/run-make-fulldeps/symbols-are-reasonable/lib.rs
index b9285b24cd6..b9285b24cd6 100644
--- a/src/test/run-make/symbols-are-reasonable/lib.rs
+++ b/src/test/run-make-fulldeps/symbols-are-reasonable/lib.rs
diff --git a/src/test/run-make/symbols-include-type-name/Makefile b/src/test/run-make-fulldeps/symbols-include-type-name/Makefile
index 0850a2633e5..0850a2633e5 100644
--- a/src/test/run-make/symbols-include-type-name/Makefile
+++ b/src/test/run-make-fulldeps/symbols-include-type-name/Makefile
diff --git a/src/test/run-make/symbols-include-type-name/lib.rs b/src/test/run-make-fulldeps/symbols-include-type-name/lib.rs
index d84f1617db5..d84f1617db5 100644
--- a/src/test/run-make/symbols-include-type-name/lib.rs
+++ b/src/test/run-make-fulldeps/symbols-include-type-name/lib.rs
diff --git a/src/test/run-make/symlinked-extern/Makefile b/src/test/run-make-fulldeps/symlinked-extern/Makefile
index 88dbad51e48..88dbad51e48 100644
--- a/src/test/run-make/symlinked-extern/Makefile
+++ b/src/test/run-make-fulldeps/symlinked-extern/Makefile
diff --git a/src/test/run-make/symlinked-extern/bar.rs b/src/test/run-make-fulldeps/symlinked-extern/bar.rs
index 79103f24017..79103f24017 100644
--- a/src/test/run-make/symlinked-extern/bar.rs
+++ b/src/test/run-make-fulldeps/symlinked-extern/bar.rs
diff --git a/src/test/run-make/symlinked-extern/baz.rs b/src/test/run-make-fulldeps/symlinked-extern/baz.rs
index 0f6ba254368..0f6ba254368 100644
--- a/src/test/run-make/symlinked-extern/baz.rs
+++ b/src/test/run-make-fulldeps/symlinked-extern/baz.rs
diff --git a/src/test/run-make/symlinked-extern/foo.rs b/src/test/run-make-fulldeps/symlinked-extern/foo.rs
index 0b8bb64d375..0b8bb64d375 100644
--- a/src/test/run-make/symlinked-extern/foo.rs
+++ b/src/test/run-make-fulldeps/symlinked-extern/foo.rs
diff --git a/src/test/run-make/symlinked-libraries/Makefile b/src/test/run-make-fulldeps/symlinked-libraries/Makefile
index ac595546aa7..ac595546aa7 100644
--- a/src/test/run-make/symlinked-libraries/Makefile
+++ b/src/test/run-make-fulldeps/symlinked-libraries/Makefile
diff --git a/src/test/run-make/symlinked-libraries/bar.rs b/src/test/run-make-fulldeps/symlinked-libraries/bar.rs
index 73596f93f56..73596f93f56 100644
--- a/src/test/run-make/symlinked-libraries/bar.rs
+++ b/src/test/run-make-fulldeps/symlinked-libraries/bar.rs
diff --git a/src/test/run-make/symlinked-libraries/foo.rs b/src/test/run-make-fulldeps/symlinked-libraries/foo.rs
index fdb29974cd8..fdb29974cd8 100644
--- a/src/test/run-make/symlinked-libraries/foo.rs
+++ b/src/test/run-make-fulldeps/symlinked-libraries/foo.rs
diff --git a/src/test/run-make/symlinked-rlib/Makefile b/src/test/run-make-fulldeps/symlinked-rlib/Makefile
index 2709f786e0a..2709f786e0a 100644
--- a/src/test/run-make/symlinked-rlib/Makefile
+++ b/src/test/run-make-fulldeps/symlinked-rlib/Makefile
diff --git a/src/test/run-make/symlinked-rlib/bar.rs b/src/test/run-make-fulldeps/symlinked-rlib/bar.rs
index e8f06680862..e8f06680862 100644
--- a/src/test/run-make/symlinked-rlib/bar.rs
+++ b/src/test/run-make-fulldeps/symlinked-rlib/bar.rs
diff --git a/src/test/run-make/symlinked-rlib/foo.rs b/src/test/run-make-fulldeps/symlinked-rlib/foo.rs
index 5abbb1dcbce..5abbb1dcbce 100644
--- a/src/test/run-make/symlinked-rlib/foo.rs
+++ b/src/test/run-make-fulldeps/symlinked-rlib/foo.rs
diff --git a/src/test/run-make/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
index a35174b3c2a..a35174b3c2a 100644
--- a/src/test/run-make/sysroot-crates-are-unstable/Makefile
+++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
diff --git a/src/test/run-make/sysroot-crates-are-unstable/test.py b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/test.py
index 210059e1010..210059e1010 100644
--- a/src/test/run-make/sysroot-crates-are-unstable/test.py
+++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/test.py
diff --git a/src/test/run-make/target-cpu-native/Makefile b/src/test/run-make-fulldeps/target-cpu-native/Makefile
index 0c9d93ecb2a..0c9d93ecb2a 100644
--- a/src/test/run-make/target-cpu-native/Makefile
+++ b/src/test/run-make-fulldeps/target-cpu-native/Makefile
diff --git a/src/test/run-make/target-cpu-native/foo.rs b/src/test/run-make-fulldeps/target-cpu-native/foo.rs
index f7a9f969060..f7a9f969060 100644
--- a/src/test/run-make/target-cpu-native/foo.rs
+++ b/src/test/run-make-fulldeps/target-cpu-native/foo.rs
diff --git a/src/test/run-make/target-specs/Makefile b/src/test/run-make-fulldeps/target-specs/Makefile
index aff15ce38b4..aff15ce38b4 100644
--- a/src/test/run-make/target-specs/Makefile
+++ b/src/test/run-make-fulldeps/target-specs/Makefile
diff --git a/src/test/run-make/target-specs/foo.rs b/src/test/run-make-fulldeps/target-specs/foo.rs
index bbd1c5d900f..bbd1c5d900f 100644
--- a/src/test/run-make/target-specs/foo.rs
+++ b/src/test/run-make-fulldeps/target-specs/foo.rs
diff --git a/src/test/run-make/target-specs/my-awesome-platform.json b/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json
index 8d028280a8d..8d028280a8d 100644
--- a/src/test/run-make/target-specs/my-awesome-platform.json
+++ b/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json
diff --git a/src/test/run-make/target-specs/my-incomplete-platform.json b/src/test/run-make-fulldeps/target-specs/my-incomplete-platform.json
index ceaa25cdf2f..ceaa25cdf2f 100644
--- a/src/test/run-make/target-specs/my-incomplete-platform.json
+++ b/src/test/run-make-fulldeps/target-specs/my-incomplete-platform.json
diff --git a/src/test/run-make/target-specs/my-invalid-platform.json b/src/test/run-make-fulldeps/target-specs/my-invalid-platform.json
index 3feac45b7d6..3feac45b7d6 100644
--- a/src/test/run-make/target-specs/my-invalid-platform.json
+++ b/src/test/run-make-fulldeps/target-specs/my-invalid-platform.json
diff --git a/src/test/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json b/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
index 3ae01d72fcc..3ae01d72fcc 100644
--- a/src/test/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json
+++ b/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
diff --git a/src/test/run-make/target-without-atomics/Makefile b/src/test/run-make-fulldeps/target-without-atomics/Makefile
index c5f575ddf84..c5f575ddf84 100644
--- a/src/test/run-make/target-without-atomics/Makefile
+++ b/src/test/run-make-fulldeps/target-without-atomics/Makefile
diff --git a/src/test/run-make/test-harness/Makefile b/src/test/run-make-fulldeps/test-harness/Makefile
index 39477c07ced..39477c07ced 100644
--- a/src/test/run-make/test-harness/Makefile
+++ b/src/test/run-make-fulldeps/test-harness/Makefile
diff --git a/src/test/run-make/test-harness/test-ignore-cfg.rs b/src/test/run-make-fulldeps/test-harness/test-ignore-cfg.rs
index 990d3d10485..990d3d10485 100644
--- a/src/test/run-make/test-harness/test-ignore-cfg.rs
+++ b/src/test/run-make-fulldeps/test-harness/test-ignore-cfg.rs
diff --git a/src/test/run-make/tools.mk b/src/test/run-make-fulldeps/tools.mk
index af1707de6c0..af1707de6c0 100644
--- a/src/test/run-make/tools.mk
+++ b/src/test/run-make-fulldeps/tools.mk
diff --git a/src/test/run-make/treat-err-as-bug/Makefile b/src/test/run-make-fulldeps/treat-err-as-bug/Makefile
index f99e4611174..f99e4611174 100644
--- a/src/test/run-make/treat-err-as-bug/Makefile
+++ b/src/test/run-make-fulldeps/treat-err-as-bug/Makefile
diff --git a/src/test/run-make/treat-err-as-bug/err.rs b/src/test/run-make-fulldeps/treat-err-as-bug/err.rs
index 078495663ac..078495663ac 100644
--- a/src/test/run-make/treat-err-as-bug/err.rs
+++ b/src/test/run-make-fulldeps/treat-err-as-bug/err.rs
diff --git a/src/test/run-make/type-mismatch-same-crate-name/Makefile b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/Makefile
index 9fd1377322b..9fd1377322b 100644
--- a/src/test/run-make/type-mismatch-same-crate-name/Makefile
+++ b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/Makefile
diff --git a/src/test/run-make/type-mismatch-same-crate-name/crateA.rs b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs
index e40266bb4cd..e40266bb4cd 100644
--- a/src/test/run-make/type-mismatch-same-crate-name/crateA.rs
+++ b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs
diff --git a/src/test/run-make/type-mismatch-same-crate-name/crateB.rs b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs
index da4ea1c9387..da4ea1c9387 100644
--- a/src/test/run-make/type-mismatch-same-crate-name/crateB.rs
+++ b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs
diff --git a/src/test/run-make/type-mismatch-same-crate-name/crateC.rs b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs
index 210bc4c8320..210bc4c8320 100644
--- a/src/test/run-make/type-mismatch-same-crate-name/crateC.rs
+++ b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs
diff --git a/src/test/run-make/use-extern-for-plugins/Makefile b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile
index cc7bc176f49..cc7bc176f49 100644
--- a/src/test/run-make/use-extern-for-plugins/Makefile
+++ b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile
diff --git a/src/test/run-make/use-extern-for-plugins/bar.rs b/src/test/run-make-fulldeps/use-extern-for-plugins/bar.rs
index 3e99ed60c62..3e99ed60c62 100644
--- a/src/test/run-make/use-extern-for-plugins/bar.rs
+++ b/src/test/run-make-fulldeps/use-extern-for-plugins/bar.rs
diff --git a/src/test/run-make/use-extern-for-plugins/baz.rs b/src/test/run-make-fulldeps/use-extern-for-plugins/baz.rs
index 3f15d0e6e05..3f15d0e6e05 100644
--- a/src/test/run-make/use-extern-for-plugins/baz.rs
+++ b/src/test/run-make-fulldeps/use-extern-for-plugins/baz.rs
diff --git a/src/test/run-make/use-extern-for-plugins/foo.rs b/src/test/run-make-fulldeps/use-extern-for-plugins/foo.rs
index 0afd3be466d..0afd3be466d 100644
--- a/src/test/run-make/use-extern-for-plugins/foo.rs
+++ b/src/test/run-make-fulldeps/use-extern-for-plugins/foo.rs
diff --git a/src/test/run-make/used/Makefile b/src/test/run-make-fulldeps/used/Makefile
index 47edcbb5d0a..47edcbb5d0a 100644
--- a/src/test/run-make/used/Makefile
+++ b/src/test/run-make-fulldeps/used/Makefile
diff --git a/src/test/run-make/used/used.rs b/src/test/run-make-fulldeps/used/used.rs
index 186cd0fdf5e..186cd0fdf5e 100644
--- a/src/test/run-make/used/used.rs
+++ b/src/test/run-make-fulldeps/used/used.rs
diff --git a/src/test/run-make/version/Makefile b/src/test/run-make-fulldeps/version/Makefile
index 23e14a9cb93..23e14a9cb93 100644
--- a/src/test/run-make/version/Makefile
+++ b/src/test/run-make-fulldeps/version/Makefile
diff --git a/src/test/run-make/volatile-intrinsics/Makefile b/src/test/run-make-fulldeps/volatile-intrinsics/Makefile
index acbadbef9fb..acbadbef9fb 100644
--- a/src/test/run-make/volatile-intrinsics/Makefile
+++ b/src/test/run-make-fulldeps/volatile-intrinsics/Makefile
diff --git a/src/test/run-make/volatile-intrinsics/main.rs b/src/test/run-make-fulldeps/volatile-intrinsics/main.rs
index 4d0d7672101..4d0d7672101 100644
--- a/src/test/run-make/volatile-intrinsics/main.rs
+++ b/src/test/run-make-fulldeps/volatile-intrinsics/main.rs
diff --git a/src/test/run-make/weird-output-filenames/Makefile b/src/test/run-make-fulldeps/weird-output-filenames/Makefile
index f161fe9f8e8..f161fe9f8e8 100644
--- a/src/test/run-make/weird-output-filenames/Makefile
+++ b/src/test/run-make-fulldeps/weird-output-filenames/Makefile
diff --git a/src/test/run-make/weird-output-filenames/foo.rs b/src/test/run-make-fulldeps/weird-output-filenames/foo.rs
index 8ae3d072362..8ae3d072362 100644
--- a/src/test/run-make/weird-output-filenames/foo.rs
+++ b/src/test/run-make-fulldeps/weird-output-filenames/foo.rs
diff --git a/src/test/run-make/windows-spawn/Makefile b/src/test/run-make-fulldeps/windows-spawn/Makefile
index f0d4242260f..f0d4242260f 100644
--- a/src/test/run-make/windows-spawn/Makefile
+++ b/src/test/run-make-fulldeps/windows-spawn/Makefile
diff --git a/src/test/run-make/windows-spawn/hello.rs b/src/test/run-make-fulldeps/windows-spawn/hello.rs
index b177f41941d..b177f41941d 100644
--- a/src/test/run-make/windows-spawn/hello.rs
+++ b/src/test/run-make-fulldeps/windows-spawn/hello.rs
diff --git a/src/test/run-make/windows-spawn/spawn.rs b/src/test/run-make-fulldeps/windows-spawn/spawn.rs
index 2913cbe2260..2913cbe2260 100644
--- a/src/test/run-make/windows-spawn/spawn.rs
+++ b/src/test/run-make-fulldeps/windows-spawn/spawn.rs
diff --git a/src/test/run-make/windows-subsystem/Makefile b/src/test/run-make-fulldeps/windows-subsystem/Makefile
index 34fb5db32f9..34fb5db32f9 100644
--- a/src/test/run-make/windows-subsystem/Makefile
+++ b/src/test/run-make-fulldeps/windows-subsystem/Makefile
diff --git a/src/test/run-make/windows-subsystem/console.rs b/src/test/run-make-fulldeps/windows-subsystem/console.rs
index ffad1e35ee6..ffad1e35ee6 100644
--- a/src/test/run-make/windows-subsystem/console.rs
+++ b/src/test/run-make-fulldeps/windows-subsystem/console.rs
diff --git a/src/test/run-make/windows-subsystem/windows.rs b/src/test/run-make-fulldeps/windows-subsystem/windows.rs
index 33cbe320591..33cbe320591 100644
--- a/src/test/run-make/windows-subsystem/windows.rs
+++ b/src/test/run-make-fulldeps/windows-subsystem/windows.rs
diff --git a/src/test/run-make/wasm-custom-section/Makefile b/src/test/run-make/wasm-custom-section/Makefile
new file mode 100644
index 00000000000..399951e5163
--- /dev/null
+++ b/src/test/run-make/wasm-custom-section/Makefile
@@ -0,0 +1,10 @@
+-include ../../run-make-fulldeps/tools.mk
+
+ifeq ($(TARGET),wasm32-unknown-unknown)
+all:
+	$(RUSTC) foo.rs --target wasm32-unknown-unknown
+	$(RUSTC) bar.rs -C lto -O --target wasm32-unknown-unknown
+	$(NODE) foo.js $(TMPDIR)/bar.wasm
+else
+all:
+endif
diff --git a/src/test/run-make/wasm-custom-section/bar.rs b/src/test/run-make/wasm-custom-section/bar.rs
new file mode 100644
index 00000000000..e3db36d6dbd
--- /dev/null
+++ b/src/test/run-make/wasm-custom-section/bar.rs
@@ -0,0 +1,24 @@
+// Copyright 2018 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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![crate_type = "cdylib"]
+#![feature(wasm_custom_section)]
+#![deny(warnings)]
+
+extern crate foo;
+
+#[wasm_custom_section = "foo"]
+const A: [u8; 2] = [5, 6];
+
+#[wasm_custom_section = "baz"]
+const B: [u8; 2] = [7, 8];
+
+#[no_mangle]
+pub extern fn foo() {}
diff --git a/src/test/run-make/wasm-custom-section/foo.js b/src/test/run-make/wasm-custom-section/foo.js
new file mode 100644
index 00000000000..df69354f3a4
--- /dev/null
+++ b/src/test/run-make/wasm-custom-section/foo.js
@@ -0,0 +1,46 @@
+// Copyright 2018 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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+const fs = require('fs');
+const process = require('process');
+const assert = require('assert');
+const buffer = fs.readFileSync(process.argv[2]);
+
+let m = new WebAssembly.Module(buffer);
+let sections = WebAssembly.Module.customSections(m, "baz");
+console.log('section baz', sections);
+assert.strictEqual(sections.length, 1);
+let section = new Uint8Array(sections[0]);
+console.log('contents', section);
+assert.strictEqual(section.length, 2);
+assert.strictEqual(section[0], 7);
+assert.strictEqual(section[1], 8);
+
+sections = WebAssembly.Module.customSections(m, "bar");
+console.log('section bar', sections);
+assert.strictEqual(sections.length, 1, "didn't pick up `bar` section from dependency");
+section = new Uint8Array(sections[0]);
+console.log('contents', section);
+assert.strictEqual(section.length, 2);
+assert.strictEqual(section[0], 3);
+assert.strictEqual(section[1], 4);
+
+sections = WebAssembly.Module.customSections(m, "foo");
+console.log('section foo', sections);
+assert.strictEqual(sections.length, 1, "didn't create `foo` section");
+section = new Uint8Array(sections[0]);
+console.log('contents', section);
+assert.strictEqual(section.length, 4, "didn't concatenate `foo` sections");
+assert.strictEqual(section[0], 5);
+assert.strictEqual(section[1], 6);
+assert.strictEqual(section[2], 1);
+assert.strictEqual(section[3], 2);
+
+process.exit(1);
diff --git a/src/test/run-make/wasm-custom-section/foo.rs b/src/test/run-make/wasm-custom-section/foo.rs
new file mode 100644
index 00000000000..44d1efd7c2d
--- /dev/null
+++ b/src/test/run-make/wasm-custom-section/foo.rs
@@ -0,0 +1,19 @@
+// Copyright 2018 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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![crate_type = "rlib"]
+#![feature(wasm_custom_section)]
+#![deny(warnings)]
+
+#[wasm_custom_section = "foo"]
+const A: [u8; 2] = [1, 2];
+
+#[wasm_custom_section = "bar"]
+const B: [u8; 2] = [3, 4];
diff --git a/src/test/ui/feature-gate-wasm_custom_section.rs b/src/test/ui/feature-gate-wasm_custom_section.rs
new file mode 100644
index 00000000000..c695ef4ff06
--- /dev/null
+++ b/src/test/ui/feature-gate-wasm_custom_section.rs
@@ -0,0 +1,14 @@
+// Copyright 2018 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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[wasm_custom_section = "foo"] //~ ERROR: attribute is currently unstable
+const A: [u8; 2] = [1, 2];
+
+fn main() {}
diff --git a/src/test/ui/feature-gate-wasm_custom_section.stderr b/src/test/ui/feature-gate-wasm_custom_section.stderr
new file mode 100644
index 00000000000..5977ec9edad
--- /dev/null
+++ b/src/test/ui/feature-gate-wasm_custom_section.stderr
@@ -0,0 +1,11 @@
+error[E0658]: attribute is currently unstable
+  --> $DIR/feature-gate-wasm_custom_section.rs:11:1
+   |
+LL | #[wasm_custom_section = "foo"] //~ ERROR: attribute is currently unstable
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = help: add #![feature(wasm_custom_section)] to the crate attributes to enable
+
+error: aborting due to previous error
+
+If you want more information on this error, try using "rustc --explain E0658"
diff --git a/src/test/ui/wasm-custom-section/malformed.rs b/src/test/ui/wasm-custom-section/malformed.rs
new file mode 100644
index 00000000000..13b1685a480
--- /dev/null
+++ b/src/test/ui/wasm-custom-section/malformed.rs
@@ -0,0 +1,19 @@
+// Copyright 2018 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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(wasm_custom_section)]
+
+#[wasm_custom_section] //~ ERROR: must be of the form
+const A: [u8; 1] = [0];
+
+#[wasm_custom_section(foo)] //~ ERROR: must be of the form
+const B: [u8; 1] = [0];
+
+fn main() {}
diff --git a/src/test/ui/wasm-custom-section/malformed.stderr b/src/test/ui/wasm-custom-section/malformed.stderr
new file mode 100644
index 00000000000..c716c824aeb
--- /dev/null
+++ b/src/test/ui/wasm-custom-section/malformed.stderr
@@ -0,0 +1,14 @@
+error: must be of the form #[wasm_custom_section = "foo"]
+  --> $DIR/malformed.rs:13:1
+   |
+LL | #[wasm_custom_section] //~ ERROR: must be of the form
+   | ^^^^^^^^^^^^^^^^^^^^^^
+
+error: must be of the form #[wasm_custom_section = "foo"]
+  --> $DIR/malformed.rs:16:1
+   |
+LL | #[wasm_custom_section(foo)] //~ ERROR: must be of the form
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/wasm-custom-section/not-const.rs b/src/test/ui/wasm-custom-section/not-const.rs
new file mode 100644
index 00000000000..68077fb2fe4
--- /dev/null
+++ b/src/test/ui/wasm-custom-section/not-const.rs
@@ -0,0 +1,29 @@
+// Copyright 2018 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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(wasm_custom_section)]
+
+#[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+static A: [u8; 2] = [1, 2];
+
+#[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+struct B {}
+
+#[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+enum C {}
+
+#[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+impl B {}
+
+#[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+mod d {}
+
+#[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+fn main() {}
diff --git a/src/test/ui/wasm-custom-section/not-const.stderr b/src/test/ui/wasm-custom-section/not-const.stderr
new file mode 100644
index 00000000000..17c85b3e848
--- /dev/null
+++ b/src/test/ui/wasm-custom-section/not-const.stderr
@@ -0,0 +1,38 @@
+error: only allowed on consts
+  --> $DIR/not-const.rs:13:1
+   |
+LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: only allowed on consts
+  --> $DIR/not-const.rs:16:1
+   |
+LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: only allowed on consts
+  --> $DIR/not-const.rs:19:1
+   |
+LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: only allowed on consts
+  --> $DIR/not-const.rs:22:1
+   |
+LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: only allowed on consts
+  --> $DIR/not-const.rs:25:1
+   |
+LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: only allowed on consts
+  --> $DIR/not-const.rs:28:1
+   |
+LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 6 previous errors
+
diff --git a/src/test/ui/wasm-custom-section/not-slice.rs b/src/test/ui/wasm-custom-section/not-slice.rs
new file mode 100644
index 00000000000..2d91641a5f7
--- /dev/null
+++ b/src/test/ui/wasm-custom-section/not-slice.rs
@@ -0,0 +1,22 @@
+// Copyright 2018 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 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(wasm_custom_section)]
+
+#[wasm_custom_section = "foo"]
+const A: u8 = 0; //~ ERROR: must be an array of bytes
+
+#[wasm_custom_section = "foo"]
+const B: &[u8] = &[0]; //~ ERROR: must be an array of bytes
+
+#[wasm_custom_section = "foo"]
+const C: &[u8; 1] = &[0]; //~ ERROR: must be an array of bytes
+
+fn main() {}
diff --git a/src/test/ui/wasm-custom-section/not-slice.stderr b/src/test/ui/wasm-custom-section/not-slice.stderr
new file mode 100644
index 00000000000..f2563ce0ddd
--- /dev/null
+++ b/src/test/ui/wasm-custom-section/not-slice.stderr
@@ -0,0 +1,20 @@
+error: must be an array of bytes like `[u8; N]`
+  --> $DIR/not-slice.rs:14:1
+   |
+LL | const A: u8 = 0; //~ ERROR: must be an array of bytes
+   | ^^^^^^^^^^^^^^^^
+
+error: must be an array of bytes like `[u8; N]`
+  --> $DIR/not-slice.rs:17:1
+   |
+LL | const B: &[u8] = &[0]; //~ ERROR: must be an array of bytes
+   | ^^^^^^^^^^^^^^^^^^^^^^
+
+error: must be an array of bytes like `[u8; N]`
+  --> $DIR/not-slice.rs:20:1
+   |
+LL | const C: &[u8; 1] = &[0]; //~ ERROR: must be an array of bytes
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 3 previous errors
+
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 43220af4893..93b1b1f08e6 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2396,13 +2396,6 @@ impl<'test> TestCx<'test> {
             .env("S", src_root)
             .env("RUST_BUILD_STAGE", &self.config.stage_id)
             .env("RUSTC", cwd.join(&self.config.rustc_path))
-            .env(
-                "RUSTDOC",
-                cwd.join(&self.config
-                    .rustdoc_path
-                    .as_ref()
-                    .expect("--rustdoc-path passed")),
-            )
             .env("TMPDIR", &tmpdir)
             .env("LD_LIB_PATH_ENVVAR", dylib_env_var())
             .env("HOST_RPATH_DIR", cwd.join(&self.config.compile_lib_path))
@@ -2417,6 +2410,14 @@ impl<'test> TestCx<'test> {
             .env_remove("MFLAGS")
             .env_remove("CARGO_MAKEFLAGS");
 
+        if let Some(ref rustdoc) = self.config.rustdoc_path {
+            cmd.env("RUSTDOC", cwd.join(rustdoc));
+        }
+
+        if let Some(ref node) = self.config.nodejs {
+            cmd.env("NODE", node);
+        }
+
         if let Some(ref linker) = self.config.linker {
             cmd.env("RUSTC_LINKER", linker);
         }