Skip to content

Commit 27f085a

Browse files
committed
Enable -Cpanic=unwind by default
1 parent b6971d4 commit 27f085a

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

build_system/build_sysroot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ fn build_clif_sysroot_for_triple(
226226
}
227227

228228
// Build sysroot
229-
let mut rustflags = vec!["-Zforce-unstable-if-unmarked".to_owned(), "-Cpanic=abort".to_owned()];
229+
let mut rustflags = vec!["-Zforce-unstable-if-unmarked".to_owned()];
230230
match cg_clif_dylib_path {
231231
CodegenBackend::Local(path) => {
232232
rustflags.push(format!("-Zcodegen-backend={}", path.to_str().unwrap()));

build_system/tests.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@ impl<'a> TestRunner<'a> {
431431
cmd.arg("-Cdebuginfo=2");
432432
cmd.arg("--target");
433433
cmd.arg(&self.target_compiler.triple);
434-
cmd.arg("-Cpanic=abort");
435434
cmd.arg("--check-cfg=cfg(jit)");
436435
cmd.args(args);
437436
cmd

example/alloc_example.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ fn panic_handler(_: &core::panic::PanicInfo<'_>) -> ! {
2323
core::intrinsics::abort();
2424
}
2525

26+
#[lang = "eh_personality"]
27+
fn eh_personality() -> ! {
28+
core::intrinsics::abort();
29+
}
30+
2631
#[alloc_error_handler]
2732
fn alloc_error_handler(_: alloc::alloc::Layout) -> ! {
2833
core::intrinsics::abort();

scripts/cargo-clif.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn main() {
1212
sysroot = sysroot.parent().unwrap();
1313
}
1414

15-
let mut rustflags = vec!["-Cpanic=abort".to_owned(), "-Zpanic-abort-tests".to_owned()];
15+
let mut rustflags = vec![];
1616
if let Some(name) = option_env!("BUILTIN_BACKEND") {
1717
rustflags.push(format!("-Zcodegen-backend={name}"));
1818
} else {

scripts/rustc-clif.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ fn main() {
1717

1818
let passed_args = std::env::args_os().skip(1).collect::<Vec<_>>();
1919
let mut args = vec![];
20-
args.push(OsString::from("-Cpanic=abort"));
21-
args.push(OsString::from("-Zpanic-abort-tests"));
2220
if let Some(name) = option_env!("BUILTIN_BACKEND") {
2321
args.push(OsString::from(format!("-Zcodegen-backend={name}")))
2422
} else {

scripts/rustdoc-clif.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ fn main() {
1717

1818
let passed_args = std::env::args_os().skip(1).collect::<Vec<_>>();
1919
let mut args = vec![];
20-
args.push(OsString::from("-Cpanic=abort"));
21-
args.push(OsString::from("-Zpanic-abort-tests"));
2220
if let Some(name) = option_env!("BUILTIN_BACKEND") {
2321
args.push(OsString::from(format!("-Zcodegen-backend={name}")))
2422
} else {

0 commit comments

Comments
 (0)