From 4807c388be1c16fec1b9cc3115beb5c4c8f9282f Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Wed, 23 Jul 2025 11:11:57 +0200
Subject: x86_64: optimize code generation

---
 Makefile                                                |  4 +++-
 patches/gcc-15.1.0-x86_64-pc-elf/0001-no-red-zone.patch | 17 -----------------
 patches/gcc-15.1.0-x86_64-pc-elf/0001-platform.patch    | 15 +++++++++++++++
 scripts/0500-build-target-gcc.sh                        |  1 +
 4 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 patches/gcc-15.1.0-x86_64-pc-elf/0001-no-red-zone.patch
 create mode 100644 patches/gcc-15.1.0-x86_64-pc-elf/0001-platform.patch

diff --git a/Makefile b/Makefile
index ab4095c..d2bffed 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,8 @@ NEWLIB_VERSION ?= 4.5.0.20241231
 TARGET ?= x86_64-pc-elf
 PLATFORM ?= x86-64
 
+IMAGE_BUILD ?= 2
+
 all:
 	podman pull docker.io/archlinux:latest
 	podman build \
@@ -16,5 +18,5 @@ all:
 		--build-arg GDB_VERSION=$(GDB_VERSION) \
 		--build-arg NEWLIB_VERSION=$(NEWLIB_VERSION) \
 		--build-arg TARGET=$(TARGET) \
-		--tag registry.gitlab.ost.ch:45023/teachos/devcontainers/$(PLATFORM):$(GCC_VERSION) \
+		--tag registry.gitlab.ost.ch:45023/teachos/devcontainers/$(PLATFORM):$(GCC_VERSION)-$(IMAGE_BUILD) \
 		.
diff --git a/patches/gcc-15.1.0-x86_64-pc-elf/0001-no-red-zone.patch b/patches/gcc-15.1.0-x86_64-pc-elf/0001-no-red-zone.patch
deleted file mode 100644
index 0c468a7..0000000
--- a/patches/gcc-15.1.0-x86_64-pc-elf/0001-no-red-zone.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- /dev/null
-+++ gcc/config/i386/t-x86_64-pc-elf
-@@ -0,0 +1,4 @@
-+MULTILIB_OPTIONS += mno-red-zone
-+MULTILIB_EXTRA_OPTS += mcmodel=large
-+MULTILIB_DIRNAMES += no-red-zone
-+CRTSTUFF_T_CFLAGS = -mcmodel=large
---- gcc/config.gcc	2024-08-01 10:17:14.000000000 +0200
-+++ gcc/config.gcc	2024-09-16 14:03:02.049140896 +0200
-@@ -1960,6 +1960,7 @@
- 	tm_file="${tm_file} i386/unix.h i386/att.h elfos.h newlib-stdint.h i386/i386elf.h"
- 	;;
- x86_64-*-elf*)
-+	tmake_file="${tmake_file} i386/t-x86_64-pc-elf"
- 	tm_file="${tm_file} i386/unix.h i386/att.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h"
- 	;;
- x86_64-*-rtems*)
diff --git a/patches/gcc-15.1.0-x86_64-pc-elf/0001-platform.patch b/patches/gcc-15.1.0-x86_64-pc-elf/0001-platform.patch
new file mode 100644
index 0000000..1b3c0f2
--- /dev/null
+++ b/patches/gcc-15.1.0-x86_64-pc-elf/0001-platform.patch
@@ -0,0 +1,15 @@
+--- /dev/null
++++ gcc/config/i386/t-x86_64-pc-elf
+@@ -0,0 +1,2 @@
++MULTILIB_EXTRA_OPTS += mno-red-zone mcmodel=large fno-gnu-tm fPIE
++CRTSTUFF_T_CFLAGS = -mno-red-zone -mcmodel=large -fno-gnu-tm -fPIE
+--- gcc/config.gcc	2024-08-01 10:17:14.000000000 +0200
++++ gcc/config.gcc	2024-09-16 14:03:02.049140896 +0200
+@@ -1960,6 +1960,7 @@
+ 	tm_file="${tm_file} i386/unix.h i386/att.h elfos.h newlib-stdint.h i386/i386elf.h"
+ 	;;
+ x86_64-*-elf*)
++	tmake_file="${tmake_file} i386/t-x86_64-pc-elf"
+ 	tm_file="${tm_file} i386/unix.h i386/att.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h"
+ 	;;
+ x86_64-*-rtems*)
diff --git a/scripts/0500-build-target-gcc.sh b/scripts/0500-build-target-gcc.sh
index e1ca9c7..913405f 100755
--- a/scripts/0500-build-target-gcc.sh
+++ b/scripts/0500-build-target-gcc.sh
@@ -11,6 +11,7 @@ PATH=/opt/bootstrap/bin:/opt/toolchain/bin:$PATH
 ../gcc-$GCC_VERSION/configure \
   --disable-hosted-libstdcxx         \
   --disable-nls                      \
+  --disable-tm-clone-registry        \
   --disable-wchar_t                  \
   --enable-cxx-flags=-fno-exceptions \
   --enable-default-pie               \
-- 
cgit v1.2.3