Skip to content

Commit bc3c0cd

Browse files
authored
Rollup merge of rust-lang#102112 - cuviper:powerpc64-full-relro, r=eholk
Allow full relro on powerpc64-unknown-linux-gnu This was previously limited to partial relro, citing issues on RHEL6, but that's no longer a supported platform since rust-lang#95026. We have long been enabling full relro in RHEL7's own Rust builds for ppc64, without trouble, so it should be fine to drop this workaround.
2 parents cf90528 + 5d80833 commit bc3c0cd

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

compiler/rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
use crate::abi::Endian;
2-
use crate::spec::{LinkerFlavor, RelroLevel, Target, TargetOptions};
2+
use crate::spec::{LinkerFlavor, Target, TargetOptions};
33

44
pub fn target() -> Target {
55
let mut base = super::linux_gnu_base::opts();
66
base.cpu = "ppc64".into();
77
base.add_pre_link_args(LinkerFlavor::Gcc, &["-m64"]);
88
base.max_atomic_width = Some(64);
99

10-
// ld.so in at least RHEL6 on ppc64 has a bug related to BIND_NOW, so only enable partial RELRO
11-
// for now. https://github.com/rust-lang/rust/pull/43170#issuecomment-315411474
12-
base.relro_level = RelroLevel::Partial;
13-
1410
Target {
1511
llvm_target: "powerpc64-unknown-linux-gnu".into(),
1612
pointer_width: 64,

0 commit comments

Comments
 (0)