about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2016-04-07 23:26:18 +0530
committerManish Goregaokar <manishsmail@gmail.com>2016-04-07 23:26:18 +0530
commitc58a9da8ba72224203f04c7cb1e80c7293699b28 (patch)
treecd492eb02d8a56bc9a23f24418556e6767646904
parent02acff64a4985d6cb94df1068760506699f98e61 (diff)
parenta0943d0701d67d5260fa33dacf8afe9616e327c4 (diff)
Rollup merge of #32734 - tromey:dwarf-5-DW_LANG_Rust, r=michaelwoerister
Use DWARF 5 value for DW_LANG_Rust

DWARF 5 has assigned a value for `DW_LANG_Rust`.  See [the relevant DWARF issue](http://www.dwarfstd.org/ShowIssue.php?issue=140129.1).  Although DWARF 5 is not yet released, it seems ok to use this value as both GCC and LLVM are already using other `DW_LANG_` constants assigned in this way.
-rw-r--r--src/librustc_trans/debuginfo/metadata.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/librustc_trans/debuginfo/metadata.rs b/src/librustc_trans/debuginfo/metadata.rs
index 822155f8c36..5014186d13b 100644
--- a/src/librustc_trans/debuginfo/metadata.rs
+++ b/src/librustc_trans/debuginfo/metadata.rs
@@ -50,7 +50,9 @@ use syntax::{ast, codemap};
 use syntax::parse::token;
 
 
-const DW_LANG_RUST: c_uint = 0x9000;
+// From DWARF 5.
+// See http://www.dwarfstd.org/ShowIssue.php?issue=140129.1
+const DW_LANG_RUST: c_uint = 0x1c;
 #[allow(non_upper_case_globals)]
 const DW_ATE_boolean: c_uint = 0x02;
 #[allow(non_upper_case_globals)]