Skip to content

Commit 8fc9488

Browse files
ILyoanbrson
authored andcommitted
---
yaml --- r: 56817 b: refs/heads/try c: 344628f h: refs/heads/master i: 56815: a29b954 v: v3
1 parent 4bba064 commit 8fc9488

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: c081ffbd1e845687202a975ea2e698b623e5722f
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
5-
refs/heads/try: 3d0d144283959bf62368f6965aae14ce95ee286b
5+
refs/heads/try: 344628fe91ffa0fad32bc5b3eee3e6b4b48c9990
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/metadata/loader.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,8 @@ fn get_metadata_section(os: os,
206206
while llvm::LLVMIsSectionIteratorAtEnd(of.llof, si.llsi) == False {
207207
let name_buf = llvm::LLVMGetSectionName(si.llsi);
208208
let name = unsafe { str::raw::from_c_str(name_buf) };
209-
if name == meta_section_name(os) {
209+
debug!("get_matadata_section: name %s", name);
210+
if name == read_meta_section_name(os) {
210211
let cbuf = llvm::LLVMGetSectionContents(si.llsi);
211212
let csz = llvm::LLVMGetSectionSize(si.llsi) as uint;
212213
let mut found = None;
@@ -251,6 +252,16 @@ pub fn meta_section_name(os: os) -> ~str {
251252
}
252253
}
253254
255+
pub fn read_meta_section_name(os: os) -> ~str {
256+
match os {
257+
os_macos => ~"__note.rustc",
258+
os_win32 => ~".note.rustc",
259+
os_linux => ~".note.rustc",
260+
os_android => ~".note.rustc",
261+
os_freebsd => ~".note.rustc"
262+
}
263+
}
264+
254265
// A diagnostic function for dumping crate metadata to an output stream
255266
pub fn list_file_metadata(intr: @ident_interner,
256267
os: os,

0 commit comments

Comments
 (0)