Index: Makefile.in
===================================================================
*** Makefile.in	(revision 192503)
--- Makefile.in	(working copy)
*************** am__objects_1 = array_type_info.lo atexi
*** 103,109 ****
  	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
  @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)
--- 103,110 ----
  	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 vtv_malloc.lo vtv_rts.lo \
! 	vtv_utils.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)
*************** libsupc__convenience_la_LIBADD =
*** 111,116 ****
--- 112,123 ----
  am_libsupc__convenience_la_OBJECTS = $(am__objects_1) $(am__objects_2)
  libsupc__convenience_la_OBJECTS =  \
  	$(am_libsupc__convenience_la_OBJECTS)
+ libvtv_init_la_LIBADD =
+ libvtv_init_la_SOURCES = vtv_init.c
+ libvtv_init_la_OBJECTS = vtv_init.lo
+ libvtv_stubs_la_LIBADD =
+ libvtv_stubs_la_SOURCES = vtv_stubs.c
+ libvtv_stubs_la_OBJECTS = vtv_stubs.lo
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp =
  am__depfiles_maybe =
*************** LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
*** 123,129 ****
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
  CXXLD = $(CXX)
! SOURCES = $(libsupc___la_SOURCES) $(libsupc__convenience_la_SOURCES)
  HEADERS = $(bits_HEADERS) $(std_HEADERS)
  ETAGS = etags
  CTAGS = ctags
--- 130,137 ----
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
  CXXLD = $(CXX)
! SOURCES = $(libsupc___la_SOURCES) $(libsupc__convenience_la_SOURCES) \
! 	libvtv_init.c libvtv_stubs.c
  HEADERS = $(bits_HEADERS) $(std_HEADERS)
  ETAGS = etags
  CTAGS = ctags
*************** AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
*** 347,353 ****
  # 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
  std_HEADERS = \
--- 355,361 ----
  # 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
  std_HEADERS = \
*************** sources = \
*** 410,419 ****
  	tinfo2.cc \
  	vec.cc \
  	vmi_class_type_info.cc \
! 	vterminate.cc
  
  libsupc___la_SOURCES = $(sources) $(c_sources)
  libsupc__convenience_la_SOURCES = $(sources) $(c_sources)
  
  # 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
--- 418,438 ----
  	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)
  
  # 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
*************** libsupc++.la: $(libsupc___la_OBJECTS) $(
*** 575,580 ****
--- 594,603 ----
  	$(CXXLINK) -rpath $(toolexeclibdir) $(libsupc___la_OBJECTS) $(libsupc___la_LIBADD) $(LIBS)
  libsupc++convenience.la: $(libsupc__convenience_la_OBJECTS) $(libsupc__convenience_la_DEPENDENCIES) 
  	$(CXXLINK)  $(libsupc__convenience_la_OBJECTS) $(libsupc__convenience_la_LIBADD) $(LIBS)
+ libvtv_init.la: $(libvtv_init_la_OBJECTS) $(libvtv_init_la_DEPENDENCIES) 
+ 	$(LINK) -rpath $(toolexeclibdir) $(libvtv_init_la_OBJECTS) $(libvtv_init_la_LIBADD) $(LIBS)
+ libvtv_stubs.la: $(libvtv_stubs_la_OBJECTS) $(libvtv_stubs_la_DEPENDENCIES) 
+ 	$(LINK) -rpath $(toolexeclibdir) $(libvtv_stubs_la_OBJECTS) $(libvtv_stubs_la_LIBADD) $(LIBS)
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
*************** nested_exception.lo: nested_exception.cc
*** 813,818 ****
--- 836,850 ----
  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 $<
+ 
  install-stdHEADERS: $(std_HEADERS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(stddir)