Skip to content

Commit 1dbce4b

Browse files
committed
Make the default relro level be doing nothing at all
Signed-off-by: Johannes Löthberg <[email protected]>
1 parent 54b68b6 commit 1dbce4b

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

src/librustc_back/lib.rs

+4
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ pub enum RelroLevel {
131131
Full,
132132
Partial,
133133
Off,
134+
None,
134135
}
135136

136137
impl RelroLevel {
@@ -139,6 +140,7 @@ impl RelroLevel {
139140
RelroLevel::Full => "full",
140141
RelroLevel::Partial => "partial",
141142
RelroLevel::Off => "off",
143+
RelroLevel::None => "none",
142144
}
143145
}
144146
}
@@ -151,6 +153,7 @@ impl FromStr for RelroLevel {
151153
"full" => Ok(RelroLevel::Full),
152154
"partial" => Ok(RelroLevel::Partial),
153155
"off" => Ok(RelroLevel::Off),
156+
"none" => Ok(RelroLevel::None),
154157
_ => Err(()),
155158
}
156159
}
@@ -162,6 +165,7 @@ impl ToJson for RelroLevel {
162165
RelroLevel::Full => "full".to_json(),
163166
RelroLevel::Partial => "partial".to_json(),
164167
RelroLevel::Off => "off".to_json(),
168+
RelroLevel::None => "None".to_json(),
165169
}
166170
}
167171
}

src/librustc_back/target/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ impl Default for TargetOptions {
514514
has_rpath: false,
515515
no_default_libraries: true,
516516
position_independent_executables: false,
517-
relro_level: RelroLevel::Off,
517+
relro_level: RelroLevel::None,
518518
pre_link_objects_exe: Vec::new(),
519519
pre_link_objects_dll: Vec::new(),
520520
post_link_objects: Vec::new(),

src/librustc_trans/back/link.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1017,6 +1017,8 @@ fn link_args(cmd: &mut Linker,
10171017
RelroLevel::Off => {
10181018
cmd.no_relro();
10191019
},
1020+
RelroLevel::None => {
1021+
},
10201022
}
10211023

10221024
// Pass optimization flags down to the linker.

0 commit comments

Comments
 (0)