about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-12-05 05:28:48 +0000
committerbors <bors@rust-lang.org>2019-12-05 05:28:48 +0000
commitd825e35ee8325146e6c175a4c61bcb645b347d5e (patch)
treec7dfd1752b8ae93553a52aac10d4af0b9d8ac7ce
parentaeaaf8f640c919074983edd8366ab3d10321f2b5 (diff)
parent5ce09bcfa26634cb9a149bbc6363b39d96363bcb (diff)
downloadrust-d825e35ee8325146e6c175a4c61bcb645b347d5e.tar.gz
rust-d825e35ee8325146e6c175a4c61bcb645b347d5e.zip
Auto merge of #66520 - alexcrichton:disable-gdb-wasm, r=eddyb
Disable gdb pretty printer global section on wasm targets

The wasm targets don't support gdb anyway so there's no need for this
section there.
-rw-r--r--src/librustc_target/spec/wasm32_base.rs3
-rw-r--r--src/test/codegen/gdb_debug_script_load.rs2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/librustc_target/spec/wasm32_base.rs b/src/librustc_target/spec/wasm32_base.rs
index 6f00245b009..e18a9e66468 100644
--- a/src/librustc_target/spec/wasm32_base.rs
+++ b/src/librustc_target/spec/wasm32_base.rs
@@ -140,6 +140,9 @@ pub fn options() -> TargetOptions {
         has_elf_tls: true,
         tls_model: "local-exec".to_string(),
 
+        // gdb scripts don't work on wasm blobs
+        emit_debug_gdb_scripts: false,
+
         .. Default::default()
     }
 }
diff --git a/src/test/codegen/gdb_debug_script_load.rs b/src/test/codegen/gdb_debug_script_load.rs
index 2e8dc7b6f36..178269f611e 100644
--- a/src/test/codegen/gdb_debug_script_load.rs
+++ b/src/test/codegen/gdb_debug_script_load.rs
@@ -1,6 +1,8 @@
 // ignore-tidy-linelength
 // ignore-windows
 // ignore-macos
+// ignore-wasm
+// ignore-emscripten
 
 // compile-flags: -g -C no-prepopulate-passes