rustc: Deterministically link upstream C libraries
Previously, upstream C libraries were linked in a nondeterministic fashion because they were collected through iter_crate_data() which is a nodeterministic traversal of a hash map. When upstream rlibs had interdependencies among their native libraries (such as libfoo depending on libc), then the ordering would occasionally be wrong, causing linkage to fail. This uses the topologically sorted list of libraries to collect native libraries, so if a native library depends on libc it just needs to make sure that the rust crate depends on liblibc.
This commit is contained in:
parent
8b6091e8f1
commit
e6072fa0c4
7 changed files with 92 additions and 5 deletions
15
src/test/run-make/interdependent-c-libraries/Makefile
Normal file
15
src/test/run-make/interdependent-c-libraries/Makefile
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
-include ../tools.mk
|
||||
|
||||
# The rust crate foo will link to the native library foo, while the rust crate
|
||||
# bar will link to the native library bar. There is also a dependency between
|
||||
# the native library bar to the natibe library foo.
|
||||
#
|
||||
# This test ensures that the ordering of -lfoo and -lbar on the command line is
|
||||
# correct to complete the linkage. If passed as "-lfoo -lbar", then the 'foo'
|
||||
# library will be stripped out, and the linkage will fail.
|
||||
|
||||
all: $(call STATICLIB,foo) $(call STATICLIB,bar)
|
||||
$(RUSTC) foo.rs
|
||||
$(RUSTC) bar.rs
|
||||
$(RUSTC) main.rs -Z print-link-args
|
||||
|
||||
3
src/test/run-make/interdependent-c-libraries/bar.c
Normal file
3
src/test/run-make/interdependent-c-libraries/bar.c
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
void foo();
|
||||
|
||||
void bar() { foo(); }
|
||||
23
src/test/run-make/interdependent-c-libraries/bar.rs
Normal file
23
src/test/run-make/interdependent-c-libraries/bar.rs
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
#![crate_type = "rlib"]
|
||||
|
||||
extern crate foo;
|
||||
|
||||
#[link(name = "bar")]
|
||||
extern {
|
||||
fn bar();
|
||||
}
|
||||
|
||||
pub fn doit() {
|
||||
unsafe { bar(); }
|
||||
}
|
||||
|
||||
1
src/test/run-make/interdependent-c-libraries/foo.c
Normal file
1
src/test/run-make/interdependent-c-libraries/foo.c
Normal file
|
|
@ -0,0 +1 @@
|
|||
void foo() {}
|
||||
20
src/test/run-make/interdependent-c-libraries/foo.rs
Normal file
20
src/test/run-make/interdependent-c-libraries/foo.rs
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
#![crate_type = "rlib"]
|
||||
|
||||
#[link(name = "foo")]
|
||||
extern {
|
||||
fn foo();
|
||||
}
|
||||
|
||||
pub fn doit() {
|
||||
unsafe { foo(); }
|
||||
}
|
||||
16
src/test/run-make/interdependent-c-libraries/main.rs
Normal file
16
src/test/run-make/interdependent-c-libraries/main.rs
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
extern crate foo;
|
||||
extern crate bar;
|
||||
|
||||
fn main() {
|
||||
bar::doit();
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue