File tree Expand file tree Collapse file tree 6 files changed +7
-7
lines changed Expand file tree Collapse file tree 6 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -231,7 +231,7 @@ fn build_clif_sysroot_for_triple(
231
231
}
232
232
233
233
// Build sysroot
234
- let mut rustflags = vec ! [ "-Zforce-unstable-if-unmarked" . to_owned( ) , "-Cpanic=abort" . to_owned ( ) ] ;
234
+ let mut rustflags = vec ! [ "-Zforce-unstable-if-unmarked" . to_owned( ) ] ;
235
235
match cg_clif_dylib_path {
236
236
CodegenBackend :: Local ( path) => {
237
237
rustflags. push ( format ! ( "-Zcodegen-backend={}" , path. to_str( ) . unwrap( ) ) ) ;
Original file line number Diff line number Diff line change @@ -432,7 +432,6 @@ impl<'a> TestRunner<'a> {
432
432
cmd. arg ( "-Cdebuginfo=2" ) ;
433
433
cmd. arg ( "--target" ) ;
434
434
cmd. arg ( & self . target_compiler . triple ) ;
435
- cmd. arg ( "-Cpanic=abort" ) ;
436
435
cmd. arg ( "-Zunstable-options" ) ;
437
436
cmd. arg ( "--check-cfg=cfg(jit)" ) ;
438
437
cmd. args ( args) ;
Original file line number Diff line number Diff line change @@ -23,6 +23,11 @@ fn panic_handler(_: &core::panic::PanicInfo<'_>) -> ! {
23
23
core:: intrinsics:: abort ( ) ;
24
24
}
25
25
26
+ #[ lang = "eh_personality" ]
27
+ fn eh_personality ( ) -> ! {
28
+ core:: intrinsics:: abort ( ) ;
29
+ }
30
+
26
31
#[ alloc_error_handler]
27
32
fn alloc_error_handler ( _: alloc:: alloc:: Layout ) -> ! {
28
33
core:: intrinsics:: abort ( ) ;
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ fn main() {
12
12
sysroot = sysroot. parent ( ) . unwrap ( ) ;
13
13
}
14
14
15
- let mut rustflags = vec ! [ "-Cpanic=abort" . to_owned ( ) , "-Zpanic-abort-tests" . to_owned ( ) ] ;
15
+ let mut rustflags = vec ! [ ] ;
16
16
if let Some ( name) = option_env ! ( "BUILTIN_BACKEND" ) {
17
17
rustflags. push ( format ! ( "-Zcodegen-backend={name}" ) ) ;
18
18
} else {
Original file line number Diff line number Diff line change @@ -17,8 +17,6 @@ fn main() {
17
17
18
18
let passed_args = std:: env:: args_os ( ) . skip ( 1 ) . collect :: < Vec < _ > > ( ) ;
19
19
let mut args = vec ! [ ] ;
20
- args. push ( OsString :: from ( "-Cpanic=abort" ) ) ;
21
- args. push ( OsString :: from ( "-Zpanic-abort-tests" ) ) ;
22
20
if let Some ( name) = option_env ! ( "BUILTIN_BACKEND" ) {
23
21
args. push ( OsString :: from ( format ! ( "-Zcodegen-backend={name}" ) ) )
24
22
} else {
Original file line number Diff line number Diff line change @@ -17,8 +17,6 @@ fn main() {
17
17
18
18
let passed_args = std:: env:: args_os ( ) . skip ( 1 ) . collect :: < Vec < _ > > ( ) ;
19
19
let mut args = vec ! [ ] ;
20
- args. push ( OsString :: from ( "-Cpanic=abort" ) ) ;
21
- args. push ( OsString :: from ( "-Zpanic-abort-tests" ) ) ;
22
20
if let Some ( name) = option_env ! ( "BUILTIN_BACKEND" ) {
23
21
args. push ( OsString :: from ( format ! ( "-Zcodegen-backend={name}" ) ) )
24
22
} else {
You can’t perform that action at this time.
0 commit comments