Index: Makefile.am
===================================================================
*** Makefile.am	(revision 192503)
--- Makefile.am	(working copy)
*************** include $(top_srcdir)/fragment.am
*** 27,33 ****
  # Need this library to both be part of libstdc++.a, and installed
  # separately too.
  # 1) separate libsupc++.la
! toolexeclib_LTLIBRARIES = libsupc++.la
  # 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
  noinst_LTLIBRARIES = libsupc++convenience.la
  
--- 27,33 ----
  # Need this library to both be part of libstdc++.a, and installed
  # separately too.
  # 1) separate libsupc++.la
! toolexeclib_LTLIBRARIES = libsupc++.la libvtv_init.la libvtv_stubs.la
  # 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
  noinst_LTLIBRARIES = libsupc++convenience.la
  
*************** sources = \
*** 94,104 ****
  	tinfo2.cc \
  	vec.cc \
  	vmi_class_type_info.cc \
! 	vterminate.cc
  
  libsupc___la_SOURCES = $(sources) $(c_sources)
  libsupc__convenience_la_SOURCES = $(sources) $(c_sources)
  
  cp-demangle.c:
  	rm -f $@
  	$(LN_S) $(toplevel_srcdir)/libiberty/cp-demangle.c $@
--- 94,116 ----
  	tinfo2.cc \
  	vec.cc \
  	vmi_class_type_info.cc \
! 	vterminate.cc \
! 	vtv_malloc.cc \
! 	vtv_rts.cc \
! 	vtv_utils.cc
! 
! vtv_init_sources = \
! 	vtv_init.cc
! 
! vtv_stubs_sources = \
! 	vtv_stubs.cc
  
  libsupc___la_SOURCES = $(sources) $(c_sources)
  libsupc__convenience_la_SOURCES = $(sources) $(c_sources)
  
+ libvtv_init___la_SOURCES = $(vtv_init_sources)
+ libvtv_stubs___la_SOURCES = $(vtv_stubs_sources)
+ 
  cp-demangle.c:
  	rm -f $@
  	$(LN_S) $(toplevel_srcdir)/libiberty/cp-demangle.c $@
*************** nested_exception.lo: nested_exception.cc
*** 134,139 ****
--- 146,160 ----
  nested_exception.o: nested_exception.cc
  	$(CXXCOMPILE) -std=gnu++0x -c $<
  
+ vtv_init.lo: vtv_init.cc vtv_rts.h
+ 	$(LTCXXCOMPILE) -Wno-error -c $<
+ vtv_init.o: vtv_init.cc vtv_rts.h
+ 	$(CXXCOMPILE) -Wno-error -c $<
+ vtv_stubs.lo: vtv_stubs.cc vtv_rts.h
+ 	$(LTCXXCOMPILE) -Wno-error -c $<
+ vtv_stubs.o: vtv_stubs.cc vtv_rts.h
+ 	$(CXXCOMPILE) -Wno-error -c $<
+ 
  # AM_CXXFLAGS needs to be in each subdirectory so that it can be
  # modified in a per-library or per-sub-library way.  Need to manually
  # set this option because CONFIG_CXXFLAGS has to be after