On 22/10/20 09:58 +0200, Olivier Hainque wrote:
Hello,
When libstdc++ is enabled for VxWorks, the high level
libstdc++-v3 configuration bits should apply the same
to all versions of the OS; also to vxworks7r2 in particular.
This patch adjusts the triplets matching rules accordingly.
We have been using this in gcc-9 based production toolchains
for a while, I tested that we can get a functional gcc-10 based
C++ + libstdc++ toolchain for Vx7r2 with this and sanity checked
that a build with libstdc++ enabled for VxWorks 6 passes on
mainline.
(Please CC the libstdc++ list for all lisbtdc++ patches)
Looks good, thanks.
Olivier
2010-10-21 Olivier Hainque <hain...@adacore.com>
libstdc++-v3/
* crossconfig.m4: Turn “vxworks" matcher into “vxworks*".
* configure.host: Likewise.
* configure: Regenerate.
--- 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)
--
2.17.1
