From acb7e8bb502c0ed07aa06c35c552babf03ceb181 Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Wed, 26 Aug 2026 23:33:23 +0100
Subject: [PATCH 1/3] Remove references to HXCPP_MULTI_THREADED

All references to it were removed in 2015:
69ccf6f7c1f087793f42b28ffa170d5d180e4fd8
Since then it has had no effect.

It was partially removed in b9210d8d908bebd468d8333269cfc9ce116efb2d,
but it still remained in individual toolchains.
---
 toolchain/blackberry-toolchain.xml | 1 -
 toolchain/emscripten-toolchain.xml | 1 -
 toolchain/linux-toolchain.xml      | 1 -
 3 files changed, 3 deletions(-)

diff --git a/toolchain/blackberry-toolchain.xml b/toolchain/blackberry-toolchain.xml
index 4ae83a689..6d3d3a4d2 100644
--- a/toolchain/blackberry-toolchain.xml
+++ b/toolchain/blackberry-toolchain.xml
@@ -39,7 +39,6 @@
 	<cppflag value="-lang-c++"/>
 	<include name="toolchain/common-defines.xml" />
 	<flag value="-DHXCPP_LOAD_DEBUG" if="HXCPP_LOAD_DEBUG"/>
-	<flag value="-DHXCPP_MULTI_THREADED" if="HXCPP_MULTI_THREADED"/>
 	<flag value="-fpic"/>
 	<flag value="-fPIC"/>
 	<cppflag value="-frtti"/>
diff --git a/toolchain/emscripten-toolchain.xml b/toolchain/emscripten-toolchain.xml
index 3a5a61142..1364916b4 100644
--- a/toolchain/emscripten-toolchain.xml
+++ b/toolchain/emscripten-toolchain.xml
@@ -99,7 +99,6 @@
   <flag value="-fPIC" if="HXCPP_EMSCRIPTEN_FPIC" />
   <flag value="-DEMSCRIPTEN"/>
   <flag value="-DHXCPP_JS_PRIME" if="HXCPP_JS_PRIME" />
-  <flag value="-DHXCPP_MULTI_THREADED" if="HXCPP_MULTI_THREADED"/>
   <flag value="-DHXCPP_BIG_ENDIAN" if="HXCPP_BIG_ENDIAN"/>
   <flag value="-Wno-overflow" />
   <cppflag value="-Wno-invalid-offsetof" />
diff --git a/toolchain/linux-toolchain.xml b/toolchain/linux-toolchain.xml
index 6fd3347fa..772722f2a 100644
--- a/toolchain/linux-toolchain.xml
+++ b/toolchain/linux-toolchain.xml
@@ -47,7 +47,6 @@
   <cppflag value="-Wno-invalid-offsetof" />
   <flag value="-DHX_LINUX"/>
   <flag value="-DRASPBERRYPI=RASPBERRYPI" if="rpi"/>
-  <flag value="-DHXCPP_MULTI_THREADED" if="HXCPP_MULTI_THREADED"/>
   <flag value="-DHXCPP_BIG_ENDIAN" if="HXCPP_BIG_ENDIAN"/>
   <include name="toolchain/common-defines.xml" />
   <flag value="-m32" unless="noM32"/>

From bc7fb3ed9d5f93ee5c6a654617a543739eac85c6 Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Wed, 26 Aug 2026 23:39:45 +0100
Subject: [PATCH 2/3] Fix duplicate HXCPP_M64 on linux and mingw

-DHXCPP_M64 is already set via common-defines.xml, so it does not need
to be added explicitly by these toolchains.

This was an oversight in:
d40311269ffdd1b5c06134348e4284dfcbbdeac9
---
 toolchain/linux-toolchain.xml | 1 -
 toolchain/mingw-toolchain.xml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/toolchain/linux-toolchain.xml b/toolchain/linux-toolchain.xml
index 772722f2a..dbf012e4d 100644
--- a/toolchain/linux-toolchain.xml
+++ b/toolchain/linux-toolchain.xml
@@ -51,7 +51,6 @@
   <include name="toolchain/common-defines.xml" />
   <flag value="-m32" unless="noM32"/>
   <flag value="-m64" if="HXCPP_M64" unless="noM64" />
-  <flag value="-DHXCPP_M64" if="HXCPP_M64"/>
   <flag value="-I${HXCPP}/include"/>
   <objdir value="obj/linux${OBJEXT}/"/>
   <outflag value="-o"/>
diff --git a/toolchain/mingw-toolchain.xml b/toolchain/mingw-toolchain.xml
index c7a11fa43..e974526c3 100644
--- a/toolchain/mingw-toolchain.xml
+++ b/toolchain/mingw-toolchain.xml
@@ -43,7 +43,6 @@
   <flag value="-DHXCPP_BIG_ENDIAN" if="HXCPP_BIG_ENDIAN"/>
   <flag value="-m32" unless="HXCPP_M64"/>
   <flag value="-m64" if="HXCPP_M64"/>
-  <flag value="-DHXCPP_M64" if="HXCPP_M64"/>
   <flag value="-I${HXCPP}/include"/>
   <objdir value="obj/mingw${OBJEXT}/"/>
   <outflag value="-o"/>

From 6601847dc689bda2c38666edaaf67d02b3749b54 Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Wed, 2 Sep 2026 01:16:39 +0100
Subject: [PATCH 3/3] Remove haxe 2.10 define

Haxe 2.10 is no longer supported, and even if it was, this define
has had no effect since:
2229740ef5006d0c1951fc70f1fc5844fc6dd3b1
---
 toolchain/common-defines.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/toolchain/common-defines.xml b/toolchain/common-defines.xml
index 3d14752d4..e2f241bb4 100644
--- a/toolchain/common-defines.xml
+++ b/toolchain/common-defines.xml
@@ -7,7 +7,6 @@
  <flag value="-DHXCPP_ARMV7" if="HXCPP_ARMV7"/>
  <flag value="-DHXCPP_M64" if="HXCPP_M64||HXCPP_ARM64||HXCPP_X86_64"/>
  <flag value="-DHXCPP_VISIT_ALLOCS" tag="haxe" />
- <flag value="-Dhaxe_210" if="haxe_210" tag="haxe" />
  <flag value="-DHXCPP_FLOAT32" if="HXCPP_FLOAT32" tag="haxe" />
  <flag value="-DHXCPP_CHECK_POINTER" if="HXCPP_CHECK_POINTER" tag="haxe" />
  <flag value="-DHXCPP_STACK_TRACE" if="HXCPP_STACK_TRACE" tag="haxe" />