From d6d7afcdbc04adb0ec42a44b2d7e05600945af42 Mon Sep 17 00:00:00 2001
From: Zac Walker <zacwalker@microsoft.com>
Date: Mon, 12 Feb 2024 15:22:47 +0100
Subject: [PATCH] Add aarch64-w64-mingw32 target to libgcc
Reuse MinGW definitions from i386 for libgcc. Move reused files to
libgcc/config/mingw folder.
libgcc/ChangeLog:
* config.host: Add aarch64-w64-mingw32 target. Adjust targets
after moving MinGW files.
* config/i386/t-gthr-win32: Move to...
* config/mingw/t-gthr-win32: ...here.
* config/i386/t-mingw-pthread: Move to...
* config/mingw/t-mingw-pthread: ...here.
* config/aarch64/t-no-eh: New file. EH is not yet implemented for
the target, and the default definition should be disabled.
---
libgcc/config.host | 23 +++++++++++++++----
libgcc/config/aarch64/t-no-eh | 2 ++
libgcc/config/{i386 => mingw}/t-gthr-win32 | 0
libgcc/config/{i386 => mingw}/t-mingw-pthread | 0
4 files changed, 21 insertions(+), 4 deletions(-)
create mode 100644 libgcc/config/aarch64/t-no-eh
rename libgcc/config/{i386 => mingw}/t-gthr-win32 (100%)
rename libgcc/config/{i386 => mingw}/t-mingw-pthread (100%)
diff --git a/libgcc/config.host b/libgcc/config.host
index a8e465aa3abb..694602d31859 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -452,6 +452,21 @@ aarch64*-*-vxworks7*)
tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm"
tmake_file="${tmake_file} t-dfprules"
;;
+aarch64-*-mingw*)
+ case ${target_thread_file} in
+ win32)
+ tmake_thr_file="mingw/t-gthr-win32"
+ ;;
+ posix)
+ tmake_thr_file="mingw/t-mingw-pthread"
+ ;;
+ esac
+ tmake_file="${tmake_file} ${cpu_type}/t-no-eh ${tmake_thr_file}"
+ tmake_file="${tmake_file} t-dfprules"
+ tmake_file="${tmake_file} ${cpu_type}/t-aarch64"
+ tmake_file="${tmake_file} ${cpu_type}/t-lse"
+ tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm"
+ ;;
alpha*-*-linux*)
tmake_file="${tmake_file} alpha/t-alpha alpha/t-ieee t-crtfm alpha/t-linux"
extra_parts="$extra_parts crtfastmath.o"
@@ -870,10 +885,10 @@ i[34567]86-*-mingw*)
fi
case ${target_thread_file} in
win32)
- tmake_thr_file="i386/t-gthr-win32"
+ tmake_thr_file="mingw/t-gthr-win32"
;;
posix)
- tmake_thr_file="i386/t-mingw-pthread"
+ tmake_thr_file="mingw/t-mingw-pthread"
;;
mcf)
tmake_thr_file="i386/t-mingw-mcfgthread"
@@ -897,10 +912,10 @@ i[34567]86-*-mingw*)
x86_64-*-mingw*)
case ${target_thread_file} in
win32)
- tmake_thr_file="i386/t-gthr-win32"
+ tmake_thr_file="mingw/t-gthr-win32"
;;
posix)
- tmake_thr_file="i386/t-mingw-pthread"
+ tmake_thr_file="mingw/t-mingw-pthread"
;;
mcf)
tmake_thr_file="i386/t-mingw-mcfgthread"
diff --git a/libgcc/config/aarch64/t-no-eh b/libgcc/config/aarch64/t-no-eh
new file mode 100644
index 000000000000..1802339a5834
--- /dev/null
+++ b/libgcc/config/aarch64/t-no-eh
@@ -0,0 +1,2 @@
+# Not using EH
+LIB2ADDEH =
diff --git a/libgcc/config/i386/t-gthr-win32 b/libgcc/config/mingw/t-gthr-win32
similarity index 100%
rename from libgcc/config/i386/t-gthr-win32
rename to libgcc/config/mingw/t-gthr-win32
diff --git a/libgcc/config/i386/t-mingw-pthread b/libgcc/config/mingw/t-mingw-pthread
similarity index 100%
rename from libgcc/config/i386/t-mingw-pthread
rename to libgcc/config/mingw/t-mingw-pthread
--
GitLab