From d3775bf7dd3431d86fd327f9933eebd3079bdfa3 Mon Sep 17 00:00:00 2001
From: Toshiki Teramura <toshiki.teramura@gmail.com>
Date: Sun, 16 Sep 2018 15:30:40 +0900
Subject: [PATCH 1/2] Use ptx-linker

---
 src/librustc_target/spec/nvptx64_nvidia_cuda.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/librustc_target/spec/nvptx64_nvidia_cuda.rs b/src/librustc_target/spec/nvptx64_nvidia_cuda.rs
index fd64af0ad6914..1a219ef921e0c 100644
--- a/src/librustc_target/spec/nvptx64_nvidia_cuda.rs
+++ b/src/librustc_target/spec/nvptx64_nvidia_cuda.rs
@@ -1,11 +1,10 @@
 /// Copied from wasm32-unknown-unknown
-
-use super::{LinkerFlavor, Target, TargetOptions, PanicStrategy};
+use super::{LinkerFlavor, PanicStrategy, Target, TargetOptions};
 
 pub fn target() -> Result<Target, String> {
     let opts = TargetOptions {
         cpu: "sm_50".to_string(),
-        linker: None,
+        linker: Some("ptx-linker".into()),
         dynamic_linking: true,
         only_cdylib: true,
         executables: false,
@@ -15,7 +14,7 @@ pub fn target() -> Result<Target, String> {
         singlethread: true,
         obj_is_bitcode: true,
         panic_strategy: PanicStrategy::Abort,
-        .. Default::default()
+        ..Default::default()
     };
     Ok(Target {
         llvm_target: "nvptx64-nvidia-cuda".to_string(),
@@ -31,4 +30,3 @@ pub fn target() -> Result<Target, String> {
         options: opts,
     })
 }
-

From e786e89937d42acb74d84b72b0c6439316316ce4 Mon Sep 17 00:00:00 2001
From: Toshiki Teramura <toshiki.teramura@gmail.com>
Date: Sun, 16 Sep 2018 16:00:01 +0900
Subject: [PATCH 2/2] Revert "Use _ instead of ."

This reverts commit 965b0a548ab02d801a2b93081f0a19cf54680ae0.
---
 src/librustc_codegen_utils/symbol_names.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/librustc_codegen_utils/symbol_names.rs b/src/librustc_codegen_utils/symbol_names.rs
index 9b7e3f83816e2..39b88b225edc7 100644
--- a/src/librustc_codegen_utils/symbol_names.rs
+++ b/src/librustc_codegen_utils/symbol_names.rs
@@ -416,7 +416,7 @@ pub fn sanitize(result: &mut String, s: &str) -> bool {
 
             // '.' doesn't occur in types and functions, so reuse it
             // for ':' and '-'
-            '-' | ':' => result.push('_'),
+            '-' | ':' => result.push('.'),
 
             // These are legal symbols
             'a'..='z' | 'A'..='Z' | '0'..='9' | '_' | '.' | '$' => result.push(c),