2013-07-30 Caroline Tice <cmtice@google.com>

	    Benjamin Kosnik  <bkoz@redhat.com>

	* Makefile.am (AM_CPPFLAGS): Adjust to toplevel include directory.
	(vtv_sources): Add vtv_start.c, vtv_end.c.
	(BUILT_SOURCES): Copy new sources from libgcc.
	* Makefile.in: Regenerate.
	* vtv_rts.cc: Adjust vtv-change-permission.h include path.

4 files changed, 84 insertions, 21 deletions

diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog
index f08027e8d00..c49a5a39791 100644
--- a/libvtv/ChangeLog
+++ b/libvtv/ChangeLog
@@ -1,9 +1,18 @@
+2013-07-30  Caroline Tice  <cmtice@google.com>
+	    Benjamin Kosnik  <bkoz@redhat.com>
+
+	* Makefile.am (AM_CPPFLAGS): Adjust to toplevel include directory.
+	(vtv_sources): Add vtv_start.c, vtv_end.c.
+	(BUILT_SOURCES): Copy new sources from libgcc.
+	* Makefile.in: Regenerate.
+	* vtv_rts.cc: Adjust vtv-change-permission.h include path.
+
 2013-07-30   Benjamin Kosnik  <bkoz@redhat.com>
 
 	* scripts/run-testsuite.sh (CXX): From VTV_CXXLINKFLAGS.
 
 	* vtv_init.cc: Remove.
-	
+
 2013-07-30  Caroline Tice  <cmtice@google.com>
 	    Benjamin Kosnik  <bkoz@redhat.com>
 
diff --git a/libvtv/Makefile.am b/libvtv/Makefile.am
index edecf726878..ab3233f2d93 100644
--- a/libvtv/Makefile.am
+++ b/libvtv/Makefile.am
@@ -27,7 +27,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 
 DEFS = 
-AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/../include
 AM_CFLAGS = $(XCFLAGS)
 AM_CCASFLAGS = $(XCFLAGS)
 AM_CXXFLAGS = $(XCFLAGS)  
@@ -45,12 +45,24 @@ vtv_headers = \
 	vtv_rts.h
 
 vtv_sources = \
+	vtv_start.c \
         vtv_malloc.cc \
         vtv_rts.cc \
-        vtv_utils.cc
+        vtv_utils.cc \
+	vtv_end.c
 
 libvtv_includedir = $(includedir)
 
+# Link in vtv_start and vtv_end. 
+BUILT_SOURCES = vtv_start.c vtv_end.c
+vtv_start.c:
+	rm -f $@
+	$(LN_S) $(toplevel_srcdir)/libgcc/vtv_start.c $@
+
+vtv_end.c:
+	rm -f $@
+	$(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@
+
 if ENABLE_VTABLE_VERIFY
 libvtv_la_SOURCES = $(vtv_sources)
 libvtv_include_HEADERS = $(vtv_headers)
@@ -59,9 +71,6 @@ libvtv_la_SOURCES =
 libvtv_include_HEADERS = 
 endif
 
-# By adding these files here, automake will remove them for 'make clean'
-CLEANFILES = stamp-*
-
 # Least ordering for dependencies mean linking w/o libstdc++ for as
 # long as the development of libvtv does not absolutely require it.
 CXXVTV=$(CC_FOR_TARGET)
diff --git a/libvtv/Makefile.in b/libvtv/Makefile.in
index 0c674958f25..3c098e4139b 100644
--- a/libvtv/Makefile.in
+++ b/libvtv/Makefile.in
@@ -84,13 +84,23 @@ am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
 	"$(DESTDIR)$(libvtv_includedir)"
 LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
 libvtv_la_LIBADD =
-am__objects_1 = vtv_malloc.lo vtv_rts.lo vtv_utils.lo
+am__objects_1 = vtv_start.lo vtv_malloc.lo vtv_rts.lo vtv_utils.lo \
+	vtv_end.lo
 @ENABLE_VTABLE_VERIFY_TRUE@am_libvtv_la_OBJECTS = $(am__objects_1)
 libvtv_la_OBJECTS = $(am_libvtv_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/../depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
@@ -260,7 +270,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config
 
 # May be used by toolexeclibdir.
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
-AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/../include
 AM_CFLAGS = $(XCFLAGS)
 AM_CCASFLAGS = $(XCFLAGS)
 AM_CXXFLAGS = $(XCFLAGS) $(LIBSTDCXX_RAW_CXX_CXXFLAGS) \
@@ -275,19 +285,21 @@ vtv_headers = \
 	vtv_rts.h
 
 vtv_sources = \
+	vtv_start.c \
         vtv_malloc.cc \
         vtv_rts.cc \
-        vtv_utils.cc
+        vtv_utils.cc \
+	vtv_end.c
 
 libvtv_includedir = $(includedir)
+
+# Link in vtv_start and vtv_end. 
+BUILT_SOURCES = vtv_start.c vtv_end.c
 @ENABLE_VTABLE_VERIFY_FALSE@libvtv_la_SOURCES = 
 @ENABLE_VTABLE_VERIFY_TRUE@libvtv_la_SOURCES = $(vtv_sources)
 @ENABLE_VTABLE_VERIFY_FALSE@libvtv_include_HEADERS = 
 @ENABLE_VTABLE_VERIFY_TRUE@libvtv_include_HEADERS = $(vtv_headers)
 
-# By adding these files here, automake will remove them for 'make clean'
-CLEANFILES = stamp-*
-
 # Least ordering for dependencies mean linking w/o libstdc++ for as
 # long as the development of libvtv does not absolutely require it.
 CXXVTV = $(CC_FOR_TARGET)
@@ -299,10 +311,11 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXVTV) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 
-all: all-recursive
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .c .cc .lo .o .obj
 am--refresh:
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -377,10 +390,33 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_end.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_malloc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_rts.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_start.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_utils.Plo@am__quote@
 
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
 .cc.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -583,14 +619,16 @@ GTAGS:
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 check-am: all-am
-check: check-recursive
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-recursive
 all-am: Makefile $(LTLIBRARIES) all-multi $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(libvtv_includedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: install-recursive
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
@@ -607,7 +645,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -616,6 +653,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-multi clean-recursive
 
 clean-am: clean-generic clean-libtool clean-toolexeclibLTLIBRARIES \
@@ -691,9 +729,9 @@ ps-am:
 uninstall-am: uninstall-libvtv_includeHEADERS \
 	uninstall-toolexeclibLTLIBRARIES
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all-multi \
-	clean-multi ctags-recursive distclean-multi install-am \
-	install-multi install-strip maintainer-clean-multi \
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all all-multi \
+	check clean-multi ctags-recursive distclean-multi install \
+	install-am install-multi install-strip maintainer-clean-multi \
 	mostlyclean-multi tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
@@ -715,6 +753,13 @@ uninstall-am: uninstall-libvtv_includeHEADERS \
 	uninstall uninstall-am uninstall-libvtv_includeHEADERS \
 	uninstall-toolexeclibLTLIBRARIES
 
+vtv_start.c:
+	rm -f $@
+	$(LN_S) $(toplevel_srcdir)/libgcc/vtv_start.c $@
+
+vtv_end.c:
+	rm -f $@
+	$(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libvtv/vtv_rts.cc b/libvtv/vtv_rts.cc
index 64e7997ecbc..1ddbbec7a07 100644
--- a/libvtv/vtv_rts.cc
+++ b/libvtv/vtv_rts.cc
@@ -141,7 +141,7 @@
 #include "vtv_rts.h"
 #include "vtv_fail.h"
 
-#include "../../include/vtv-change-permission.h"
+#include "vtv-change-permission.h"
 
 extern "C" {