[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] config.sub: Accept LLVM-style $cpu-$vendor-windows-cygnus
From: |
John Ericson |
Subject: |
[PATCH] config.sub: Accept LLVM-style $cpu-$vendor-windows-cygnus |
Date: |
Wed, 16 Aug 2023 10:46:26 -0400 |
In 91f6a7f616b161c25ba2001861a40e662e18c4ad I supported `windows-gnu`
and `windows-msvc`, but I forgot about the last one: `windows-cygnus`.
This LLVM commit [1] introduced all 3. (I wish I had found it before!)
But at least we can use it to ensure I am not missing one now.
This came up in this Nixpkgs PR [2] where I was told my previous patch
only partially solved the problem, because I forgot about this case.
[1]:
https://github.com/llvm/llvm-project/commit/edbdd2e5df8b59dac8ae5f45059407f8a79850d6
[2]: https://github.com/NixOS/nixpkgs/pull/249090
---
config.sub | 6 +++---
testsuite/config-sub.data | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/config.sub b/config.sub
index 6ae2502..bea4f3a 100755
--- a/config.sub
+++ b/config.sub
@@ -1744,7 +1744,7 @@ case $os in
;;
none)
;;
- kernel* | msvc* )
+ kernel* | msvc* | cygnus* )
# Restricted further below
;;
*)
@@ -1763,7 +1763,7 @@ case $kernel-$os in
;;
managarm-mlibc* | managarm-kernel* )
;;
- windows*-gnu* | windows*-msvc*)
+ windows*-gnu* | windows*-msvc* | windows*-cygnus* )
;;
-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* )
# These are just libc implementations, not actual OSes, and thus
@@ -1779,7 +1779,7 @@ case $kernel-$os in
echo "Invalid configuration '$1': '$kernel' does not support
'$os'." 1>&2
exit 1
;;
- *-msvc* )
+ *-msvc* | *-cygnus* )
echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
exit 1
;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index ba934b6..3752f0d 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -887,6 +887,7 @@ 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-cygnus x86_64-pc-windows-cygnus
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
--
2.40.1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] config.sub: Accept LLVM-style $cpu-$vendor-windows-cygnus,
John Ericson <=