From f5ebad64c9c183ce74be1d0320f9e33c1891cf84 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 10 Sep 2013 16:00:13 +0000 Subject: [PATCH] Move VTV_SUPPORTED check after AC_CANONICAL_SYSTEM PR other/58374 * configure.ac: Move VTV_SUPPORTED check after AC_CANONICAL_SYSTEM. * configure: Regenerated. From-SVN: r202470 --- libvtv/ChangeLog | 6 ++++++ libvtv/configure | 32 ++++++++++++++++---------------- libvtv/configure.ac | 14 +++++++------- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog index 20092f4d0a3..3c344f9253e 100644 --- a/libvtv/ChangeLog +++ b/libvtv/ChangeLog @@ -1,3 +1,9 @@ +2013-09-09 H.J. Lu + + PR other/58374 + * configure.ac: Move VTV_SUPPORTED check after AC_CANONICAL_SYSTEM. + * configure: Regenerated. + 2013-09-08 Caroline Tice * testsuite/event-main.cc: Move to libvtv.cc subdirectory. diff --git a/libvtv/configure b/libvtv/configure index bb56cb0cb97..0bd614a0db4 100755 --- a/libvtv/configure +++ b/libvtv/configure @@ -2339,22 +2339,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version_specific_libs" >&5 $as_echo "$version_specific_libs" >&6; } -# See if supported. -unset VTV_SUPPORTED -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for host support for vtable verification" >&5 -$as_echo_n "checking for host support for vtable verification... " >&6; } -. ${srcdir}/configure.tgt -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $VTV_SUPPORTED" >&5 -$as_echo "$VTV_SUPPORTED" >&6; } - -# Decide if it's usable. -use_vtable_verify=no -if test "x$VTV_SUPPORTED" = "xyes"; then - use_vtable_verify=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: using vtable verification" >&5 -$as_echo "$as_me: using vtable verification" >&6;} -fi - # Do not delete or change the following two lines. For why, see # http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html ac_aux_dir= @@ -2522,6 +2506,22 @@ esac +# See if supported. +unset VTV_SUPPORTED +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for host support for vtable verification" >&5 +$as_echo_n "checking for host support for vtable verification... " >&6; } +. ${srcdir}/configure.tgt +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $VTV_SUPPORTED" >&5 +$as_echo "$VTV_SUPPORTED" >&6; } + +# Decide if it's usable. +use_vtable_verify=no +if test "x$VTV_SUPPORTED" = "xyes"; then + use_vtable_verify=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: using vtable verification" >&5 +$as_echo "$as_me: using vtable verification" >&6;} +fi + am__api_version='1.11' # Find a good install program. We prefer a C program (faster), diff --git a/libvtv/configure.ac b/libvtv/configure.ac index 6db97dc60b8..e3fb92fc29e 100644 --- a/libvtv/configure.ac +++ b/libvtv/configure.ac @@ -20,6 +20,13 @@ AC_ARG_ENABLE(version-specific-runtime-libs, [version_specific_libs=no]) AC_MSG_RESULT($version_specific_libs) +# Do not delete or change the following two lines. For why, see +# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html +AC_CANONICAL_SYSTEM +target_alias=${target_alias-$host_alias} +AC_SUBST(target_alias) +GCC_LIBSTDCXX_RAW_CXX_FLAGS + # See if supported. unset VTV_SUPPORTED AC_MSG_CHECKING([for host support for vtable verification]) @@ -33,13 +40,6 @@ if test "x$VTV_SUPPORTED" = "xyes"; then AC_MSG_NOTICE(using vtable verification) fi -# Do not delete or change the following two lines. For why, see -# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html -AC_CANONICAL_SYSTEM -target_alias=${target_alias-$host_alias} -AC_SUBST(target_alias) -GCC_LIBSTDCXX_RAW_CXX_FLAGS - AM_INIT_AUTOMAKE(foreign no-dist) AM_ENABLE_MULTILIB(, ..) AM_MAINTAINER_MODE -- 2.30.2