From 28ea239c53a2d5d8800c472bc2452eaa16e37af2 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 14 Sep 2023 00:34:22 -0400 Subject: [PATCH] config.sub: Remove windows-gnu `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. We couldn't decide on what `windows-*` should replace it, or even whether there should be such a thing, so absent consensus it is better to just remove it while it is still recently added and we don't need to worry about backwards compatibility. We can always re-add it later, but we can't do nothing now and remove it later. This partially reverts commit 91f6a7f616b161c25ba2001861a40e662e18c4ad. * config.sub (windows*-gnu*): Remove. * doc/config.sub.1: Regenerate. * testsuite/config-sub.data (x86_64-windows-gnu): Remove. Signed-off-by: Dmitry V. Levin --- config.sub | 4 ++-- doc/config.sub.1 | 2 +- testsuite/config-sub.data | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config.sub b/config.sub index 51394d3..defe52c 100755 --- a/config.sub +++ b/config.sub @@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2023-09-15' +timestamp='2023-09-19' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1825,7 +1825,7 @@ case $kernel-$os-$obj in ;; managarm-mlibc*- | managarm-kernel*- ) ;; - windows*-gnu*- | windows*-msvc*-) + windows*-msvc*-) ;; -dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- ) # These are just libc implementations, not actual OSes, and thus diff --git a/doc/config.sub.1 b/doc/config.sub.1 index d5ca2a8..01102c2 100644 --- a/doc/config.sub.1 +++ b/doc/config.sub.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. -.TH CONFIG.SUB "1" "September 2023" "GNU config.sub (2023-09-15)" "User Commands" +.TH CONFIG.SUB "1" "September 2023" "GNU config.sub (2023-09-19)" "User Commands" .SH NAME config.sub \- validate and canonicalize a configuration triplet .SH SYNOPSIS diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data index 7fb234c..f36bea2 100644 --- a/testsuite/config-sub.data +++ b/testsuite/config-sub.data @@ -897,7 +897,6 @@ 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-msvc x86_64-pc-windows-msvc x86_64-wrs-vxworks x86_64-wrs-vxworks x86_64-wrs-vxworks-simlinux x86_64-wrs-vxworks-simlinux