Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update host toolchain #682

Merged
merged 3 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,12 @@ if [[ -n $PROVIDED_TOOLCHAIN ]] ; then
i686_HOST_MINGW_PATH=$TOOLCHAINS_DIR/mingw32
x86_64_HOST_MINGW_PATH=$TOOLCHAINS_DIR/mingw64
else
# The host toolchains for sjlj exception model are no longer officially provided.
# Rather than trying to download non-existent files, tell the user to install one manually.
[[ $EXCEPTIONS_MODEL == sjlj ]] && {
die "host toolchains for sjlj exception model must be installed manually (--provided-toolchain=...). terminate."
}

echo "Using downloaded toolchain"
fi

Expand Down
6 changes: 3 additions & 3 deletions library/config-win.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@

# **************************************************************************

readonly HOST_MINGW_VERSION=12.2.0
readonly HOST_MINGW_RT_VERSION=10
readonly HOST_MINGW_BUILD_REV=2
readonly HOST_MINGW_VERSION=14.2.0
readonly HOST_MINGW_RT_VERSION=12
readonly HOST_MINGW_BUILD_REV=0
readonly i686_HOST_MINGW_PATH_URL="https://github.com/niXman/mingw-builds-binaries/releases/download/$HOST_MINGW_VERSION-rt_v$HOST_MINGW_RT_VERSION-rev$HOST_MINGW_BUILD_REV/i686-$HOST_MINGW_VERSION-release-posix-{exceptions}-{msvcrt}-rt_v$HOST_MINGW_RT_VERSION-rev$HOST_MINGW_BUILD_REV.7z"
readonly x86_64_HOST_MINGW_PATH_URL="https://github.com/niXman/mingw-builds-binaries/releases/download/$HOST_MINGW_VERSION-rt_v$HOST_MINGW_RT_VERSION-rev$HOST_MINGW_BUILD_REV/x86_64-$HOST_MINGW_VERSION-release-posix-{exceptions}-{msvcrt}-rt_v$HOST_MINGW_RT_VERSION-rev$HOST_MINGW_BUILD_REV.7z"

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,247 @@
diff --git a/mingw-w64-crt/lib-common/msvcr120_app.def.in b/mingw-w64-crt/lib-common/msvcr120_app.def.in
index 67f8f8a57..1788601f4 100644
--- a/mingw-w64-crt/lib-common/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib-common/msvcr120_app.def.in
@@ -1870,7 +1870,7 @@ F_NON_I386(atanf)
atanh
atanhf
F_ARM32(atanhl) ; Can't use long double functions from the CRT on x86
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/lib32/msvcr120.def.in b/mingw-w64-crt/lib32/msvcr120.def.in
index f45289898..24c3126ae 100644
--- a/mingw-w64-crt/lib32/msvcr120.def.in
+++ b/mingw-w64-crt/lib32/msvcr120.def.in
@@ -1846,7 +1846,7 @@ atan2
atanh
atanhf
; atanhl ; Can't use long double functions from the CRT on x86
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/lib32/msvcr120d.def.in b/mingw-w64-crt/lib32/msvcr120d.def.in
index f30ae72e1..8b46a9725 100644
--- a/mingw-w64-crt/lib32/msvcr120d.def.in
+++ b/mingw-w64-crt/lib32/msvcr120d.def.in
@@ -1913,7 +1913,7 @@ atan2
atanh
atanhf
; atanhl ; Can't use long double functions from the CRT on x86
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/lib32/msvcr40d.def.in b/mingw-w64-crt/lib32/msvcr40d.def.in
index 2d0af6c7d..278aa7740 100644
--- a/mingw-w64-crt/lib32/msvcr40d.def.in
+++ b/mingw-w64-crt/lib32/msvcr40d.def.in
@@ -1461,7 +1461,7 @@ asctime
asin
atan
atan2
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/lib32/msvcr70.def.in b/mingw-w64-crt/lib32/msvcr70.def.in
index c167523e7..6a302611f 100644
--- a/mingw-w64-crt/lib32/msvcr70.def.in
+++ b/mingw-w64-crt/lib32/msvcr70.def.in
@@ -711,7 +711,7 @@ asctime
asin
atan
atan2
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/lib32/msvcr70d.def.in b/mingw-w64-crt/lib32/msvcr70d.def.in
index bc5a32b6a..eb10ee400 100644
--- a/mingw-w64-crt/lib32/msvcr70d.def.in
+++ b/mingw-w64-crt/lib32/msvcr70d.def.in
@@ -755,7 +755,7 @@ asctime
asin
atan
atan2
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/lib32/msvcr71.def.in b/mingw-w64-crt/lib32/msvcr71.def.in
index c1b7ce2d1..63e63bf06 100644
--- a/mingw-w64-crt/lib32/msvcr71.def.in
+++ b/mingw-w64-crt/lib32/msvcr71.def.in
@@ -705,7 +705,7 @@ asctime
asin
atan
atan2
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/lib32/msvcr71d.def.in b/mingw-w64-crt/lib32/msvcr71d.def.in
index 806602207..c6b60f98b 100644
--- a/mingw-w64-crt/lib32/msvcr71d.def.in
+++ b/mingw-w64-crt/lib32/msvcr71d.def.in
@@ -749,7 +749,7 @@ asctime
asin
atan
atan2
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/lib32/msvcrt10.def.in b/mingw-w64-crt/lib32/msvcrt10.def.in
index 66cb07c15..f5e58a273 100644
--- a/mingw-w64-crt/lib32/msvcrt10.def.in
+++ b/mingw-w64-crt/lib32/msvcrt10.def.in
@@ -1112,7 +1112,7 @@ asctime
asin
atan
atan2
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/lib32/msvcrt20.def.in b/mingw-w64-crt/lib32/msvcrt20.def.in
index 7330274d6..df69e69ca 100644
--- a/mingw-w64-crt/lib32/msvcrt20.def.in
+++ b/mingw-w64-crt/lib32/msvcrt20.def.in
@@ -1329,7 +1329,7 @@ asctime
asin
atan
atan2
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/lib32/msvcrt40.def.in b/mingw-w64-crt/lib32/msvcrt40.def.in
index 26a7453cc..98dc2015e 100644
--- a/mingw-w64-crt/lib32/msvcrt40.def.in
+++ b/mingw-w64-crt/lib32/msvcrt40.def.in
@@ -1429,7 +1429,7 @@ asctime
asin
atan
atan2
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/lib32/msvcrtd.def.in b/mingw-w64-crt/lib32/msvcrtd.def.in
index ee6670030..a0823f422 100644
--- a/mingw-w64-crt/lib32/msvcrtd.def.in
+++ b/mingw-w64-crt/lib32/msvcrtd.def.in
@@ -655,7 +655,7 @@ asctime
asin
atan
atan2
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/lib64/msvcr120.def.in b/mingw-w64-crt/lib64/msvcr120.def.in
index 65637518b..ab4912db4 100644
--- a/mingw-w64-crt/lib64/msvcr120.def.in
+++ b/mingw-w64-crt/lib64/msvcr120.def.in
@@ -1788,7 +1788,7 @@ atanf
atanh
atanhf
; atanhl ; Can't use long double functions from the CRT on x86
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/lib64/msvcr120d.def.in b/mingw-w64-crt/lib64/msvcr120d.def.in
index 5d975164d..f61eb41f6 100644
--- a/mingw-w64-crt/lib64/msvcr120d.def.in
+++ b/mingw-w64-crt/lib64/msvcr120d.def.in
@@ -1853,7 +1853,7 @@ atanf
atanh
atanhf
; atanhl ; Can't use long double functions from the CRT on x86
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/libarm32/kernelbase.def b/mingw-w64-crt/libarm32/kernelbase.def
index 954ea2dc1..d6a487db1 100644
--- a/mingw-w64-crt/libarm32/kernelbase.def
+++ b/mingw-w64-crt/libarm32/kernelbase.def
@@ -1889,7 +1889,7 @@ _invalid_parameter
_onexit
_purecall
_time64
-atexit
+atexit DATA
exit
hgets
hwprintf
diff --git a/mingw-w64-crt/libarm32/msvcr110.def.in b/mingw-w64-crt/libarm32/msvcr110.def.in
index 8f30767a8..84f46eca3 100644
--- a/mingw-w64-crt/libarm32/msvcr110.def.in
+++ b/mingw-w64-crt/libarm32/msvcr110.def.in
@@ -1716,7 +1716,7 @@ atan
atan2
atan2f
atanf
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/libarm32/msvcr110d.def.in b/mingw-w64-crt/libarm32/msvcr110d.def.in
index 5a809682d..a7aebdad6 100644
--- a/mingw-w64-crt/libarm32/msvcr110d.def.in
+++ b/mingw-w64-crt/libarm32/msvcr110d.def.in
@@ -1781,7 +1781,7 @@ atan
atan2
atan2f
atanf
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/libarm32/msvcr120.def.in b/mingw-w64-crt/libarm32/msvcr120.def.in
index 4483a2093..f94ac44f3 100644
--- a/mingw-w64-crt/libarm32/msvcr120.def.in
+++ b/mingw-w64-crt/libarm32/msvcr120.def.in
@@ -1753,7 +1753,7 @@ atanf
atanh
atanhf
atanhl
-atexit
+atexit DATA
atof
atoi
atol
diff --git a/mingw-w64-crt/libarm32/msvcr120d.def.in b/mingw-w64-crt/libarm32/msvcr120d.def.in
index 90374f7e9..9d4cec588 100644
--- a/mingw-w64-crt/libarm32/msvcr120d.def.in
+++ b/mingw-w64-crt/libarm32/msvcr120d.def.in
@@ -1818,7 +1818,7 @@ atanf
atanh
atanhf
atanhl
-atexit
+atexit DATA
atof
atoi
atol
Loading
Loading