diff options
| author | Matthias Klose <doko@ubuntu.com> | 2015-01-29 18:12:29 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2015-01-29 18:12:29 +0000 |
| commit | 23842e91352595d851d6b75fcbc5d3bd7ead4e98 (patch) | |
| tree | f630b683688a282ac45ec474a9cb7d518a21d4b3 /libstdc++-v3 | |
| parent | 8be349eea9b0ce23a058f804dfd587a58a05af2f (diff) | |
| download | gcc-23842e91352595d851d6b75fcbc5d3bd7ead4e98.zip gcc-23842e91352595d851d6b75fcbc5d3bd7ead4e98.tar.gz gcc-23842e91352595d851d6b75fcbc5d3bd7ead4e98.tar.bz2 | |
acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY): Define VTV_CYGMIN unconditionally.
2015-01-29 Matthias Klose <doko@ubuntu.com>
* acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY): Define VTV_CYGMIN
unconditionally.
* configure: Regenerate.
From-SVN: r220257
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 3 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 17 |
3 files changed, 17 insertions, 9 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c26a48e..b8e29e4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2015-01-29 Matthias Klose <doko@ubuntu.com> + + * acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY): Define VTV_CYGMIN + unconditionally. + * configure: Regenerate. + 2015-01-29 Caroline Tice <cmtice@google.com> Committing VTV Cywin/Ming patch for Patrick Wollgast diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 59df22d..2084422 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -2320,6 +2320,8 @@ AC_DEFUN([GLIBCXX_ENABLE_VTABLE_VERIFY], [ AC_MSG_CHECKING([for vtable verify support]) AC_MSG_RESULT([$enable_vtable_verify]) + AM_CONDITIONAL(VTV_CYGMIN, test $vtv_cygmin = yes) + if test $enable_vtable_verify = yes; then case ${target_os} in cygwin*|mingw32*) @@ -2331,7 +2333,6 @@ AC_DEFUN([GLIBCXX_ENABLE_VTABLE_VERIFY], [ vtv_cygmin="no" ;; esac - AM_CONDITIONAL(VTV_CYGMIN, test $vtv_cygmin = yes) VTV_PCH_CXXFLAGS="-fvtable-verify=std" VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs" else diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 07e7773..9078ce4 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -17459,6 +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; } + if test $vtv_cygmin = yes; then + VTV_CYGMIN_TRUE= + VTV_CYGMIN_FALSE='#' +else + VTV_CYGMIN_TRUE='#' + VTV_CYGMIN_FALSE= +fi + + if test $enable_vtable_verify = yes; then case ${target_os} in cygwin*|mingw32*) @@ -17470,14 +17479,6 @@ $as_echo "$enable_vtable_verify" >&6; } vtv_cygmin="no" ;; esac - if test $vtv_cygmin = yes; then - VTV_CYGMIN_TRUE= - VTV_CYGMIN_FALSE='#' -else - VTV_CYGMIN_TRUE='#' - VTV_CYGMIN_FALSE= -fi - VTV_PCH_CXXFLAGS="-fvtable-verify=std" VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs" else |