summaryrefslogtreecommitdiffstats
path: root/libvtv
diff options
context:
space:
mode:
authorCaroline Tice <cmtice@google.com>2015-01-29 08:47:25 -0800
committerCaroline Tice <ctice@gcc.gnu.org>2015-01-29 08:47:25 -0800
commit8be349eea9b0ce23a058f804dfd587a58a05af2f (patch)
treeb291b238bd219c3eba51ebaf83d374c8d3201171 /libvtv
parentPR jit/64780: configure: --enable-host-shared and the jit (diff)
downloadgcc-8be349eea9b0ce23a058f804dfd587a58a05af2f.tar.gz
gcc-8be349eea9b0ce23a058f804dfd587a58a05af2f.tar.bz2
gcc-8be349eea9b0ce23a058f804dfd587a58a05af2f.tar.xz
Committing generated configure & Makefile.in pieces of VTV Cygwin patch (from Patrick Wollgast).
Committing generated configure & Makefile.in pieces of VTV Cygwin patch (from Patrick Wollgast). Forgot to commit these with the rest of the patch. From-SVN: r220254
Diffstat (limited to 'libvtv')
-rw-r--r--libvtv/ChangeLog10
-rw-r--r--libvtv/Makefile.in55
-rwxr-xr-xlibvtv/configure29
3 files changed, 82 insertions, 12 deletions
diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog
index 7b80282a5f8..7dd9f096a61 100644
--- a/libvtv/ChangeLog
+++ b/libvtv/ChangeLog
@@ -1,13 +1,17 @@
12015-01-27 Caroline Tice <cmtice@google.com> 12015-01-29 Caroline Tice <cmtice@google.com>
2
3 Committing VTV Cywin/Ming patch for Patrick Wollgast
4 * libvtv/Makefile.in : Regenerate.
5 * libvtv/configure : Regenerate.
6
72015-01-28 Caroline Tice <cmtice@google.com>
2 8
3 Committing VTV Cywin/Ming patch for Patrick Wollgast 9 Committing VTV Cywin/Ming patch for Patrick Wollgast
4 * libvtv/Makefile.am : Add libvtv.la to toolexeclib_LTLIBRARIES, if 10 * libvtv/Makefile.am : Add libvtv.la to toolexeclib_LTLIBRARIES, if
5 VTV_CYGMIN is set. Define libvtv_la_LIBADD, libvtv_la_LDFLAGS, 11 VTV_CYGMIN is set. Define libvtv_la_LIBADD, libvtv_la_LDFLAGS,
6 libvtv_stubs_la_LDFLAGS and libvtv_stubs_la_SOURCES if VTV_CYGMIN is 12 libvtv_stubs_la_LDFLAGS and libvtv_stubs_la_SOURCES if VTV_CYGMIN is
7 set. Add obstac.c to libvtv_la_SOURCES if VTV_CYGMIN is set. 13 set. Add obstac.c to libvtv_la_SOURCES if VTV_CYGMIN is set.
8 * libvtv/Makefile.in : Regenerate.
9 * libvtv/aclocal.m4 : Regenerate. 14 * libvtv/aclocal.m4 : Regenerate.
10 * libvtv/configure : Regenerate.
11 * libvtv/configure.ac : Add ACX_LT_HOST_FLAGS. Define VTV_CYGMIN. 15 * libvtv/configure.ac : Add ACX_LT_HOST_FLAGS. Define VTV_CYGMIN.
12 * libvtv/configure.tgt : (x86_64-*-cygwin*, i?86-*-cygwin*, 16 * libvtv/configure.tgt : (x86_64-*-cygwin*, i?86-*-cygwin*,
13 x86_64-*-mingw*) 17 x86_64-*-mingw*)
diff --git a/libvtv/Makefile.in b/libvtv/Makefile.in
index d77a41f0477..098ee888fc1 100644
--- a/libvtv/Makefile.in
+++ b/libvtv/Makefile.in
@@ -83,11 +83,29 @@ am__base_list = \
83am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \ 83am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
84 "$(DESTDIR)$(libvtv_includedir)" 84 "$(DESTDIR)$(libvtv_includedir)"
85LTLIBRARIES = $(toolexeclib_LTLIBRARIES) 85LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
86libvtv_la_LIBADD = 86libvtv_la_DEPENDENCIES =
87am__objects_1 = vtv_start.lo vtv_malloc.lo vtv_rts.lo vtv_utils.lo \ 87am__objects_1 = vtv_start.lo vtv_malloc.lo vtv_rts.lo vtv_utils.lo \
88 vtv_end.lo 88 vtv_end.lo
89@ENABLE_VTABLE_VERIFY_TRUE@am_libvtv_la_OBJECTS = $(am__objects_1) 89@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@am_libvtv_la_OBJECTS = \
90@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@ $(am__objects_1)
91@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@am_libvtv_la_OBJECTS = \
92@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@ $(am__objects_1) \
93@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@ obstack.lo
90libvtv_la_OBJECTS = $(am_libvtv_la_OBJECTS) 94libvtv_la_OBJECTS = $(am_libvtv_la_OBJECTS)
95libvtv_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
96 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
97 $(CXXFLAGS) $(libvtv_la_LDFLAGS) $(LDFLAGS) -o $@
98@VTV_CYGMIN_FALSE@am_libvtv_la_rpath = -rpath $(toolexeclibdir)
99@VTV_CYGMIN_TRUE@am_libvtv_la_rpath = -rpath $(toolexeclibdir)
100libvtv_stubs_la_LIBADD =
101am__objects_2 = vtv_start.lo vtv_stubs.lo vtv_end.lo
102@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@am_libvtv_stubs_la_OBJECTS = \
103@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@ $(am__objects_2)
104libvtv_stubs_la_OBJECTS = $(am_libvtv_stubs_la_OBJECTS)
105libvtv_stubs_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
106 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
107 $(CXXFLAGS) $(libvtv_stubs_la_LDFLAGS) $(LDFLAGS) -o $@
108@VTV_CYGMIN_TRUE@am_libvtv_stubs_la_rpath = -rpath $(toolexeclibdir)
91DEFAULT_INCLUDES = -I.@am__isrc@ 109DEFAULT_INCLUDES = -I.@am__isrc@
92depcomp = $(SHELL) $(top_srcdir)/../depcomp 110depcomp = $(SHELL) $(top_srcdir)/../depcomp
93am__depfiles_maybe = depfiles 111am__depfiles_maybe = depfiles
@@ -103,8 +121,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
103 $(LDFLAGS) -o $@ 121 $(LDFLAGS) -o $@
104CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 122CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
105 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 123 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
106CXXLD = $(CXX) 124SOURCES = $(libvtv_la_SOURCES) $(libvtv_stubs_la_SOURCES)
107SOURCES = $(libvtv_la_SOURCES)
108MULTISRCTOP = 125MULTISRCTOP =
109MULTIBUILDTOP = 126MULTIBUILDTOP =
110MULTIDIRS = 127MULTIDIRS =
@@ -276,7 +293,8 @@ AM_CFLAGS = $(XCFLAGS)
276AM_CCASFLAGS = $(XCFLAGS) 293AM_CCASFLAGS = $(XCFLAGS)
277AM_CXXFLAGS = $(XCFLAGS) $(LIBSTDCXX_RAW_CXX_CXXFLAGS) \ 294AM_CXXFLAGS = $(XCFLAGS) $(LIBSTDCXX_RAW_CXX_CXXFLAGS) \
278 -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end 295 -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end
279toolexeclib_LTLIBRARIES = libvtv.la 296@VTV_CYGMIN_FALSE@toolexeclib_LTLIBRARIES = libvtv.la
297@VTV_CYGMIN_TRUE@toolexeclib_LTLIBRARIES = libvtv.la libvtv_stubs.la
280vtv_headers = \ 298vtv_headers = \
281 vtv_map.h \ 299 vtv_map.h \
282 vtv_malloc.h \ 300 vtv_malloc.h \
@@ -292,18 +310,29 @@ vtv_sources = \
292 vtv_utils.cc \ 310 vtv_utils.cc \
293 vtv_end.c 311 vtv_end.c
294 312
313vtv_stubs_sources = \
314 vtv_start.c \
315 vtv_stubs.cc \
316 vtv_end.c
317
295libvtv_includedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include 318libvtv_includedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
296 319
297# Link in vtv_start and vtv_end. 320# Link in vtv_start and vtv_end.
298BUILT_SOURCES = vtv_start.c vtv_end.c 321BUILT_SOURCES = vtv_start.c vtv_end.c
322@VTV_CYGMIN_TRUE@libvtv_la_LIBADD = -lpsapi
323@VTV_CYGMIN_TRUE@libvtv_la_LDFLAGS = $(lt_host_flags)
324@VTV_CYGMIN_TRUE@libvtv_stubs_la_LDFLAGS = $(lt_host_flags)
299@ENABLE_VTABLE_VERIFY_FALSE@libvtv_la_SOURCES = 325@ENABLE_VTABLE_VERIFY_FALSE@libvtv_la_SOURCES =
300@ENABLE_VTABLE_VERIFY_TRUE@libvtv_la_SOURCES = $(vtv_sources) 326@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@libvtv_la_SOURCES = $(vtv_sources)
327@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@libvtv_la_SOURCES = $(vtv_sources) obstack.c
328@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@libvtv_stubs_la_SOURCES = $(vtv_stubs_sources)
301@ENABLE_VTABLE_VERIFY_FALSE@libvtv_include_HEADERS = 329@ENABLE_VTABLE_VERIFY_FALSE@libvtv_include_HEADERS =
302@ENABLE_VTABLE_VERIFY_TRUE@libvtv_include_HEADERS = $(vtv_headers) 330@ENABLE_VTABLE_VERIFY_TRUE@libvtv_include_HEADERS = $(vtv_headers)
303 331
304# Least ordering for dependencies mean linking w/o libstdc++ for as 332# Least ordering for dependencies mean linking w/o libstdc++ for as
305# long as the development of libvtv does not absolutely require it. 333# long as the development of libvtv does not absolutely require it.
306CXXVTV = $(CC_FOR_TARGET) 334CXXVTV = $(CC_FOR_TARGET)
335CXXLD = $(CC_FOR_TARGET)
307LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ 336LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
308 --mode=compile $(CXXVTV) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 337 --mode=compile $(CXXVTV) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
309 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 338 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -383,7 +412,9 @@ clean-toolexeclibLTLIBRARIES:
383 rm -f "$${dir}/so_locations"; \ 412 rm -f "$${dir}/so_locations"; \
384 done 413 done
385libvtv.la: $(libvtv_la_OBJECTS) $(libvtv_la_DEPENDENCIES) 414libvtv.la: $(libvtv_la_OBJECTS) $(libvtv_la_DEPENDENCIES)
386 $(CXXLINK) -rpath $(toolexeclibdir) $(libvtv_la_OBJECTS) $(libvtv_la_LIBADD) $(LIBS) 415 $(libvtv_la_LINK) $(am_libvtv_la_rpath) $(libvtv_la_OBJECTS) $(libvtv_la_LIBADD) $(LIBS)
416libvtv_stubs.la: $(libvtv_stubs_la_OBJECTS) $(libvtv_stubs_la_DEPENDENCIES)
417 $(libvtv_stubs_la_LINK) $(am_libvtv_stubs_la_rpath) $(libvtv_stubs_la_OBJECTS) $(libvtv_stubs_la_LIBADD) $(LIBS)
387 418
388mostlyclean-compile: 419mostlyclean-compile:
389 -rm -f *.$(OBJEXT) 420 -rm -f *.$(OBJEXT)
@@ -391,10 +422,12 @@ mostlyclean-compile:
391distclean-compile: 422distclean-compile:
392 -rm -f *.tab.c 423 -rm -f *.tab.c
393 424
425@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obstack.Plo@am__quote@
394@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_end.Plo@am__quote@ 426@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_end.Plo@am__quote@
395@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_malloc.Plo@am__quote@ 427@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_malloc.Plo@am__quote@
396@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_rts.Plo@am__quote@ 428@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_rts.Plo@am__quote@
397@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_start.Plo@am__quote@ 429@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_start.Plo@am__quote@
430@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_stubs.Plo@am__quote@
398@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_utils.Plo@am__quote@ 431@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_utils.Plo@am__quote@
399 432
400.c.o: 433.c.o:
@@ -762,6 +795,14 @@ vtv_end.c:
762 rm -f $@ 795 rm -f $@
763 $(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@ 796 $(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@
764 797
798@VTV_CYGMIN_TRUE@ obstack.c:
799@VTV_CYGMIN_TRUE@ rm -f $@
800@VTV_CYGMIN_TRUE@ $(LN_S) $(toplevel_srcdir)/libiberty/obstack.c $@
801
802@VTV_CYGMIN_TRUE@ vtv_stubs.cc:
803@VTV_CYGMIN_TRUE@ rm -f $@
804@VTV_CYGMIN_TRUE@ $(LN_S) $(toplevel_srcdir)/libstdc++-v3/libsupc++/vtv_stubs.cc $@
805
765# Tell versions [3.59,3.63) of GNU make to not export all variables. 806# Tell versions [3.59,3.63) of GNU make to not export all variables.
766# Otherwise a system limit (for SysV at least) may be exceeded. 807# Otherwise a system limit (for SysV at least) may be exceeded.
767.NOEXPORT: 808.NOEXPORT:
diff --git a/libvtv/configure b/libvtv/configure
index 90c3c4d9186..64b6f759557 100755
--- a/libvtv/configure
+++ b/libvtv/configure
@@ -602,6 +602,8 @@ ac_subst_vars='am__EXEEXT_FALSE
602am__EXEEXT_TRUE 602am__EXEEXT_TRUE
603LTLIBOBJS 603LTLIBOBJS
604LIBOBJS 604LIBOBJS
605VTV_CYGMIN_FALSE
606VTV_CYGMIN_TRUE
605XCFLAGS 607XCFLAGS
606libtool_VERSION 608libtool_VERSION
607enable_static 609enable_static
@@ -12127,7 +12129,7 @@ else
12127 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 12129 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12128 lt_status=$lt_dlunknown 12130 lt_status=$lt_dlunknown
12129 cat > conftest.$ac_ext <<_LT_EOF 12131 cat > conftest.$ac_ext <<_LT_EOF
12130#line 12130 "configure" 12132#line 12132 "configure"
12131#include "confdefs.h" 12133#include "confdefs.h"
12132 12134
12133#if HAVE_DLFCN_H 12135#if HAVE_DLFCN_H
@@ -12233,7 +12235,7 @@ else
12233 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 12235 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12234 lt_status=$lt_dlunknown 12236 lt_status=$lt_dlunknown
12235 cat > conftest.$ac_ext <<_LT_EOF 12237 cat > conftest.$ac_ext <<_LT_EOF
12236#line 12236 "configure" 12238#line 12238 "configure"
12237#include "confdefs.h" 12239#include "confdefs.h"
12238 12240
12239#if HAVE_DLFCN_H 12241#if HAVE_DLFCN_H
@@ -15486,6 +15488,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
15486# Only expand once: 15488# Only expand once:
15487 15489
15488 15490
15491ACX_LT_HOST_FLAGS
15489 15492
15490 15493
15491 15494
@@ -15510,6 +15513,24 @@ if test "x$VTV_SUPPORTED" = "xyes"; then
15510 15513
15511fi 15514fi
15512 15515
15516case "$target_os" in
15517 cygwin*|mingw32*)
15518 vtv_cygmin="yes"
15519 ;;
15520 *)
15521 vtv_cygmin="no"
15522 ;;
15523esac
15524
15525 if test $vtv_cygmin = yes; then
15526 VTV_CYGMIN_TRUE=
15527 VTV_CYGMIN_FALSE='#'
15528else
15529 VTV_CYGMIN_TRUE='#'
15530 VTV_CYGMIN_FALSE=
15531fi
15532
15533
15513cat >confcache <<\_ACEOF 15534cat >confcache <<\_ACEOF
15514# This file is a shell script that caches the results of configure 15535# This file is a shell script that caches the results of configure
15515# tests run on this system so they can be shared between configure 15536# tests run on this system so they can be shared between configure
@@ -15675,6 +15696,10 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
15675 as_fn_error "conditional \"am__fastdepCXX\" was never defined. 15696 as_fn_error "conditional \"am__fastdepCXX\" was never defined.
15676Usually this means the macro was only invoked conditionally." "$LINENO" 5 15697Usually this means the macro was only invoked conditionally." "$LINENO" 5
15677fi 15698fi
15699if test -z "${VTV_CYGMIN_TRUE}" && test -z "${VTV_CYGMIN_FALSE}"; then
15700 as_fn_error "conditional \"VTV_CYGMIN\" was never defined.
15701Usually this means the macro was only invoked conditionally." "$LINENO" 5
15702fi
15678 15703
15679: ${CONFIG_STATUS=./config.status} 15704: ${CONFIG_STATUS=./config.status}
15680ac_write_fail=0 15705ac_write_fail=0