From 7ca1b2f504a77fd6d82c981242c577dae05f0b9e Mon Sep 17 00:00:00 2001
From: 12101111 <w12101111@gmail.com>
Date: Tue, 3 Mar 2020 16:17:15 +0800
Subject: [PATCH 1/9] Don't use static crt by default when build proc-macro.

---
 src/librustc_codegen_ssa/back/link.rs      | 10 +++---
 src/librustc_codegen_utils/link.rs         |  2 +-
 src/librustc_interface/util.rs             |  2 +-
 src/librustc_metadata/dependency_format.rs |  4 +--
 src/librustc_session/session.rs            | 41 +++++++++++++++++-----
 src/test/ui/proc-macro/musl-proc-macro.rs  | 15 ++++++++
 6 files changed, 57 insertions(+), 17 deletions(-)
 create mode 100644 src/test/ui/proc-macro/musl-proc-macro.rs

diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs
index 90601521b19..387312addfa 100644
--- a/src/librustc_codegen_ssa/back/link.rs
+++ b/src/librustc_codegen_ssa/back/link.rs
@@ -497,7 +497,7 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>(
         cmd.args(args);
     }
     if let Some(args) = sess.target.target.options.pre_link_args_crt.get(&flavor) {
-        if sess.crt_static() {
+        if sess.crt_static(Some(crate_type)) {
             cmd.args(args);
         }
     }
@@ -523,7 +523,7 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>(
         cmd.arg(get_file_path(sess, obj));
     }
 
-    if crate_type == config::CrateType::Executable && sess.crt_static() {
+    if crate_type == config::CrateType::Executable && sess.crt_static(Some(crate_type)) {
         for obj in &sess.target.target.options.pre_link_objects_exe_crt {
             cmd.arg(get_file_path(sess, obj));
         }
@@ -558,7 +558,7 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>(
     for obj in &sess.target.target.options.post_link_objects {
         cmd.arg(get_file_path(sess, obj));
     }
-    if sess.crt_static() {
+    if sess.crt_static(Some(crate_type)) {
         for obj in &sess.target.target.options.post_link_objects_crt {
             cmd.arg(get_file_path(sess, obj));
         }
@@ -1288,7 +1288,7 @@ fn link_args<'a, B: ArchiveBuilder<'a>>(
             let more_args = &sess.opts.cg.link_arg;
             let mut args = args.iter().chain(more_args.iter()).chain(used_link_args.iter());
 
-            if is_pic(sess) && !sess.crt_static() && !args.any(|x| *x == "-static") {
+            if is_pic(sess) && !sess.crt_static(Some(crate_type)) && !args.any(|x| *x == "-static") {
                 position_independent_executable = true;
             }
         }
@@ -1373,7 +1373,7 @@ fn link_args<'a, B: ArchiveBuilder<'a>>(
     if crate_type != config::CrateType::Executable {
         cmd.build_dylib(out_filename);
     }
-    if crate_type == config::CrateType::Executable && sess.crt_static() {
+    if crate_type == config::CrateType::Executable && sess.crt_static(Some(crate_type)) {
         cmd.build_static_executable();
     }
 
diff --git a/src/librustc_codegen_utils/link.rs b/src/librustc_codegen_utils/link.rs
index 524fb0a59c2..f80c19a79e2 100644
--- a/src/librustc_codegen_utils/link.rs
+++ b/src/librustc_codegen_utils/link.rs
@@ -167,7 +167,7 @@ pub fn invalid_output_for_target(sess: &Session, crate_type: config::CrateType)
             if !sess.target.target.options.dynamic_linking {
                 return true;
             }
-            if sess.crt_static() && !sess.target.target.options.crt_static_allows_dylibs {
+            if sess.crt_static(Some(crate_type)) && !sess.target.target.options.crt_static_allows_dylibs {
                 return true;
             }
         }
diff --git a/src/librustc_interface/util.rs b/src/librustc_interface/util.rs
index 10a8c0a63f1..ce0665a00ec 100644
--- a/src/librustc_interface/util.rs
+++ b/src/librustc_interface/util.rs
@@ -49,7 +49,7 @@ pub fn add_configuration(
 
     cfg.extend(codegen_backend.target_features(sess).into_iter().map(|feat| (tf, Some(feat))));
 
-    if sess.crt_static_feature() {
+    if sess.crt_static_feature(None) {
         cfg.insert((tf, Some(Symbol::intern("crt-static"))));
     }
 }
diff --git a/src/librustc_metadata/dependency_format.rs b/src/librustc_metadata/dependency_format.rs
index 9e71839dbfd..13cda397f24 100644
--- a/src/librustc_metadata/dependency_format.rs
+++ b/src/librustc_metadata/dependency_format.rs
@@ -97,7 +97,7 @@ fn calculate_type(tcx: TyCtxt<'_>, ty: config::CrateType) -> DependencyList {
 
         // If the global prefer_dynamic switch is turned off, or the final
         // executable will be statically linked, prefer static crate linkage.
-        config::CrateType::Executable if !sess.opts.cg.prefer_dynamic || sess.crt_static() => {
+        config::CrateType::Executable if !sess.opts.cg.prefer_dynamic || sess.crt_static(Some(ty)) => {
             Linkage::Static
         }
         config::CrateType::Executable => Linkage::Dynamic,
@@ -129,7 +129,7 @@ fn calculate_type(tcx: TyCtxt<'_>, ty: config::CrateType) -> DependencyList {
         // If any are not found, generate some nice pretty errors.
         if ty == config::CrateType::Staticlib
             || (ty == config::CrateType::Executable
-                && sess.crt_static()
+                && sess.crt_static(Some(ty))
                 && !sess.target.target.options.crt_static_allows_dylibs)
         {
             for &cnum in tcx.crates().iter() {
diff --git a/src/librustc_session/session.rs b/src/librustc_session/session.rs
index 2fb7977dce9..dcd9ae44e88 100644
--- a/src/librustc_session/session.rs
+++ b/src/librustc_session/session.rs
@@ -540,25 +540,50 @@ impl Session {
             .unwrap_or(self.opts.debug_assertions)
     }
 
-    pub fn crt_static(&self) -> bool {
+    /// Check whether this compile session and crate type use static crt.
+    pub fn crt_static(&self, crate_type: Option<config::CrateType>) -> bool {
         // If the target does not opt in to crt-static support, use its default.
         if self.target.target.options.crt_static_respected {
-            self.crt_static_feature()
+            self.crt_static_feature(crate_type)
         } else {
             self.target.target.options.crt_static_default
         }
     }
 
-    pub fn crt_static_feature(&self) -> bool {
+    /// Check whether this compile session and crate type use `crt-static` feature.
+    pub fn crt_static_feature(&self, crate_type: Option<config::CrateType>) -> bool {
         let requested_features = self.opts.cg.target_feature.split(',');
         let found_negative = requested_features.clone().any(|r| r == "-crt-static");
         let found_positive = requested_features.clone().any(|r| r == "+crt-static");
 
-        // If the target we're compiling for requests a static crt by default,
-        // then see if the `-crt-static` feature was passed to disable that.
-        // Otherwise if we don't have a static crt by default then see if the
-        // `+crt-static` feature was passed.
-        if self.target.target.options.crt_static_default { !found_negative } else { found_positive }
+        if self.target.target.options.crt_static_default {
+            // `proc-macro` always required to be compiled to dylibs.
+            // We don't use a static crt unless the `+crt-static` feature was passed.
+            if !self.target.target.options.crt_static_allows_dylibs {
+                match crate_type {
+                    Some(config::CrateType::ProcMacro) => found_positive,
+                    Some(_) => !found_negative,
+                    None => {
+                        // FIXME: When crate_type is not available, 
+                        // we use compiler options to determine the crate_type.
+                        // We can't check `#![crate_type = "proc-macro"]` here.
+                        if self.opts.crate_types.contains(&config::CrateType::ProcMacro) {
+                            found_positive
+                        } else {
+                            !found_negative
+                        }
+                    }
+                }
+            } else {
+                // If the target we're compiling for requests a static crt by default,
+                // then see if the `-crt-static` feature was passed to disable that.
+                !found_negative
+            }
+        } else {
+            // If the target we're compiling for don't have a static crt by default then see if the
+            // `+crt-static` feature was passed.
+            found_positive
+        }
     }
 
     pub fn must_not_eliminate_frame_pointers(&self) -> bool {
diff --git a/src/test/ui/proc-macro/musl-proc-macro.rs b/src/test/ui/proc-macro/musl-proc-macro.rs
new file mode 100644
index 00000000000..44abfcf129b
--- /dev/null
+++ b/src/test/ui/proc-macro/musl-proc-macro.rs
@@ -0,0 +1,15 @@
+// Test proc-macro crate can be built without addtional RUSTFLAGS
+// on musl target
+
+// run-pass
+// compile-flags: --target=x86_64-unknown-linux-musl
+#![crate_type = "proc-macro"]
+
+extern crate proc_macro;
+
+use proc_macro::TokenStream;
+
+#[proc_macro_derive(Foo)]
+pub fn derive_foo(input: TokenStream) -> TokenStream {
+    input
+}

From 7996df992fba0b7e09215843fcfabc0c53828c57 Mon Sep 17 00:00:00 2001
From: 12101111 <w12101111@gmail.com>
Date: Tue, 3 Mar 2020 16:29:44 +0800
Subject: [PATCH 2/9] Run format.

---
 src/librustc_codegen_ssa/back/link.rs      | 3 ++-
 src/librustc_codegen_utils/link.rs         | 4 +++-
 src/librustc_metadata/dependency_format.rs | 4 +++-
 src/librustc_session/session.rs            | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs
index 387312addfa..b6cf3a30211 100644
--- a/src/librustc_codegen_ssa/back/link.rs
+++ b/src/librustc_codegen_ssa/back/link.rs
@@ -1288,7 +1288,8 @@ fn link_args<'a, B: ArchiveBuilder<'a>>(
             let more_args = &sess.opts.cg.link_arg;
             let mut args = args.iter().chain(more_args.iter()).chain(used_link_args.iter());
 
-            if is_pic(sess) && !sess.crt_static(Some(crate_type)) && !args.any(|x| *x == "-static") {
+            if is_pic(sess) && !sess.crt_static(Some(crate_type)) && !args.any(|x| *x == "-static")
+            {
                 position_independent_executable = true;
             }
         }
diff --git a/src/librustc_codegen_utils/link.rs b/src/librustc_codegen_utils/link.rs
index f80c19a79e2..2850a29148e 100644
--- a/src/librustc_codegen_utils/link.rs
+++ b/src/librustc_codegen_utils/link.rs
@@ -167,7 +167,9 @@ pub fn invalid_output_for_target(sess: &Session, crate_type: config::CrateType)
             if !sess.target.target.options.dynamic_linking {
                 return true;
             }
-            if sess.crt_static(Some(crate_type)) && !sess.target.target.options.crt_static_allows_dylibs {
+            if sess.crt_static(Some(crate_type))
+                && !sess.target.target.options.crt_static_allows_dylibs
+            {
                 return true;
             }
         }
diff --git a/src/librustc_metadata/dependency_format.rs b/src/librustc_metadata/dependency_format.rs
index 13cda397f24..4a9a9ddc4bd 100644
--- a/src/librustc_metadata/dependency_format.rs
+++ b/src/librustc_metadata/dependency_format.rs
@@ -97,7 +97,9 @@ fn calculate_type(tcx: TyCtxt<'_>, ty: config::CrateType) -> DependencyList {
 
         // If the global prefer_dynamic switch is turned off, or the final
         // executable will be statically linked, prefer static crate linkage.
-        config::CrateType::Executable if !sess.opts.cg.prefer_dynamic || sess.crt_static(Some(ty)) => {
+        config::CrateType::Executable
+            if !sess.opts.cg.prefer_dynamic || sess.crt_static(Some(ty)) =>
+        {
             Linkage::Static
         }
         config::CrateType::Executable => Linkage::Dynamic,
diff --git a/src/librustc_session/session.rs b/src/librustc_session/session.rs
index dcd9ae44e88..619fbdcf7f8 100644
--- a/src/librustc_session/session.rs
+++ b/src/librustc_session/session.rs
@@ -564,7 +564,7 @@ impl Session {
                     Some(config::CrateType::ProcMacro) => found_positive,
                     Some(_) => !found_negative,
                     None => {
-                        // FIXME: When crate_type is not available, 
+                        // FIXME: When crate_type is not available,
                         // we use compiler options to determine the crate_type.
                         // We can't check `#![crate_type = "proc-macro"]` here.
                         if self.opts.crate_types.contains(&config::CrateType::ProcMacro) {

From 89aebbdd7b6cea56284d53ab5aff5e62f1e67b67 Mon Sep 17 00:00:00 2001
From: 12101111 <w12101111@gmail.com>
Date: Tue, 3 Mar 2020 19:17:24 +0800
Subject: [PATCH 3/9] Only run this test on musl

---
 src/test/ui/proc-macro/musl-proc-macro.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/ui/proc-macro/musl-proc-macro.rs b/src/test/ui/proc-macro/musl-proc-macro.rs
index 44abfcf129b..f025a92c43e 100644
--- a/src/test/ui/proc-macro/musl-proc-macro.rs
+++ b/src/test/ui/proc-macro/musl-proc-macro.rs
@@ -1,8 +1,8 @@
 // Test proc-macro crate can be built without addtional RUSTFLAGS
 // on musl target
 
-// run-pass
-// compile-flags: --target=x86_64-unknown-linux-musl
+// build-pass
+// only-musl 
 #![crate_type = "proc-macro"]
 
 extern crate proc_macro;

From 84349cc56492d70b37ec288f6f3e887858635fa4 Mon Sep 17 00:00:00 2001
From: 12101111 <w12101111@gmail.com>
Date: Tue, 3 Mar 2020 19:42:27 +0800
Subject: [PATCH 4/9] Remove trailing whitespace.

---
 src/test/ui/proc-macro/musl-proc-macro.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/ui/proc-macro/musl-proc-macro.rs b/src/test/ui/proc-macro/musl-proc-macro.rs
index f025a92c43e..223f00eb043 100644
--- a/src/test/ui/proc-macro/musl-proc-macro.rs
+++ b/src/test/ui/proc-macro/musl-proc-macro.rs
@@ -2,7 +2,7 @@
 // on musl target
 
 // build-pass
-// only-musl 
+// only-musl
 #![crate_type = "proc-macro"]
 
 extern crate proc_macro;

From dbed65afaede1a819c5a7319685721339b61733b Mon Sep 17 00:00:00 2001
From: 12101111 <w12101111@gmail.com>
Date: Sun, 8 Mar 2020 14:24:02 +0800
Subject: [PATCH 5/9] Simplify checking of crt_static_feature()

---
 src/librustc_session/session.rs | 36 +++++++++------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/librustc_session/session.rs b/src/librustc_session/session.rs
index 619fbdcf7f8..3cb8ba4af11 100644
--- a/src/librustc_session/session.rs
+++ b/src/librustc_session/session.rs
@@ -556,33 +556,17 @@ impl Session {
         let found_negative = requested_features.clone().any(|r| r == "-crt-static");
         let found_positive = requested_features.clone().any(|r| r == "+crt-static");
 
-        if self.target.target.options.crt_static_default {
-            // `proc-macro` always required to be compiled to dylibs.
-            // We don't use a static crt unless the `+crt-static` feature was passed.
-            if !self.target.target.options.crt_static_allows_dylibs {
-                match crate_type {
-                    Some(config::CrateType::ProcMacro) => found_positive,
-                    Some(_) => !found_negative,
-                    None => {
-                        // FIXME: When crate_type is not available,
-                        // we use compiler options to determine the crate_type.
-                        // We can't check `#![crate_type = "proc-macro"]` here.
-                        if self.opts.crate_types.contains(&config::CrateType::ProcMacro) {
-                            found_positive
-                        } else {
-                            !found_negative
-                        }
-                    }
-                }
-            } else {
-                // If the target we're compiling for requests a static crt by default,
-                // then see if the `-crt-static` feature was passed to disable that.
-                !found_negative
-            }
-        } else {
-            // If the target we're compiling for don't have a static crt by default then see if the
-            // `+crt-static` feature was passed.
+        if found_positive || found_negative {
             found_positive
+        } else if crate_type == Some(config::CrateType::ProcMacro)
+            || self.opts.crate_types.contains(&config::CrateType::ProcMacro)
+        {
+            // FIXME: When crate_type is not available,
+            // we use compiler options to determine the crate_type.
+            // We can't check `#![crate_type = "proc-macro"]` here.
+            false
+        } else {
+            self.target.target.options.crt_static_default
         }
     }
 

From 7a89bf166719d46b85c2d00686380587e46ec10d Mon Sep 17 00:00:00 2001
From: 12101111 <w12101111@gmail.com>
Date: Sun, 8 Mar 2020 21:49:52 +0800
Subject: [PATCH 6/9] override flags from compiletest

---
 src/test/ui/proc-macro/musl-proc-macro.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/ui/proc-macro/musl-proc-macro.rs b/src/test/ui/proc-macro/musl-proc-macro.rs
index 223f00eb043..7ea3726b751 100644
--- a/src/test/ui/proc-macro/musl-proc-macro.rs
+++ b/src/test/ui/proc-macro/musl-proc-macro.rs
@@ -1,6 +1,7 @@
 // Test proc-macro crate can be built without addtional RUSTFLAGS
 // on musl target
-
+// override -Ctarget-feature=-crt-static from compiletest
+// compile-flags: -Ctarget-feature=
 // build-pass
 // only-musl
 #![crate_type = "proc-macro"]

From 75e6cfc79b39253ee0e4fafc7805c7b0a1f24ef2 Mon Sep 17 00:00:00 2001
From: 12101111 <w12101111@gmail.com>
Date: Mon, 9 Mar 2020 08:39:34 +0800
Subject: [PATCH 7/9] run crt-static test on all target

---
 src/test/ui/proc-macro/{musl-proc-macro.rs => crt-static.rs} | 1 -
 1 file changed, 1 deletion(-)
 rename src/test/ui/proc-macro/{musl-proc-macro.rs => crt-static.rs} (96%)

diff --git a/src/test/ui/proc-macro/musl-proc-macro.rs b/src/test/ui/proc-macro/crt-static.rs
similarity index 96%
rename from src/test/ui/proc-macro/musl-proc-macro.rs
rename to src/test/ui/proc-macro/crt-static.rs
index 7ea3726b751..bed45c6a5b8 100644
--- a/src/test/ui/proc-macro/musl-proc-macro.rs
+++ b/src/test/ui/proc-macro/crt-static.rs
@@ -3,7 +3,6 @@
 // override -Ctarget-feature=-crt-static from compiletest
 // compile-flags: -Ctarget-feature=
 // build-pass
-// only-musl
 #![crate_type = "proc-macro"]
 
 extern crate proc_macro;

From cfff1b4c12607dc3c74d468140aad7f6fdbae6f0 Mon Sep 17 00:00:00 2001
From: 12101111 <w12101111@gmail.com>
Date: Tue, 10 Mar 2020 15:36:23 +0800
Subject: [PATCH 8/9] When `crate_type` is `None`,check compiler options

---
 src/librustc_session/session.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/librustc_session/session.rs b/src/librustc_session/session.rs
index 3cb8ba4af11..ef09813b6ca 100644
--- a/src/librustc_session/session.rs
+++ b/src/librustc_session/session.rs
@@ -559,7 +559,7 @@ impl Session {
         if found_positive || found_negative {
             found_positive
         } else if crate_type == Some(config::CrateType::ProcMacro)
-            || self.opts.crate_types.contains(&config::CrateType::ProcMacro)
+            || crate_type == None && self.opts.crate_types.contains(&config::CrateType::ProcMacro)
         {
             // FIXME: When crate_type is not available,
             // we use compiler options to determine the crate_type.

From afd374ff3608570cdbc8889a52299d52ee52c7e2 Mon Sep 17 00:00:00 2001
From: 12101111 <w12101111@gmail.com>
Date: Tue, 17 Mar 2020 09:57:11 +0800
Subject: [PATCH 9/9] Ignore wasm32

---
 src/test/ui/proc-macro/crt-static.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/ui/proc-macro/crt-static.rs b/src/test/ui/proc-macro/crt-static.rs
index bed45c6a5b8..90e3d422b3c 100644
--- a/src/test/ui/proc-macro/crt-static.rs
+++ b/src/test/ui/proc-macro/crt-static.rs
@@ -2,6 +2,7 @@
 // on musl target
 // override -Ctarget-feature=-crt-static from compiletest
 // compile-flags: -Ctarget-feature=
+// ignore-wasm32
 // build-pass
 #![crate_type = "proc-macro"]