From 536616b7754a1f52397c87ae668a45d60e2293d5 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 29 Jan 2015 19:36:03 +0100
Subject: [PATCH] acinclude.m4 (VTV_CYGMIN): Use x$vtv_cygmin = xyes instead of
$vtv_cygmin = yes.
* acinclude.m4 (VTV_CYGMIN): Use x$vtv_cygmin = xyes instead of
$vtv_cygmin = yes. Initialize vtv_cygmin=no unconditionally first.
* configure: Regenerated.
From-SVN: r220259
---
libstdc++-v3/ChangeLog | 6 ++++++
libstdc++-v3/acinclude.m4 | 7 +++----
libstdc++-v3/configure | 17 ++++++++---------
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6466444c8004..c23fa0d40405 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-29 Jakub Jelinek <jakub@redhat.com>
+
+ * acinclude.m4 (VTV_CYGMIN): Use x$vtv_cygmin = xyes instead of
+ $vtv_cygmin = yes. Initialize vtv_cygmin=no unconditionally first.
+ * configure: Regenerated.
+
2015-01-29 H.J. Lu <hongjiu.lu@intel.com>
* acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY): Define VTV_CYGMIN
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 02ca3f364790..17271403afec 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -2320,15 +2320,15 @@ AC_DEFUN([GLIBCXX_ENABLE_VTABLE_VERIFY], [
AC_MSG_CHECKING([for vtable verify support])
AC_MSG_RESULT([$enable_vtable_verify])
+ vtv_cygmin=no
if test $enable_vtable_verify = yes; then
case ${target_os} in
cygwin*|mingw32*)
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-lvtv,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
- vtv_cygmin="yes"
+ vtv_cygmin=yes
;;
*)
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
- vtv_cygmin="no"
;;
esac
VTV_PCH_CXXFLAGS="-fvtable-verify=std"
@@ -2339,11 +2339,10 @@ AC_DEFUN([GLIBCXX_ENABLE_VTABLE_VERIFY], [
VTV_CXXLINKFLAGS=
fi
- AM_CONDITIONAL(VTV_CYGMIN, test $vtv_cygmin = yes)
-
AC_SUBST(VTV_CXXFLAGS)
AC_SUBST(VTV_PCH_CXXFLAGS)
AC_SUBST(VTV_CXXLINKFLAGS)
+ AM_CONDITIONAL(VTV_CYGMIN, test x$vtv_cygmin = xyes)
GLIBCXX_CONDITIONAL(ENABLE_VTABLE_VERIFY, test $enable_vtable_verify = yes)
])
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index cbaaaff73a19..acd8c6018ffc 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -671,11 +671,11 @@ SECTION_LDFLAGS
GLIBCXX_LIBS
ENABLE_VTABLE_VERIFY_FALSE
ENABLE_VTABLE_VERIFY_TRUE
+VTV_CYGMIN_FALSE
+VTV_CYGMIN_TRUE
VTV_CXXLINKFLAGS
VTV_PCH_CXXFLAGS
VTV_CXXFLAGS
-VTV_CYGMIN_FALSE
-VTV_CYGMIN_TRUE
ENABLE_WERROR_FALSE
ENABLE_WERROR_TRUE
ENABLE_PYTHONDIR_FALSE
@@ -17459,15 +17459,15 @@ $as_echo_n "checking for vtable verify support... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vtable_verify" >&5
$as_echo "$enable_vtable_verify" >&6; }
+ vtv_cygmin=no
if test $enable_vtable_verify = yes; then
case ${target_os} in
cygwin*|mingw32*)
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-lvtv,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
- vtv_cygmin="yes"
+ vtv_cygmin=yes
;;
*)
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
- vtv_cygmin="no"
;;
esac
VTV_PCH_CXXFLAGS="-fvtable-verify=std"
@@ -17478,7 +17478,10 @@ $as_echo "$enable_vtable_verify" >&6; }
VTV_CXXLINKFLAGS=
fi
- if test $vtv_cygmin = yes; then
+
+
+
+ if test x$vtv_cygmin = xyes; then
VTV_CYGMIN_TRUE=
VTV_CYGMIN_FALSE='#'
else
@@ -17489,10 +17492,6 @@ fi
-
-
-
-
# Checks for operating systems support that doesn't require linking.
--
GitLab