2013-07-05 Benjamin Kosnik <bkoz@redhat.com>

	* acinclude.m4: Fix configure whitespace errors.
	* libsupc++/Makefile.am (libvtv_init): Add back as
	toolexeclib_LTLIBRARIES.
	* configure: Regenerate.
	* libsupc++/Makefile.in: Same.

	* libsupc++/vtv_rts.cc: Fix typo

6 files changed, 120 insertions, 51 deletions

diff --git a/libstdc++-v3/ChangeLog.vtv b/libstdc++-v3/ChangeLog.vtv
index a58d6b377cb..6df6a6d0205 100644
--- a/libstdc++-v3/ChangeLog.vtv
+++ b/libstdc++-v3/ChangeLog.vtv
@@ -1,3 +1,13 @@
+2013-07-05  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* acinclude.m4: Fix configure whitespace errors.
+	* libsupc++/Makefile.am (libvtv_init): Add back as
+	toolexeclib_LTLIBRARIES.
+	* configure: Regenerate.
+	* libsupc++/Makefile.in: Same.
+
+	* libsupc++/vtv_rts.cc: Fix typo.
+
 2013-07-01  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* fragment.am: Remove VTV_CXXLINKFLAGS, VTV_CXXFLAGS.
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index dfec2977ee1..47350e61ac9 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -2301,12 +2301,11 @@ AC_DEFUN([GLIBCXX_ENABLE_VTABLE_VERIFY], [
   AC_MSG_RESULT([$enable_vtable_verify])
 
   if test $enable_vtable_verify = yes; then
-    VTV_CXXFLAGS =  -fvtable-verify=std \
-  		    -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end
-    VTV_CXXLINKFLAGS = -L$(top_builddir)/libsupc++/.libs -Wl,-lvtv		
+    VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
+    VTV_CXXLINKFLAGS="-L${top_builddir}/libsupc++/.libs -Wl,-lvtv"		
   else
-    VTV_CXXFLAGS = 
-    VTV_CXXLINKFLAGS = 
+    VTV_CXXFLAGS= 
+    VTV_CXXLINKFLAGS= 
   fi
 
   AC_SUBST(VTV_CXXFLAGS)
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 02906be9946..cae54ed1fb2 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -17412,12 +17412,11 @@ $as_echo_n "checking for vtable verify support... " >&6; }
 $as_echo "$enable_vtable_verify" >&6; }
 
   if test $enable_vtable_verify = yes; then
-    VTV_CXXFLAGS =  -fvtable-verify=std \
-  		    -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end
-    VTV_CXXLINKFLAGS = -L$(top_builddir)/libsupc++/.libs -Wl,-lvtv
+    VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
+    VTV_CXXLINKFLAGS="-L${top_builddir}/libsupc++/.libs -Wl,-lvtv"
   else
-    VTV_CXXFLAGS =
-    VTV_CXXLINKFLAGS =
+    VTV_CXXFLAGS=
+    VTV_CXXLINKFLAGS=
   fi
 
 
diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am
index 4fdd9f44387..1f19ecbe0bc 100644
--- a/libstdc++-v3/libsupc++/Makefile.am
+++ b/libstdc++-v3/libsupc++/Makefile.am
@@ -26,7 +26,7 @@ include $(top_srcdir)/fragment.am
 # separately too.
 # 1) separate libsupc++.la
 if ENABLE_VTABLE_VERIFY
-toolexeclib_LTLIBRARIES = libsupc++.la libvtv.la libvtv_stubs.la
+toolexeclib_LTLIBRARIES = libsupc++.la libvtv.la libvtv_stubs.la libvtv_init.la
 else
 toolexeclib_LTLIBRARIES = libsupc++.la
 endif
@@ -102,19 +102,22 @@ sources = \
 
 if ENABLE_VTABLE_VERIFY
 
-    sources += \
-	vtv_fail.cc
-
-    vtv_sources = \
-        vtv_rts.cc \
+vtv_sources = \
+	vtv_fail.cc \
         vtv_malloc.cc \
+        vtv_rts.cc \
         vtv_utils.cc
 
-    vtv_stubs_sources = \
+vtv_stubs_sources = \
         vtv_stubs.cc
 
-    libvtv_la_SOURCES = $(vtv_sources)
-    libvtv_stubs_la_SOURCES = $(vtv_stubs_sources)
+vtv_init_sources = \
+	vtv_init.cc
+
+libvtv_la_SOURCES = $(vtv_sources)
+libvtv_stubs_la_SOURCES = $(vtv_stubs_sources) 
+libvtv_init_la_SOURCES = $(vtv_init_sources) 
+
 endif
 
 libsupc___la_SOURCES = $(sources) $(c_sources)
@@ -303,3 +306,8 @@ uninstall-bitsHEADERS:
 	  q=`echo $$p | sed -e 's,.*/,,'`; \
 	  rm -f $(DESTDIR)$(bitsdir)/$$q; \
 	done
+
+
+# By adding these files here, automake will remove them for 'make clean'
+CLEANFILES = stamp-*
+
diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index b5ac0d798ab..e438df922b0 100644
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -38,9 +38,6 @@ host_triplet = @host@
 target_triplet = @target@
 DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(bits_HEADERS) $(std_HEADERS)
-@ENABLE_VTABLE_VERIFY_TRUE@am__append_1 = \
-@ENABLE_VTABLE_VERIFY_TRUE@	vtv_fail.cc
-
 subdir = libsupc++
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
@@ -94,8 +91,7 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(bitsdir)" \
 	"$(DESTDIR)$(stddir)"
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES)
 libsupc___la_LIBADD =
-@ENABLE_VTABLE_VERIFY_TRUE@am__objects_1 = vtv_fail.lo
-am__objects_2 = array_type_info.lo atexit_arm.lo atexit_thread.lo \
+am__objects_1 = array_type_info.lo atexit_arm.lo atexit_thread.lo \
 	bad_alloc.lo bad_array_length.lo bad_array_new.lo bad_cast.lo \
 	bad_typeid.lo class_type_info.lo del_op.lo del_opnt.lo \
 	del_opv.lo del_opvnt.lo dyncast.lo eh_alloc.lo eh_arm.lo \
@@ -107,26 +103,32 @@ am__objects_2 = array_type_info.lo atexit_arm.lo atexit_thread.lo \
 	nested_exception.lo new_handler.lo new_op.lo new_opnt.lo \
 	new_opv.lo new_opvnt.lo pbase_type_info.lo pmem_type_info.lo \
 	pointer_type_info.lo pure.lo si_class_type_info.lo tinfo.lo \
-	tinfo2.lo vec.lo vmi_class_type_info.lo vterminate.lo \
-	$(am__objects_1)
-@GLIBCXX_HOSTED_TRUE@am__objects_3 = cp-demangle.lo
-am_libsupc___la_OBJECTS = $(am__objects_2) $(am__objects_3)
+	tinfo2.lo vec.lo vmi_class_type_info.lo vterminate.lo
+@GLIBCXX_HOSTED_TRUE@am__objects_2 = cp-demangle.lo
+am_libsupc___la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libsupc___la_OBJECTS = $(am_libsupc___la_OBJECTS)
 @ENABLE_VTABLE_VERIFY_FALSE@am_libsupc___la_rpath = -rpath \
 @ENABLE_VTABLE_VERIFY_FALSE@	$(toolexeclibdir)
 @ENABLE_VTABLE_VERIFY_TRUE@am_libsupc___la_rpath = -rpath \
 @ENABLE_VTABLE_VERIFY_TRUE@	$(toolexeclibdir)
 libsupc__convenience_la_LIBADD =
-am_libsupc__convenience_la_OBJECTS = $(am__objects_2) $(am__objects_3)
+am_libsupc__convenience_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libsupc__convenience_la_OBJECTS =  \
 	$(am_libsupc__convenience_la_OBJECTS)
 libvtv_la_LIBADD =
-@ENABLE_VTABLE_VERIFY_TRUE@am__objects_4 = vtv_rts.lo vtv_malloc.lo \
-@ENABLE_VTABLE_VERIFY_TRUE@	vtv_utils.lo
-@ENABLE_VTABLE_VERIFY_TRUE@am_libvtv_la_OBJECTS = $(am__objects_4)
+@ENABLE_VTABLE_VERIFY_TRUE@am__objects_3 = vtv_fail.lo vtv_malloc.lo \
+@ENABLE_VTABLE_VERIFY_TRUE@	vtv_rts.lo vtv_utils.lo
+@ENABLE_VTABLE_VERIFY_TRUE@am_libvtv_la_OBJECTS = $(am__objects_3)
 libvtv_la_OBJECTS = $(am_libvtv_la_OBJECTS)
 @ENABLE_VTABLE_VERIFY_TRUE@am_libvtv_la_rpath = -rpath \
 @ENABLE_VTABLE_VERIFY_TRUE@	$(toolexeclibdir)
+libvtv_init_la_LIBADD =
+@ENABLE_VTABLE_VERIFY_TRUE@am__objects_4 = vtv_init.lo
+@ENABLE_VTABLE_VERIFY_TRUE@am_libvtv_init_la_OBJECTS =  \
+@ENABLE_VTABLE_VERIFY_TRUE@	$(am__objects_4)
+libvtv_init_la_OBJECTS = $(am_libvtv_init_la_OBJECTS)
+@ENABLE_VTABLE_VERIFY_TRUE@am_libvtv_init_la_rpath = -rpath \
+@ENABLE_VTABLE_VERIFY_TRUE@	$(toolexeclibdir)
 libvtv_stubs_la_LIBADD =
 @ENABLE_VTABLE_VERIFY_TRUE@am__objects_5 = vtv_stubs.lo
 @ENABLE_VTABLE_VERIFY_TRUE@am_libvtv_stubs_la_OBJECTS =  \
@@ -147,7 +149,8 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
 SOURCES = $(libsupc___la_SOURCES) $(libsupc__convenience_la_SOURCES) \
-	$(libvtv_la_SOURCES) $(libvtv_stubs_la_SOURCES)
+	$(libvtv_la_SOURCES) $(libvtv_init_la_SOURCES) \
+	$(libvtv_stubs_la_SOURCES)
 HEADERS = $(bits_HEADERS) $(std_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -376,7 +379,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
 # Need this library to both be part of libstdc++.a, and installed
 # separately too.
 # 1) separate libsupc++.la
-@ENABLE_VTABLE_VERIFY_TRUE@toolexeclib_LTLIBRARIES = libsupc++.la libvtv.la libvtv_stubs.la
+@ENABLE_VTABLE_VERIFY_TRUE@toolexeclib_LTLIBRARIES = libsupc++.la libvtv.la libvtv_stubs.la libvtv_init.la
 # 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
 noinst_LTLIBRARIES = libsupc++convenience.la
 std_HEADERS = \
@@ -390,30 +393,74 @@ headers = $(std_HEADERS) $(bits_HEADERS)
 @GLIBCXX_HOSTED_TRUE@c_sources = \
 @GLIBCXX_HOSTED_TRUE@	cp-demangle.c
 
-sources = array_type_info.cc atexit_arm.cc atexit_thread.cc \
-	bad_alloc.cc bad_array_length.cc bad_array_new.cc bad_cast.cc \
-	bad_typeid.cc class_type_info.cc del_op.cc del_opnt.cc \
-	del_opv.cc del_opvnt.cc dyncast.cc eh_alloc.cc eh_arm.cc \
-	eh_aux_runtime.cc eh_call.cc eh_catch.cc eh_exception.cc \
-	eh_globals.cc eh_personality.cc eh_ptr.cc eh_term_handler.cc \
-	eh_terminate.cc eh_tm.cc eh_throw.cc eh_type.cc \
-	eh_unex_handler.cc enum_type_info.cc function_type_info.cc \
-	fundamental_type_info.cc guard.cc guard_error.cc hash_bytes.cc \
-	nested_exception.cc new_handler.cc new_op.cc new_opnt.cc \
-	new_opv.cc new_opvnt.cc pbase_type_info.cc pmem_type_info.cc \
-	pointer_type_info.cc pure.cc si_class_type_info.cc tinfo.cc \
-	tinfo2.cc vec.cc vmi_class_type_info.cc vterminate.cc \
-	$(am__append_1)
+sources = \
+	array_type_info.cc \
+	atexit_arm.cc \
+	atexit_thread.cc \
+	bad_alloc.cc \
+	bad_array_length.cc \
+	bad_array_new.cc \
+	bad_cast.cc \
+	bad_typeid.cc \
+	class_type_info.cc \
+	del_op.cc \
+	del_opnt.cc \
+	del_opv.cc \
+	del_opvnt.cc \
+	dyncast.cc \
+	eh_alloc.cc \
+	eh_arm.cc \
+	eh_aux_runtime.cc \
+	eh_call.cc \
+	eh_catch.cc \
+	eh_exception.cc \
+	eh_globals.cc \
+	eh_personality.cc \
+	eh_ptr.cc \
+	eh_term_handler.cc \
+	eh_terminate.cc \
+	eh_tm.cc \
+	eh_throw.cc \
+	eh_type.cc \
+	eh_unex_handler.cc \
+	enum_type_info.cc \
+	function_type_info.cc \
+	fundamental_type_info.cc \
+	guard.cc \
+	guard_error.cc \
+	hash_bytes.cc \
+	nested_exception.cc \
+	new_handler.cc \
+	new_op.cc \
+	new_opnt.cc \
+	new_opv.cc \
+	new_opvnt.cc \
+	pbase_type_info.cc \
+	pmem_type_info.cc \
+	pointer_type_info.cc \
+	pure.cc \
+	si_class_type_info.cc \
+	tinfo.cc \
+	tinfo2.cc \
+	vec.cc \
+	vmi_class_type_info.cc \
+	vterminate.cc
+
 @ENABLE_VTABLE_VERIFY_TRUE@vtv_sources = \
-@ENABLE_VTABLE_VERIFY_TRUE@        vtv_rts.cc \
+@ENABLE_VTABLE_VERIFY_TRUE@	vtv_fail.cc \
 @ENABLE_VTABLE_VERIFY_TRUE@        vtv_malloc.cc \
+@ENABLE_VTABLE_VERIFY_TRUE@        vtv_rts.cc \
 @ENABLE_VTABLE_VERIFY_TRUE@        vtv_utils.cc
 
 @ENABLE_VTABLE_VERIFY_TRUE@vtv_stubs_sources = \
 @ENABLE_VTABLE_VERIFY_TRUE@        vtv_stubs.cc
 
+@ENABLE_VTABLE_VERIFY_TRUE@vtv_init_sources = \
+@ENABLE_VTABLE_VERIFY_TRUE@	vtv_init.cc
+
 @ENABLE_VTABLE_VERIFY_TRUE@libvtv_la_SOURCES = $(vtv_sources)
-@ENABLE_VTABLE_VERIFY_TRUE@libvtv_stubs_la_SOURCES = $(vtv_stubs_sources)
+@ENABLE_VTABLE_VERIFY_TRUE@libvtv_stubs_la_SOURCES = $(vtv_stubs_sources) 
+@ENABLE_VTABLE_VERIFY_TRUE@libvtv_init_la_SOURCES = $(vtv_init_sources) 
 libsupc___la_SOURCES = $(sources) $(c_sources)
 libsupc__convenience_la_SOURCES = $(sources) $(c_sources)
 
@@ -499,6 +546,9 @@ CXXLINK = \
 # prepending each of $(*_HEADERS) with VPATH below.
 stddir = $(gxx_include_dir)
 bitsdir = $(gxx_include_dir)/bits
+
+# By adding these files here, automake will remove them for 'make clean'
+CLEANFILES = stamp-*
 all: all-am
 
 .SUFFIXES:
@@ -579,6 +629,8 @@ libsupc++convenience.la: $(libsupc__convenience_la_OBJECTS) $(libsupc__convenien
 	$(CXXLINK)  $(libsupc__convenience_la_OBJECTS) $(libsupc__convenience_la_LIBADD) $(LIBS)
 libvtv.la: $(libvtv_la_OBJECTS) $(libvtv_la_DEPENDENCIES) 
 	$(CXXLINK) $(am_libvtv_la_rpath) $(libvtv_la_OBJECTS) $(libvtv_la_LIBADD) $(LIBS)
+libvtv_init.la: $(libvtv_init_la_OBJECTS) $(libvtv_init_la_DEPENDENCIES) 
+	$(CXXLINK) $(am_libvtv_init_la_rpath) $(libvtv_init_la_OBJECTS) $(libvtv_init_la_LIBADD) $(LIBS)
 libvtv_stubs.la: $(libvtv_stubs_la_OBJECTS) $(libvtv_stubs_la_DEPENDENCIES) 
 	$(CXXLINK) $(am_libvtv_stubs_la_rpath) $(libvtv_stubs_la_OBJECTS) $(libvtv_stubs_la_LIBADD) $(LIBS)
 
@@ -687,6 +739,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
diff --git a/libstdc++-v3/libsupc++/vtv_rts.cc b/libstdc++-v3/libsupc++/vtv_rts.cc
index eb82eb42c8e..8de61abebe4 100644
--- a/libstdc++-v3/libsupc++/vtv_rts.cc
+++ b/libstdc++-v3/libsupc++/vtv_rts.cc
@@ -112,7 +112,7 @@
    "-fvtable-verify=std" must be linked with libvtv_init.so (the gcc
    driver has been modified to do this).  vtv_stubs.so is built from
    vtv_stubs.cc.  It replaces the main runtime functions
-   (__VLTChangePermissino, __VLTRegisterPair and
+   (__VLTChangePermission, __VLTRegisterPair and
    __VLTVerifyVtablePointer) with stub functions that do nothing.  If
    a programmer has a library that was built with verification, but
    wishes to not have verification turned on, the programmer can link