From ba10b8454d08caee1b23679f74c72eb5222316e2 Mon Sep 17 00:00:00 2001
From: Antoni Boucher <bouanto@zoho.com>
Date: Fri, 21 Aug 2026 15:29:27 -0400
Subject: [PATCH] Fix abort implementation

---
 src/builder.rs            |  4 ++--
 src/context.rs            |  7 +------
 src/intrinsic/mod.rs      |  6 ++----
 tests/run/custom_abort.rs | 27 +++++++++++++++++++++++++++
 4 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 tests/run/custom_abort.rs

diff --git a/src/builder.rs b/src/builder.rs
index 550f09615ef..cdf71e409ce 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -719,8 +719,8 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
         if return_type == void_type {
             self.block.end_with_void_return(self.location)
         } else {
-            let abort = self.context.get_builtin_function("abort");
-            self.block.add_eval(self.location, self.context.new_call(self.location, abort, &[]));
+            let trap = self.context.get_builtin_function("__builtin_trap");
+            self.block.add_eval(self.location, self.context.new_call(self.location, trap, &[]));
             let return_value = self.new_temp(self.current_func(), self.location, return_type);
             self.block.end_with_return(self.location, return_value)
         }
diff --git a/src/context.rs b/src/context.rs
index ebbdbb72516..cb9b681f791 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -242,12 +242,7 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> {
         let isize_type = usize_type;
         let bool_type = context.new_type::<bool>();
 
-        let mut functions = FxHashMap::default();
-        let builtins = ["abort"];
-
-        for builtin in builtins.iter() {
-            functions.insert(builtin.to_string(), context.get_builtin_function(builtin));
-        }
+        let functions = FxHashMap::default();
 
         let mut cx = Self {
             int128_align: tcx
diff --git a/src/intrinsic/mod.rs b/src/intrinsic/mod.rs
index 9704fd7614e..2bbbe5faf0e 100644
--- a/src/intrinsic/mod.rs
+++ b/src/intrinsic/mod.rs
@@ -103,7 +103,6 @@ fn get_simple_intrinsic<'gcc, 'tcx>(
         sym::round_ties_even_f64 => "rint",
         sym::roundf32 => "roundf",
         sym::roundf64 => "round",
-        sym::abort => "abort",
         _ => return None,
     };
     Some(cx.context.get_builtin_function(gcc_name))
@@ -641,9 +640,8 @@ impl<'a, 'gcc, 'tcx> IntrinsicCallBuilderMethods<'tcx> for Builder<'a, 'gcc, 'tc
     }
 
     fn abort(&mut self) {
-        let func = self.context.get_builtin_function("abort");
-        let func: RValue<'gcc> = unsafe { std::mem::transmute(func) };
-        self.call(self.type_void(), None, None, func, &[], None, None);
+        let func = self.context.get_builtin_function("__builtin_trap");
+        self.block.add_eval(self.location, self.context.new_call(self.location, func, &[]));
     }
 
     fn assume(&mut self, value: Self::Value) {
diff --git a/tests/run/custom_abort.rs b/tests/run/custom_abort.rs
new file mode 100644
index 00000000000..eafa4321a43
--- /dev/null
+++ b/tests/run/custom_abort.rs
@@ -0,0 +1,27 @@
+// Compiler:
+//
+// Run-time:
+//   status: 42
+
+// Check that a program can define its own `abort`.
+
+#![feature(no_core)]
+#![no_std]
+#![no_core]
+#![no_main]
+
+extern crate mini_core;
+use mini_core::*;
+
+#[no_mangle]
+extern "C" fn abort() {
+    unsafe {
+        libc::exit(42);
+    }
+}
+
+#[no_mangle]
+extern "C" fn main(_argc: i32, _argv: *const *const u8) -> i32 {
+    abort();
+    0
+}