Skip to content

Commit

Permalink
Auto merge of #69168 - brainlock:test-textrel-regression, r=Mark-Simu…
Browse files Browse the repository at this point in the history
…lacrum,tmandry

add regression test for issue #68794

This is a minimal regression test for the issue #68794: "TEXTREL in
i686", which was fixed with e86019c.

The test links a minimal rust static library into a shared library, and
checks that the linker didn't have to add the TEXTREL flag.
  • Loading branch information
bors committed Feb 15, 2020
2 parents dbef353 + ea2ffda commit 61d9231
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Regression test for issue #68794
#
# Verify that no text relocations are accidentally introduced by linking a
# minimal rust staticlib.
#
# The test links a rust static library into a shared library, and checks that
# the linker doesn't have to flag the resulting file as containing TEXTRELs.

-include ../tools.mk

# only-linux

all:
$(RUSTC) foo.rs
$(CC) bar.c $(call STATICLIB,foo) -fPIC -shared -o $(call DYLIB,bar) \
$(EXTRACFLAGS) $(EXTRACXXFLAGS)
readelf -d $(call DYLIB,bar) | grep TEXTREL; test $$? -eq 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
void foo();

int main() {
foo();
return 0;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#![crate_type = "staticlib"]

#[no_mangle]
pub extern "C" fn foo(x: u32) {
// using the println! makes it so that enough code from the standard
// library is included (see issue #68794)
println!("foo: {}", x);
}

0 comments on commit 61d9231

Please sign in to comment.