From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 15 Jan 2023 19:35:52 +0000 (+0100)
Subject: boot: Remove -O1 workaround
X-Git-Tag: v253-rc1~104^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a01473065e37bd362227d58309b3d5c20590ddf;p=thirdparty%2Fsystemd.git

boot: Remove -O1 workaround

Now that we have ukify and mkosi has been updated to use it, we
have a solution in place to make sure that PE sections don't overlap
in a UKI so let's drop the workaround to avoid overlapping PE sections.
---

diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index fb8ec26564f..10ab5ce5ce0 100644
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -198,15 +198,6 @@ efi_cflags = [
         ]
 )
 
-# Our code size has increased enough to possibly create overlapping PE sections
-# at sd-stub runtime, which will often enough prevent the image from booting.
-# This only happens because the usual instructions for assembling a unified
-# kernel image contain hardcoded addresses for section VMAs added in. Until a
-# proper solution is in place, we can at least compile with as least -O1 to
-# reduce the likelihood of this happening.
-# https://github.com/systemd/systemd/issues/24202
-efi_cflags += '-O1'
-
 efi_cflags += cc.get_supported_arguments({
         'ia32':   ['-mno-sse', '-mno-mmx'],
         'x86_64': ['-mno-red-zone', '-mno-sse', '-mno-mmx'],