summaryrefslogtreecommitdiff
path: root/libvtv
diff options
context:
space:
mode:
authorbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>2013-08-07 23:40:49 +0000
committerbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>2013-08-07 23:40:49 +0000
commit0adca0561a9541e61b48d62bce5762313e745709 (patch)
tree0fc17ee70a3ffdba97eb50442871c4f2fe15a091 /libvtv
parent81d635d9636fafae8379a45c761bcfb6ac3e73bf (diff)
downloadgcc-0adca0561a9541e61b48d62bce5762313e745709.tar.gz
2013-08-07 Benjamin Kosnik <bkoz@rehat.com>
* Makefile.am (SUBDIRS): Protect with ENABLE_VTABLE_VERIFY. * Makefile.in: Regenerate. * acinclude.m4 (LIBVTV_CONFIGURE): Move parts to.. * configure.ac: ...here. Make configure more verbose, re-order. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@201585 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libvtv')
-rw-r--r--libvtv/ChangeLog8
-rw-r--r--libvtv/Makefile.am4
-rw-r--r--libvtv/Makefile.in7
-rw-r--r--libvtv/acinclude.m411
-rwxr-xr-xlibvtv/configure146
-rw-r--r--libvtv/configure.ac37
6 files changed, 121 insertions, 92 deletions
diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog
index e85a9bde450..fb896cceed5 100644
--- a/libvtv/ChangeLog
+++ b/libvtv/ChangeLog
@@ -1,3 +1,11 @@
+2013-08-07 Benjamin Kosnik <bkoz@rehat.com>
+
+ * Makefile.am (SUBDIRS): Protect with ENABLE_VTABLE_VERIFY.
+ * Makefile.in: Regenerate.
+ * acinclude.m4 (LIBVTV_CONFIGURE): Move parts to..
+ * configure.ac: ...here. Make configure more verbose, re-order.
+ * configure: Regenerate.
+
2013-08-02 Caroline Tice <cmtice@google.com>
Initial check-in of new vtable verification feature.
diff --git a/libvtv/Makefile.am b/libvtv/Makefile.am
index ab3233f2d93..73acfb4e705 100644
--- a/libvtv/Makefile.am
+++ b/libvtv/Makefile.am
@@ -19,7 +19,11 @@
## along with this library; see the file COPYING3. If not see
## <http://www.gnu.org/licenses/>.
+if ENABLE_VTABLE_VERIFY
SUBDIRS = testsuite
+else
+SUBDIRS =
+endif
ACLOCAL_AMFLAGS = -I .. -I ../config
diff --git a/libvtv/Makefile.in b/libvtv/Makefile.in
index 928a05a91d2..d321bf1885c 100644
--- a/libvtv/Makefile.in
+++ b/libvtv/Makefile.in
@@ -37,7 +37,7 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/../mkinstalldirs $(srcdir)/../depcomp \
$(am__libvtv_include_HEADERS_DIST)
@@ -127,7 +127,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = testsuite
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
@@ -265,7 +265,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
toplevel_builddir = @toplevel_builddir@
toplevel_srcdir = @toplevel_srcdir@
-SUBDIRS = testsuite
+@ENABLE_VTABLE_VERIFY_FALSE@SUBDIRS =
+@ENABLE_VTABLE_VERIFY_TRUE@SUBDIRS = testsuite
ACLOCAL_AMFLAGS = -I .. -I ../config
# May be used by toolexeclibdir.
diff --git a/libvtv/acinclude.m4 b/libvtv/acinclude.m4
index 6faca986edd..53e62d24c11 100644
--- a/libvtv/acinclude.m4
+++ b/libvtv/acinclude.m4
@@ -30,17 +30,6 @@ dnl - lots of tools, like CC and CXX
dnl
AC_DEFUN([LIBVTV_CONFIGURE], [
- # Use same top-level configure hooks in libgcc/libstdc++/libvtv.
- AC_ARG_ENABLE(vtable-verify,
- [ --enable-vtable-verify Enable vtable verification feature ],
- [case "$enableval" in
- yes) enable_vtable_verify=yes ;;
- no) enable_vtable_verify=no ;;
- *) enable_vtable_verify=no;;
- esac],
- [enable_vtable_verify=no])
- AM_CONDITIONAL(ENABLE_VTABLE_VERIFY, test $enable_vtable_verify = yes)
-
# These need to be absolute paths, yet at the same time need to
# canonicalize only relative paths, because then amd will not unmount
# drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
diff --git a/libvtv/configure b/libvtv/configure
index 2aeb42cb39b..43865283321 100755
--- a/libvtv/configure
+++ b/libvtv/configure
@@ -602,14 +602,6 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
-VTV_SUPPORTED_FALSE
-VTV_SUPPORTED_TRUE
-toplevel_srcdir
-toplevel_builddir
-libvtv_srcdir
-libvtv_builddir
-ENABLE_VTABLE_VERIFY_FALSE
-ENABLE_VTABLE_VERIFY_TRUE
XCFLAGS
libtool_VERSION
enable_static
@@ -661,6 +653,10 @@ CFLAGS
CC
toolexeclibdir
toolexecdir
+toplevel_srcdir
+toplevel_builddir
+libvtv_srcdir
+libvtv_builddir
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -703,6 +699,8 @@ build_os
build_vendor
build_cpu
build
+ENABLE_VTABLE_VERIFY_FALSE
+ENABLE_VTABLE_VERIFY_TRUE
target_alias
host_alias
build_alias
@@ -745,6 +743,7 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_version_specific_runtime_libs
+enable_vtable_verify
enable_multilib
enable_maintainer_mode
enable_dependency_tracking
@@ -754,7 +753,6 @@ with_pic
enable_fast_install
with_gnu_ld
enable_libtool_lock
-enable_vtable_verify
'
ac_precious_vars='build_alias
host_alias
@@ -1383,6 +1381,7 @@ Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory
+ --enable-vtable-verify Enable vtable verification feature
--enable-multilib build many library versions (default)
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
@@ -1393,7 +1392,6 @@ Optional Features:
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
- --enable-vtable-verify Enable vtable verification feature
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -2254,6 +2252,49 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $version_specific_libs" >&5
$as_echo "$version_specific_libs" >&6; }
+# Use same top-level configure hooks in libgcc/libstdc++/libvtv.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-vtable-verify" >&5
+$as_echo_n "checking for --enable-vtable-verify... " >&6; }
+# Check whether --enable-vtable-verify was given.
+if test "${enable_vtable_verify+set}" = set; then :
+ enableval=$enable_vtable_verify; case "$enableval" in
+ yes) enable_vtable_verify=yes ;;
+ no) enable_vtable_verify=no ;;
+ *) enable_vtable_verify=no;;
+ esac
+else
+ enable_vtable_verify=no
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vtable_verify" >&5
+$as_echo "$enable_vtable_verify" >&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
+ if test "x$enable_vtable_verify" = "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
+fi
+ if test $use_vtable_verify = yes; then
+ ENABLE_VTABLE_VERIFY_TRUE=
+ ENABLE_VTABLE_VERIFY_FALSE='#'
+else
+ ENABLE_VTABLE_VERIFY_TRUE='#'
+ ENABLE_VTABLE_VERIFY_FALSE=
+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=
@@ -2960,6 +3001,24 @@ fi
+
+
+ # These need to be absolute paths, yet at the same time need to
+ # canonicalize only relative paths, because then amd will not unmount
+ # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
+ libvtv_builddir=`${PWDCMD-pwd}`
+ case $srcdir in
+ \\/$* | ?:\\/*) libvtv_srcdir=${srcdir} ;;
+ *) libvtv_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
+ esac
+ toplevel_builddir=${libvtv_builddir}/..
+ toplevel_srcdir=${libvtv_srcdir}/..
+
+
+
+
+
+
# Calculate toolexeclibdir
# Also toolexecdir, though it's only used in toolexeclibdir
case ${version_specific_libs} in
@@ -11217,7 +11276,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11220 "configure"
+#line 11279 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11323,7 +11382,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11326 "configure"
+#line 11385 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14592,57 +14651,6 @@ else
multilib_arg=
fi
-
-
- # Use same top-level configure hooks in libgcc/libstdc++/libvtv.
- # Check whether --enable-vtable-verify was given.
-if test "${enable_vtable_verify+set}" = set; then :
- enableval=$enable_vtable_verify; case "$enableval" in
- yes) enable_vtable_verify=yes ;;
- no) enable_vtable_verify=no ;;
- *) enable_vtable_verify=no;;
- esac
-else
- enable_vtable_verify=no
-fi
-
- if test $enable_vtable_verify = yes; then
- ENABLE_VTABLE_VERIFY_TRUE=
- ENABLE_VTABLE_VERIFY_FALSE='#'
-else
- ENABLE_VTABLE_VERIFY_TRUE='#'
- ENABLE_VTABLE_VERIFY_FALSE=
-fi
-
-
- # These need to be absolute paths, yet at the same time need to
- # canonicalize only relative paths, because then amd will not unmount
- # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
- libvtv_builddir=`${PWDCMD-pwd}`
- case $srcdir in
- \\/$* | ?:\\/*) libvtv_srcdir=${srcdir} ;;
- *) libvtv_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
- esac
- toplevel_builddir=${libvtv_builddir}/..
- toplevel_srcdir=${libvtv_srcdir}/..
-
-
-
-
-
-
-# Get target configury.
-unset VTV_SUPPORTED
-. ${srcdir}/configure.tgt
- if test "x$VTV_SUPPORTED" = "xyes"; then
- VTV_SUPPORTED_TRUE=
- VTV_SUPPORTED_FALSE='#'
-else
- VTV_SUPPORTED_TRUE='#'
- VTV_SUPPORTED_FALSE=
-fi
-
-
ac_config_files="$ac_config_files Makefile"
@@ -14784,6 +14792,10 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
+if test -z "${ENABLE_VTABLE_VERIFY_TRUE}" && test -z "${ENABLE_VTABLE_VERIFY_FALSE}"; then
+ as_fn_error "conditional \"ENABLE_VTABLE_VERIFY\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -14808,14 +14820,6 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
as_fn_error "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${ENABLE_VTABLE_VERIFY_TRUE}" && test -z "${ENABLE_VTABLE_VERIFY_FALSE}"; then
- as_fn_error "conditional \"ENABLE_VTABLE_VERIFY\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${VTV_SUPPORTED_TRUE}" && test -z "${VTV_SUPPORTED_FALSE}"; then
- as_fn_error "conditional \"VTV_SUPPORTED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
diff --git a/libvtv/configure.ac b/libvtv/configure.ac
index cc8e28098ed..47243122616 100644
--- a/libvtv/configure.ac
+++ b/libvtv/configure.ac
@@ -20,6 +20,34 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
[version_specific_libs=no])
AC_MSG_RESULT($version_specific_libs)
+# Use same top-level configure hooks in libgcc/libstdc++/libvtv.
+AC_MSG_CHECKING([for --enable-vtable-verify])
+AC_ARG_ENABLE(vtable-verify,
+[ --enable-vtable-verify Enable vtable verification feature ],
+[case "$enableval" in
+ yes) enable_vtable_verify=yes ;;
+ no) enable_vtable_verify=no ;;
+ *) enable_vtable_verify=no;;
+ esac],
+[enable_vtable_verify=no])
+AC_MSG_RESULT($enable_vtable_verify)
+
+# See if supported.
+unset VTV_SUPPORTED
+AC_MSG_CHECKING([for host support for vtable verification])
+. ${srcdir}/configure.tgt
+AC_MSG_RESULT($VTV_SUPPORTED)
+
+# Decide if it's usable.
+use_vtable_verify=no
+if test "x$VTV_SUPPORTED" = "xyes"; then
+ if test "x$enable_vtable_verify" = "xyes"; then
+ use_vtable_verify=yes
+ AC_MSG_NOTICE(using vtable verification)
+ fi
+fi
+AM_CONDITIONAL(ENABLE_VTABLE_VERIFY, test $use_vtable_verify = yes)
+
# 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
@@ -31,6 +59,8 @@ AM_INIT_AUTOMAKE(foreign no-dist)
AM_ENABLE_MULTILIB(, ..)
AM_MAINTAINER_MODE
+LIBVTV_CONFIGURE
+
# Calculate toolexeclibdir
# Also toolexecdir, though it's only used in toolexeclibdir
case ${version_specific_libs} in
@@ -102,13 +132,6 @@ else
multilib_arg=
fi
-LIBVTV_CONFIGURE
-
-# Get target configury.
-unset VTV_SUPPORTED
-. ${srcdir}/configure.tgt
-AM_CONDITIONAL(VTV_SUPPORTED, [test "x$VTV_SUPPORTED" = "xyes"])
-
AC_CONFIG_FILES([Makefile])
if test "x$VTV_SUPPORTED" = "xyes"; then