user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate crate-hash-rustc-version to rmake

Browse source
This commit is contained in:
Jerry Wang 2024-07-13 14:27:56 -04:00
parent c1e3f03e60
commit ec6e07b09d
No known key found for this signature in database
GPG key ID: B9657729C5192EDC
3 changed files with 47 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/tools/tidy/src/allowed_run_make_makefiles.txt
View file

@ -12,7 +12,6 @@ run-make/cdylib-dylib-linkage/Makefile
run-make/compiler-lookup-paths-2/Makefile
run-make/compiler-lookup-paths/Makefile
run-make/compiler-rt-works-on-mingw/Makefile
run-make/crate-hash-rustc-version/Makefile
run-make/cross-lang-lto-clang/Makefile
run-make/cross-lang-lto-pgo-smoketest/Makefile
run-make/cross-lang-lto-upstream-rlibs/Makefile

38
tests/run-make/crate-hash-rustc-version/Makefile
View file

@ -1,38 +0,0 @@
# ignore-cross-compile
include ../tools.mk
# Ensure that crates compiled with different rustc versions cannot
# be dynamically linked.
FLAGS := -Cprefer-dynamic -Csymbol-mangling-version=v0
UNAME := $(shell uname)
ifeq ($(UNAME),Linux)
EXT=".so"
NM_CMD := nm -D
endif
ifeq ($(UNAME),Darwin)
EXT=".dylib"
NM_CMD := nm
endif
ifndef NM_CMD
all:
exit 0
else
all:
# a.rs is a dylib
$(RUSTC) a.rs --crate-type=dylib $(FLAGS)
# Write symbols to disk.
$(NM_CMD) $(call DYLIB,a) > $(TMPDIR)/symbolsbefore
# b.rs is a binary
$(RUSTC) b.rs --extern a=$(TMPDIR)/liba$(EXT) --crate-type=bin -Crpath $(FLAGS)
$(call RUN,b)
# Now re-compile a.rs with another rustc version
RUSTC_FORCE_RUSTC_VERSION=deadfeed $(RUSTC) a.rs --crate-type=dylib $(FLAGS)
# After compiling with a different rustc version, write symbols to disk again.
$(NM_CMD) $(call DYLIB,a) > $(TMPDIR)/symbolsafter
# As a sanity check, test if the symbols changed:
# If the symbols are identical, there's been an error.
if diff $(TMPDIR)/symbolsbefore $(TMPDIR)/symbolsafter; then exit 1; fi
$(call FAIL,b)
endif

47
tests/run-make/crate-hash-rustc-version/rmake.rs Normal file
View file

@ -0,0 +1,47 @@
// Ensure that crates compiled with different rustc versions cannot
// be dynamically linked.
//@ ignore-cross-compile
//@ only-unix
use run_make_support::{cmd, diff, dynamic_lib_name, is_darwin, run, run_fail, rustc};
fn main() {
let flags = ["-Cprefer-dynamic", "-Csymbol-mangling-version=v0"];
let nm_flag = if is_darwin() { [].as_slice() } else { ["-D"].as_slice() };
// a.rs is compiled to a dylib
rustc().input("a.rs").crate_type("dylib").args(&flags).run();
// Store symbols
let symbols_before = cmd("nm").args(nm_flag).arg(dynamic_lib_name("a")).run().stdout_utf8();
// b.rs is compiled to a binary
rustc()
.input("b.rs")
.extern_("a", dynamic_lib_name("a"))
.crate_type("bin")
.arg("-Crpath")
.args(&flags)
.run();
run("b");
// Now re-compile a.rs with another rustc version
rustc()
.env("RUSTC_FORCE_RUSTC_VERSION", "deadfeed")
.input("a.rs")
.crate_type("dylib")
.args(&flags)
.run();
// After compiling with a different rustc version, store symbols again.
let symbols_after = cmd("nm").args(nm_flag).arg(dynamic_lib_name("a")).run().stdout_utf8();
// As a sanity check, test if the symbols changed:
// If the symbols are identical, there's been an error.
diff()
.expected_text("symbols_before", symbols_before)
.actual_text("symbols_after", symbols_after)
.run_fail();
run_fail("b");
}