From: Jan Janssen <medhefgo@web.de>
Date: Fri, 10 Mar 2023 08:21:08 +0000 (+0100)
Subject: boot: Add support for -ftrapv
X-Git-Tag: v254-rc1~987^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f64f82aa8d5181bb024767292aa8bcabdc7c019c;p=thirdparty%2Fsystemd.git

boot: Add support for -ftrapv
---

diff --git a/src/boot/efi/log.c b/src/boot/efi/log.c
index 6ba8d2d58ec..879ed766e3b 100644
--- a/src/boot/efi/log.c
+++ b/src/boot/efi/log.c
@@ -81,6 +81,12 @@ void __stack_chk_fail_local(void) {
         __stack_chk_fail();
 }
 
+/* Called by libgcc for some fatal errors like integer overflow with -ftrapv. */
+_used_ _noreturn_ void abort(void);
+void abort(void) {
+        panic(u"systemd-boot: Unknown error, halting.");
+}
+
 #if defined(__ARM_EABI__)
 /* These override the (weak) div0 handlers from libgcc as they would otherwise call raise() instead. */
 
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index bfc3f9c2798..58bebe446e6 100644
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -179,7 +179,6 @@ efi_disabled_c_args = cc.get_supported_arguments(
         '-fcf-protection=none',
         '-fno-asynchronous-unwind-tables',
         '-fno-exceptions',
-        '-fno-trapv',
         '-fno-sanitize=all',
         '-fno-unwind-tables',
 )