Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4a94e80

Browse files
authoredJun 23, 2024
Rollup merge of #126720 - Rejyr:migrate-branch-protection-rmake, r=jieyouxu
Ignore `branch-protection-check-IBT` run-make test The old Makefile implementation (#110304) had an improper comparison which caused the test to never run. However, both the updated Makefile implementation and the rmake implementation fail (missing `.note.gnu.property`). This could be a bug in the original implementation or test flakiness. Edit: Manually recreating the test case shows that `.note.gnu.property` does not appear in nightly. ```rust // main.rs fn main() { println!("hello world"); } ``` ```sh $ rustc +nightly -V rustc 1.81.0-nightly (c1b336c 2024-06-21) $ rustc +stable -V rustc 1.79.0 (129f3b9 2024-06-10) ``` ```sh $ rustc +nightly -Zcf-protection=branch -Clink-args=-nostartfiles -Csave-temps "-L$PWD" main.rs -o main $ llvm-readobj --elf-output-style=GNU -nW main Displaying notes found in: .note.gnu.build-id Owner Data size Description GNU 0x00000008 NT_GNU_BUILD_ID (unique build ID bitstring) Build ID: bcae34e6431b2a37 ``` Compiling without the other flags still does not show `.note.gnu.property`. ```sh $ rustc +nightly main.rs -o main $ llvm-readobj --elf-output-style=GNU -nW main Displaying notes found in: .note.ABI-tag Owner Data size Description GNU 0x00000010 NT_GNU_ABI_TAG (ABI version tag) OS: Linux, ABI: 4.4.0 Displaying notes found in: .note.gnu.build-id Owner Data size Description GNU 0x00000008 NT_GNU_BUILD_ID (unique build ID bitstring) Build ID: d60d5f108b63bf3a ``` Compiling on stable shows `.note.gnu.property`. ```sh $ rustc +stable main.rs -o main $ llvm-readobj --elf-output-style=GNU -nW main Displaying notes found in: .note.gnu.property Owner Data size Description GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 (property note) Properties: x86 ISA needed: x86-64-baseline Displaying notes found in: .note.gnu.build-id Owner Data size Description GNU 0x00000014 NT_GNU_BUILD_ID (unique build ID bitstring) Build ID: 4a494eb578123314e6ff1caf1c8877e27004664f Displaying notes found in: .note.ABI-tag Owner Data size Description GNU 0x00000010 NT_GNU_ABI_TAG (ABI version tag) OS: Linux, ABI: 4.4.0 ``` Part of #121876. r? `@jieyouxu`
2 parents d4cc01c + 75a9379 commit 4a94e80

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed
 

‎tests/run-make/branch-protection-check-IBT/Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ include ../tools.mk
77

88
# only-x86_64
99

10+
# ignore-test
11+
# FIXME(jieyouxu): This test never runs because the `ifeq` check on line 17
12+
# compares `x86` to `x86_64`, which always evaluates to false.
13+
# When the test does run, the compilation does not include `.note.gnu.property`.
14+
# See https://github.com/rust-lang/rust/pull/126720 for more information.
15+
1016
all:
1117
ifeq ($(filter x86,$(LLVM_COMPONENTS)),x86_64)
1218
$(RUSTC) --target x86_64-unknown-linux-gnu -Z cf-protection=branch -L$(TMPDIR) -C link-args='-nostartfiles' -C save-temps ./main.rs -o $(TMPDIR)/rsmain
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Check for GNU Property Note
2+
3+
// How to run this
4+
// python3 x.py test --target x86_64-unknown-linux-gnu tests/run-make/branch-protection-check-IBT/
5+
6+
//@ only-x86_64
7+
8+
//@ ignore-test
9+
// FIXME(jieyouxu): see the FIXME in the Makefile
10+
11+
use run_make_support::llvm_readobj;
12+
use run_make_support::rustc;
13+
use run_make_support::{cwd, env_var};
14+
15+
fn main() {
16+
let llvm_components = env_var("LLVM_COMPONENTS");
17+
if !format!(" {llvm_components} ").contains(" x86 ") {
18+
return;
19+
}
20+
21+
rustc()
22+
.input("main.rs")
23+
.target("x86_64-unknown-linux-gnu")
24+
.arg("-Zcf-protection=branch")
25+
.arg(format!("-L{}", cwd().display()))
26+
.arg("-Clink-args=-nostartfiles")
27+
.arg("-Csave-temps")
28+
.run();
29+
30+
llvm_readobj().arg("-nW").input("main").run().assert_stdout_contains(".note.gnu.property");
31+
}

0 commit comments

Comments
 (0)
Failed to load comments.