Index: libvtv/Makefile.am
===================================================================
--- libvtv/Makefile.am	(revision 202504)
+++ libvtv/Makefile.am	(working copy)
@@ -19,7 +19,11 @@
 ## along with this library; see the file COPYING3.  If not see
 ## <http://www.gnu.org/licenses/>.
 
-SUBDIRS = testsuite
+if ENABLE_VTABLE_VERIFY
+  SUBDIRS = testsuite
+else
+  SUBDIRS=
+endif
 
 ACLOCAL_AMFLAGS = -I .. -I ../config
 
@@ -63,8 +67,13 @@ vtv_end.c:
 	rm -f $@
 	$(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@
 
-libvtv_la_SOURCES = $(vtv_sources)
-libvtv_include_HEADERS = $(vtv_headers)
+if ENABLE_VTABLE_VERIFY
+  libvtv_la_SOURCES = $(vtv_sources)
+  libvtv_include_HEADERS = $(vtv_headers)
+else
+  libvtv_la_SOURCES =
+  libvtv_include_HEADERS =
+endif
 
 # Least ordering for dependencies mean linking w/o libstdc++ for as
 # long as the development of libvtv does not absolutely require it.
Index: libvtv/configure.ac
===================================================================
--- libvtv/configure.ac	(revision 202504)
+++ libvtv/configure.ac	(working copy)
@@ -27,6 +27,18 @@ target_alias=${target_alias-$host_alias}
 AC_SUBST(target_alias)
 GCC_LIBSTDCXX_RAW_CXX_FLAGS
 
+# 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])
@@ -36,9 +48,12 @@ AC_MSG_RESULT($VTV_SUPPORTED)
 # Decide if it's usable.
 use_vtable_verify=no
 if test "x$VTV_SUPPORTED" = "xyes"; then
-  use_vtable_verify=yes
-  AC_MSG_NOTICE(using vtable verification)
+  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)
 
 AM_INIT_AUTOMAKE(foreign no-dist)
 AM_ENABLE_MULTILIB(, ..)