X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=libvtv%2FMakefile.am;h=a44e779c277a27dff3044bc45d14e2475fb13a25;hb=63ee540430c32a4f93924f4b2d970999b7cd201b;hp=73acfb4e705f92851921020aecb1b7c67402de97;hpb=0c6cb2d1ad3738b66927353ccd557d6be3d32e70;p=gcc.git

diff --git a/libvtv/Makefile.am b/libvtv/Makefile.am
index 73acfb4e705..a44e779c277 100644
--- a/libvtv/Makefile.am
+++ b/libvtv/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile for the VTV library.
 ##
-## Copyright (C) 2013 Free Software Foundation, Inc.
+## Copyright (C) 2013-2017 Free Software Foundation, Inc.
 ##
 ## Process this file with automake to produce Makefile.in.
 ##
@@ -20,17 +20,17 @@
 ## <http://www.gnu.org/licenses/>.
 
 if ENABLE_VTABLE_VERIFY
-SUBDIRS = testsuite
+  SUBDIRS = testsuite
 else
-SUBDIRS = 
+  SUBDIRS=
 endif
 
 ACLOCAL_AMFLAGS = -I .. -I ../config
 
 # May be used by toolexeclibdir.
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
 
-DEFS = 
+DEFS = @DEFS@
 AM_CPPFLAGS = -I$(top_srcdir)/../include
 AM_CFLAGS = $(XCFLAGS)
 AM_CCASFLAGS = $(XCFLAGS)
@@ -38,7 +38,12 @@ AM_CXXFLAGS = $(XCFLAGS)
 AM_CXXFLAGS += $(LIBSTDCXX_RAW_CXX_CXXFLAGS)
 AM_CXXFLAGS += -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end
 
-toolexeclib_LTLIBRARIES = libvtv.la
+if ENABLE_VTABLE_VERIFY
+  toolexeclib_LTLIBRARIES = libvtv.la
+if VTV_CYGMIN
+  toolexeclib_LTLIBRARIES += libvtv_stubs.la
+endif
+endif
 
 vtv_headers = \
 	vtv_map.h \
@@ -55,7 +60,12 @@ vtv_sources = \
         vtv_utils.cc \
 	vtv_end.c
 
-libvtv_includedir = $(includedir)
+vtv_stubs_sources = \
+	vtv_start.c \
+	vtv_stubs.cc \
+	vtv_end.c
+
+libvtv_includedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
 
 # Link in vtv_start and vtv_end. 
 BUILT_SOURCES = vtv_start.c vtv_end.c
@@ -67,17 +77,44 @@ vtv_end.c:
 	rm -f $@
 	$(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@
 
+if VTV_NO_OBSTACK
+  obstack.c:
+	  rm -f $@
+	  $(LN_S) $(toplevel_srcdir)/libiberty/obstack.c $@
+	  > config.h
+endif
+
+if VTV_CYGMIN
+  vtv_stubs.cc:
+	  rm -f $@
+	  $(LN_S) $(toplevel_srcdir)/libstdc++-v3/libsupc++/vtv_stubs.cc $@
+endif
+
+if VTV_CYGMIN
+  libvtv_la_LIBADD = -lpsapi
+  libvtv_la_LDFLAGS = $(lt_host_flags)
+  libvtv_stubs_la_LDFLAGS = $(lt_host_flags)
+endif
+
 if ENABLE_VTABLE_VERIFY
-libvtv_la_SOURCES = $(vtv_sources)
-libvtv_include_HEADERS = $(vtv_headers)
+  libvtv_la_SOURCES = $(vtv_sources)
+if VTV_NO_OBSTACK
+  libvtv_la_SOURCES += obstack.c
+endif
+if VTV_CYGMIN
+  libvtv_stubs_la_SOURCES = $(vtv_stubs_sources)
+endif
+  libvtv_include_HEADERS = $(vtv_headers)
 else
-libvtv_la_SOURCES = 
-libvtv_include_HEADERS = 
+  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.
 CXXVTV=$(CC_FOR_TARGET)
+CXXLD=$(CC_FOR_TARGET)
+
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=compile $(CXXVTV) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)