From d667beea36ba90bd47f1dd5f4a92a8d43a8ff207 Mon Sep 17 00:00:00 2001
From: Olivier Hainque <hainque@adacore.com>
Date: Tue, 20 Oct 2020 10:32:27 +0000
Subject: [PATCH] Scope libstdc++ configuration for vxworks to all versions
When libstdc++ is enabled, the current high level configuration
bits should apply the same to all versions of VxWorks. Adjust the
config triplets matching rules accordingly.
2010-10-21 Olivier Hainque <hainque@adacore.com>
libstdc++-v3/
* crossconfig.m4: Turn vxworks matcher into vxworks*.
* configure.host: Likewise.
* configure: Regenerate.
---
libstdc++-v3/configure | 2 +-
libstdc++-v3/configure.host | 2 +-
libstdc++-v3/crossconfig.m4 | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 7abf1b1ccc1d..0213c3c6bc42 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -73039,7 +73039,7 @@ done
CXXFLAGS="$ac_save_CXXFLAGS"
;;
- *-vxworks)
+ *-vxworks*)
$as_echo "#define HAVE_ACOSF 1" >>confdefs.h
$as_echo "#define HAVE_ASINF 1" >>confdefs.h
diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index 8d1b60804f3d..ec32980aa0db 100644
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -303,7 +303,7 @@ case "${host_os}" in
tpf)
os_include_dir="os/tpf"
;;
- vxworks)
+ vxworks*)
os_include_dir="os/vxworks"
;;
*)
diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
index 9f2589b739eb..ff44d5ae0199 100644
--- a/libstdc++-v3/crossconfig.m4
+++ b/libstdc++-v3/crossconfig.m4
@@ -276,7 +276,7 @@ case "${host}" in
GLIBCXX_CHECK_MATH_SUPPORT
GLIBCXX_CHECK_STDLIB_SUPPORT
;;
- *-vxworks)
+ *-vxworks*)
AC_DEFINE(HAVE_ACOSF)
AC_DEFINE(HAVE_ASINF)
AC_DEFINE(HAVE_ATAN2F)
--
GitLab