From cfdd7f348e16fee81f5e772c6542db3ae7192206 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 14 Sep 2023 00:34:22 -0400 Subject: [PATCH] `windows-gnu` -> `windows-mingw` `windows-gnu` has been used by LLVM and Rust to mean MinGW, but many people on the mailing list object that it is in no way bona fide GNU on Windows. Even under the interpretation of `-gnu` as a libc which LLVM often goes with, it doesn't pass muster either because MinGW uses msvcrt/ucrt, not any GNU libc. Arguably Cygwin, using a modified (GNU) Newlib, is the closest thing we have to "GNU on Windows" today. "MinGW" stands for "Minimalist GNU for Windows", and so `windows-mingw` redundantly both has "windows" and the second "w". However "mingw" is a well-known years old name at this point, and there certainly could be other "Minimalist GNU"s, so its best to treat the contraction as a black box rather than try to decompose it into its constituent pieces. --- config.sub | 4 ++-- testsuite/config-sub.data | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.sub b/config.sub index 6ae2502..b5c84eb 100755 --- a/config.sub +++ b/config.sub @@ -1724,7 +1724,7 @@ case $os in | udi* | lites* | ieee* | go32* | aux* | hcos* \ | chorusrdb* | cegcc* | glidix* | serenity* \ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ - | midipix* | mingw32* | mingw64* | mint* \ + | midipix* | mingw* | mint* \ | uxpv* | beos* | mpeix* | udk* | moxiebox* \ | interix* | uwin* | mks* | rhapsody* | darwin* \ | openstep* | oskit* | conix* | pw32* | nonstopux* \ @@ -1763,7 +1763,7 @@ case $kernel-$os in ;; managarm-mlibc* | managarm-kernel* ) ;; - windows*-gnu* | windows*-msvc*) + windows*-mingw* | windows*-msvc*) ;; -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* ) # These are just libc implementations, not actual OSes, and thus diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data index ba934b6..b2d713f 100644 --- a/testsuite/config-sub.data +++ b/testsuite/config-sub.data @@ -886,7 +886,7 @@ x86_64-sortix x86_64-pc-sortix x86_64-twizzler x86_64-pc-twizzler x86_64-unknown-ptx x86_64-sequent-ptx x86_64-windows x86_64-pc-windows -x86_64-windows-gnu x86_64-pc-windows-gnu +x86_64-windows-mingw x86_64-pc-windows-mingw x86_64-windows-msvc x86_64-pc-windows-msvc x86_64-wrs-vxworks x86_64-wrs-vxworks x86_64-wrs-vxworks-simlinux x86_64-wrs-vxworks-simlinux