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
This commit is contained in:
parent
231d020bfb
commit
8be349eea9
@ -1,3 +1,10 @@
|
||||
2015-01-29 Caroline Tice <cmtice@google.com>
|
||||
|
||||
Committing VTV Cywin/Ming patch for Patrick Wollgast
|
||||
* configure: Regenerate.
|
||||
* libsupc++/Makefile.in: Regenerate.
|
||||
* src/Makefile.in: Regenerate.
|
||||
|
||||
2015-01-29 Jonathan Wakely <jwakely@redhat.com>
|
||||
|
||||
* include/bits/atomic_base.h: Use __always_inline__ instead of
|
||||
@ -11,20 +18,17 @@
|
||||
* testsuite/17_intro/headers/c++200x/all_attributes.cc: New.
|
||||
* testsuite/17_intro/headers/c++2014/all_attributes.cc: New.
|
||||
|
||||
2015-01-27 Caroline Tice <cmtice@google.com>
|
||||
2015-01-28 Caroline Tice <cmtice@google.com>
|
||||
|
||||
Committing VTV Cywin/Ming patch for Patrick Wollgast
|
||||
* acinclude.m4: Define VTV_CYGMIN.
|
||||
* configure: Regenerate.
|
||||
* libsupc++/Makefile.am: Add vtv_sources only to libsupc___la_SOURCES
|
||||
and libsupc__convenience_la_SOURCES if VTV_CYGMIN is not set.
|
||||
* libsupc++/Makefile.in: Regenerated.
|
||||
* libsupc++/vtv_stubs.cc: Add none weak declaration of every function
|
||||
for Cygwin and MinGW.
|
||||
* src/Makefile.am: Add libvtv.la to toolexeclib_LTLIBRARIES, if
|
||||
VTV_CYGMIN is set. Define libvtv_la_SOURCES, libvtv_la_LDFLAGS,
|
||||
libvtv_la_AM_CXXFLAGS and libvtv_la_LINK if VTV_CYGMIN is set.
|
||||
* libstdc++-v3/src/Makefile.in: Regenerate.
|
||||
|
||||
2015-01-28 Jonathan Wakely <jwakely@redhat.com>
|
||||
|
||||
|
45
libstdc++-v3/configure
vendored
45
libstdc++-v3/configure
vendored
@ -674,6 +674,8 @@ ENABLE_VTABLE_VERIFY_TRUE
|
||||
VTV_CXXLINKFLAGS
|
||||
VTV_PCH_CXXFLAGS
|
||||
VTV_CXXFLAGS
|
||||
VTV_CYGMIN_FALSE
|
||||
VTV_CYGMIN_TRUE
|
||||
ENABLE_WERROR_FALSE
|
||||
ENABLE_WERROR_TRUE
|
||||
ENABLE_PYTHONDIR_FALSE
|
||||
@ -11537,7 +11539,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11540 "configure"
|
||||
#line 11542 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11643,7 +11645,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11646 "configure"
|
||||
#line 11648 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -15063,7 +15065,7 @@ fi
|
||||
#
|
||||
# Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style.
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15066 "configure"
|
||||
#line 15068 "configure"
|
||||
struct S { ~S(); };
|
||||
void bar();
|
||||
void foo()
|
||||
@ -15415,7 +15417,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; }
|
||||
# Fake what AC_TRY_COMPILE does.
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15418 "configure"
|
||||
#line 15420 "configure"
|
||||
int main()
|
||||
{
|
||||
typedef bool atomic_type;
|
||||
@ -15450,7 +15452,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; }
|
||||
rm -f conftest*
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15453 "configure"
|
||||
#line 15455 "configure"
|
||||
int main()
|
||||
{
|
||||
typedef short atomic_type;
|
||||
@ -15485,7 +15487,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; }
|
||||
rm -f conftest*
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15488 "configure"
|
||||
#line 15490 "configure"
|
||||
int main()
|
||||
{
|
||||
// NB: _Atomic_word not necessarily int.
|
||||
@ -15521,7 +15523,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; }
|
||||
rm -f conftest*
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15524 "configure"
|
||||
#line 15526 "configure"
|
||||
int main()
|
||||
{
|
||||
typedef long long atomic_type;
|
||||
@ -15600,7 +15602,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu
|
||||
# unnecessary for this test.
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15603 "configure"
|
||||
#line 15605 "configure"
|
||||
int main()
|
||||
{
|
||||
_Decimal32 d1;
|
||||
@ -15642,7 +15644,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
# unnecessary for this test.
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15645 "configure"
|
||||
#line 15647 "configure"
|
||||
template<typename T1, typename T2>
|
||||
struct same
|
||||
{ typedef T2 type; };
|
||||
@ -15676,7 +15678,7 @@ $as_echo "$enable_int128" >&6; }
|
||||
rm -f conftest*
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15679 "configure"
|
||||
#line 15681 "configure"
|
||||
template<typename T1, typename T2>
|
||||
struct same
|
||||
{ typedef T2 type; };
|
||||
@ -17458,7 +17460,24 @@ $as_echo_n "checking for vtable verify support... " >&6; }
|
||||
$as_echo "$enable_vtable_verify" >&6; }
|
||||
|
||||
if test $enable_vtable_verify = yes; then
|
||||
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
|
||||
case ${target_os} in
|
||||
cygwin*|mingw32*)
|
||||
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-lvtv,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
|
||||
vtv_cygmin="yes"
|
||||
;;
|
||||
*)
|
||||
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
|
||||
vtv_cygmin="no"
|
||||
;;
|
||||
esac
|
||||
if test $vtv_cygmin = yes; then
|
||||
VTV_CYGMIN_TRUE=
|
||||
VTV_CYGMIN_FALSE='#'
|
||||
else
|
||||
VTV_CYGMIN_TRUE='#'
|
||||
VTV_CYGMIN_FALSE=
|
||||
fi
|
||||
|
||||
VTV_PCH_CXXFLAGS="-fvtable-verify=std"
|
||||
VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs"
|
||||
else
|
||||
@ -79781,6 +79800,10 @@ if test -z "${ENABLE_WERROR_TRUE}" && test -z "${ENABLE_WERROR_FALSE}"; then
|
||||
as_fn_error "conditional \"ENABLE_WERROR\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${VTV_CYGMIN_TRUE}" && test -z "${VTV_CYGMIN_FALSE}"; then
|
||||
as_fn_error "conditional \"VTV_CYGMIN\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${ENABLE_VTABLE_VERIFY_TRUE}" && test -z "${ENABLE_VTABLE_VERIFY_FALSE}"; then
|
||||
as_fn_error "conditional \"ENABLE_VTABLE_VERIFY\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
|
@ -106,7 +106,8 @@ am__objects_1 = array_type_info.lo atexit_arm.lo atexit_thread.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
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@am__objects_3 = vtv_stubs.lo
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@am__objects_3 = \
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@ vtv_stubs.lo
|
||||
am_libsupc___la_OBJECTS = $(am__objects_1) $(am__objects_2) \
|
||||
$(am__objects_3)
|
||||
libsupc___la_OBJECTS = $(am_libsupc___la_OBJECTS)
|
||||
@ -427,8 +428,8 @@ sources = \
|
||||
vmi_class_type_info.cc \
|
||||
vterminate.cc
|
||||
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@vtv_sources = \
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@ vtv_stubs.cc
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@vtv_sources = \
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@ vtv_stubs.cc
|
||||
|
||||
libsupc___la_SOURCES = $(sources) $(c_sources) $(vtv_sources)
|
||||
libsupc__convenience_la_SOURCES = $(sources) $(c_sources) $(vtv_sources)
|
||||
|
@ -97,13 +97,19 @@ am__objects_3 = compatibility-c++0x.lo compatibility-atomic-c++0x.lo \
|
||||
compatibility-condvar.lo
|
||||
am_libstdc___la_OBJECTS = $(am__objects_2) $(am__objects_3)
|
||||
libstdc___la_OBJECTS = $(am_libstdc___la_OBJECTS)
|
||||
@VTV_CYGMIN_FALSE@am_libstdc___la_rpath = -rpath $(toolexeclibdir)
|
||||
@VTV_CYGMIN_TRUE@am_libstdc___la_rpath = -rpath $(toolexeclibdir)
|
||||
libvtv_la_LIBADD =
|
||||
@VTV_CYGMIN_TRUE@am_libvtv_la_OBJECTS = vtv_stubs.lo
|
||||
libvtv_la_OBJECTS = $(am_libvtv_la_OBJECTS)
|
||||
@VTV_CYGMIN_TRUE@am_libvtv_la_rpath = -rpath $(toolexeclibdir)
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||
depcomp =
|
||||
am__depfiles_maybe =
|
||||
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
|
||||
CXXLD = $(CXX)
|
||||
SOURCES = $(libstdc___la_SOURCES)
|
||||
SOURCES = $(libstdc___la_SOURCES) $(libvtv_la_SOURCES)
|
||||
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
|
||||
html-recursive info-recursive install-data-recursive \
|
||||
install-dvi-recursive install-exec-recursive \
|
||||
@ -341,9 +347,22 @@ WARN_CXXFLAGS = \
|
||||
# -I/-D flags to pass when compiling.
|
||||
AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
|
||||
SUBDIRS = c++98 c++11
|
||||
@VTV_CYGMIN_FALSE@toolexeclib_LTLIBRARIES = libstdc++.la
|
||||
|
||||
# Cross compiler support.
|
||||
toolexeclib_LTLIBRARIES = libstdc++.la
|
||||
@VTV_CYGMIN_TRUE@toolexeclib_LTLIBRARIES = libvtv.la libstdc++.la
|
||||
@VTV_CYGMIN_TRUE@libvtv_la_SOURCES = vtv_stubs.cc
|
||||
@VTV_CYGMIN_TRUE@libvtv_la_LDFLAGS = $(lt_host_flags)
|
||||
@VTV_CYGMIN_TRUE@libvtv_la_AM_CXXFLAGS = \
|
||||
@VTV_CYGMIN_TRUE@ $(glibcxx_compiler_pic_flag) \
|
||||
@VTV_CYGMIN_TRUE@ $(XTEMPLATE_FLAGS) \
|
||||
@VTV_CYGMIN_TRUE@ -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end \
|
||||
@VTV_CYGMIN_TRUE@ $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS)
|
||||
|
||||
@VTV_CYGMIN_TRUE@libvtv_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
|
||||
@VTV_CYGMIN_TRUE@ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libvtv_la_AM_CXXFLAGS) \
|
||||
@VTV_CYGMIN_TRUE@ $(CXXFLAGS) $(libvtv_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
@GLIBCXX_LDBL_COMPAT_FALSE@ldbl_compat_sources =
|
||||
@GLIBCXX_LDBL_COMPAT_TRUE@ldbl_compat_sources = compatibility-ldbl.cc
|
||||
parallel_compat_sources = \
|
||||
@ -551,7 +570,9 @@ clean-toolexeclibLTLIBRARIES:
|
||||
rm -f "$${dir}/so_locations"; \
|
||||
done
|
||||
libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
|
||||
$(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
|
||||
$(libstdc___la_LINK) $(am_libstdc___la_rpath) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
|
||||
libvtv.la: $(libvtv_la_OBJECTS) $(libvtv_la_DEPENDENCIES)
|
||||
$(libvtv_la_LINK) $(am_libvtv_la_rpath) $(libvtv_la_OBJECTS) $(libvtv_la_LIBADD) $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@ -832,6 +853,10 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
|
||||
uninstall-toolexeclibLTLIBRARIES
|
||||
|
||||
|
||||
@VTV_CYGMIN_TRUE@vtv_stubs.cc:
|
||||
@VTV_CYGMIN_TRUE@ rm -f $@
|
||||
@VTV_CYGMIN_TRUE@ $(LN_S) $(toplevel_srcdir)/libstdc++-v3/libsupc++/vtv_stubs.cc $@
|
||||
|
||||
vpath % $(top_srcdir)/src/c++98
|
||||
vpath % $(top_srcdir)/src/c++11
|
||||
|
||||
|
@ -1,13 +1,17 @@
|
||||
2015-01-27 Caroline Tice <cmtice@google.com>
|
||||
2015-01-29 Caroline Tice <cmtice@google.com>
|
||||
|
||||
Committing VTV Cywin/Ming patch for Patrick Wollgast
|
||||
* libvtv/Makefile.in : Regenerate.
|
||||
* libvtv/configure : Regenerate.
|
||||
|
||||
2015-01-28 Caroline Tice <cmtice@google.com>
|
||||
|
||||
Committing VTV Cywin/Ming patch for Patrick Wollgast
|
||||
* libvtv/Makefile.am : Add libvtv.la to toolexeclib_LTLIBRARIES, if
|
||||
VTV_CYGMIN is set. Define libvtv_la_LIBADD, libvtv_la_LDFLAGS,
|
||||
libvtv_stubs_la_LDFLAGS and libvtv_stubs_la_SOURCES if VTV_CYGMIN is
|
||||
set. Add obstac.c to libvtv_la_SOURCES if VTV_CYGMIN is set.
|
||||
* libvtv/Makefile.in : Regenerate.
|
||||
* libvtv/aclocal.m4 : Regenerate.
|
||||
* libvtv/configure : Regenerate.
|
||||
* libvtv/configure.ac : Add ACX_LT_HOST_FLAGS. Define VTV_CYGMIN.
|
||||
* libvtv/configure.tgt : (x86_64-*-cygwin*, i?86-*-cygwin*,
|
||||
x86_64-*-mingw*)
|
||||
|
@ -83,11 +83,29 @@ am__base_list = \
|
||||
am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
|
||||
"$(DESTDIR)$(libvtv_includedir)"
|
||||
LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
|
||||
libvtv_la_LIBADD =
|
||||
libvtv_la_DEPENDENCIES =
|
||||
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)
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@am_libvtv_la_OBJECTS = \
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@ $(am__objects_1)
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@am_libvtv_la_OBJECTS = \
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@ $(am__objects_1) \
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@ obstack.lo
|
||||
libvtv_la_OBJECTS = $(am_libvtv_la_OBJECTS)
|
||||
libvtv_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
|
||||
$(CXXFLAGS) $(libvtv_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
@VTV_CYGMIN_FALSE@am_libvtv_la_rpath = -rpath $(toolexeclibdir)
|
||||
@VTV_CYGMIN_TRUE@am_libvtv_la_rpath = -rpath $(toolexeclibdir)
|
||||
libvtv_stubs_la_LIBADD =
|
||||
am__objects_2 = vtv_start.lo vtv_stubs.lo vtv_end.lo
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@am_libvtv_stubs_la_OBJECTS = \
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@ $(am__objects_2)
|
||||
libvtv_stubs_la_OBJECTS = $(am_libvtv_stubs_la_OBJECTS)
|
||||
libvtv_stubs_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
|
||||
$(CXXFLAGS) $(libvtv_stubs_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
@VTV_CYGMIN_TRUE@am_libvtv_stubs_la_rpath = -rpath $(toolexeclibdir)
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@
|
||||
depcomp = $(SHELL) $(top_srcdir)/../depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
@ -103,8 +121,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
||||
$(LDFLAGS) -o $@
|
||||
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
|
||||
CXXLD = $(CXX)
|
||||
SOURCES = $(libvtv_la_SOURCES)
|
||||
SOURCES = $(libvtv_la_SOURCES) $(libvtv_stubs_la_SOURCES)
|
||||
MULTISRCTOP =
|
||||
MULTIBUILDTOP =
|
||||
MULTIDIRS =
|
||||
@ -276,7 +293,8 @@ AM_CFLAGS = $(XCFLAGS)
|
||||
AM_CCASFLAGS = $(XCFLAGS)
|
||||
AM_CXXFLAGS = $(XCFLAGS) $(LIBSTDCXX_RAW_CXX_CXXFLAGS) \
|
||||
-Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end
|
||||
toolexeclib_LTLIBRARIES = libvtv.la
|
||||
@VTV_CYGMIN_FALSE@toolexeclib_LTLIBRARIES = libvtv.la
|
||||
@VTV_CYGMIN_TRUE@toolexeclib_LTLIBRARIES = libvtv.la libvtv_stubs.la
|
||||
vtv_headers = \
|
||||
vtv_map.h \
|
||||
vtv_malloc.h \
|
||||
@ -292,18 +310,29 @@ vtv_sources = \
|
||||
vtv_utils.cc \
|
||||
vtv_end.c
|
||||
|
||||
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
|
||||
@VTV_CYGMIN_TRUE@libvtv_la_LIBADD = -lpsapi
|
||||
@VTV_CYGMIN_TRUE@libvtv_la_LDFLAGS = $(lt_host_flags)
|
||||
@VTV_CYGMIN_TRUE@libvtv_stubs_la_LDFLAGS = $(lt_host_flags)
|
||||
@ENABLE_VTABLE_VERIFY_FALSE@libvtv_la_SOURCES =
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@libvtv_la_SOURCES = $(vtv_sources)
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@libvtv_la_SOURCES = $(vtv_sources)
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@libvtv_la_SOURCES = $(vtv_sources) obstack.c
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@libvtv_stubs_la_SOURCES = $(vtv_stubs_sources)
|
||||
@ENABLE_VTABLE_VERIFY_FALSE@libvtv_include_HEADERS =
|
||||
@ENABLE_VTABLE_VERIFY_TRUE@libvtv_include_HEADERS = $(vtv_headers)
|
||||
|
||||
# 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)
|
||||
@ -383,7 +412,9 @@ clean-toolexeclibLTLIBRARIES:
|
||||
rm -f "$${dir}/so_locations"; \
|
||||
done
|
||||
libvtv.la: $(libvtv_la_OBJECTS) $(libvtv_la_DEPENDENCIES)
|
||||
$(CXXLINK) -rpath $(toolexeclibdir) $(libvtv_la_OBJECTS) $(libvtv_la_LIBADD) $(LIBS)
|
||||
$(libvtv_la_LINK) $(am_libvtv_la_rpath) $(libvtv_la_OBJECTS) $(libvtv_la_LIBADD) $(LIBS)
|
||||
libvtv_stubs.la: $(libvtv_stubs_la_OBJECTS) $(libvtv_stubs_la_DEPENDENCIES)
|
||||
$(libvtv_stubs_la_LINK) $(am_libvtv_stubs_la_rpath) $(libvtv_stubs_la_OBJECTS) $(libvtv_stubs_la_LIBADD) $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@ -391,10 +422,12 @@ mostlyclean-compile:
|
||||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obstack.Plo@am__quote@
|
||||
@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_stubs.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtv_utils.Plo@am__quote@
|
||||
|
||||
.c.o:
|
||||
@ -762,6 +795,14 @@ vtv_end.c:
|
||||
rm -f $@
|
||||
$(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@
|
||||
|
||||
@VTV_CYGMIN_TRUE@ obstack.c:
|
||||
@VTV_CYGMIN_TRUE@ rm -f $@
|
||||
@VTV_CYGMIN_TRUE@ $(LN_S) $(toplevel_srcdir)/libiberty/obstack.c $@
|
||||
|
||||
@VTV_CYGMIN_TRUE@ vtv_stubs.cc:
|
||||
@VTV_CYGMIN_TRUE@ rm -f $@
|
||||
@VTV_CYGMIN_TRUE@ $(LN_S) $(toplevel_srcdir)/libstdc++-v3/libsupc++/vtv_stubs.cc $@
|
||||
|
||||
# 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.
|
||||
.NOEXPORT:
|
||||
|
29
libvtv/configure
vendored
29
libvtv/configure
vendored
@ -602,6 +602,8 @@ ac_subst_vars='am__EXEEXT_FALSE
|
||||
am__EXEEXT_TRUE
|
||||
LTLIBOBJS
|
||||
LIBOBJS
|
||||
VTV_CYGMIN_FALSE
|
||||
VTV_CYGMIN_TRUE
|
||||
XCFLAGS
|
||||
libtool_VERSION
|
||||
enable_static
|
||||
@ -12127,7 +12129,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12130 "configure"
|
||||
#line 12132 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12233,7 +12235,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12236 "configure"
|
||||
#line 12238 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -15486,6 +15488,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
# Only expand once:
|
||||
|
||||
|
||||
ACX_LT_HOST_FLAGS
|
||||
|
||||
|
||||
|
||||
@ -15510,6 +15513,24 @@ if test "x$VTV_SUPPORTED" = "xyes"; then
|
||||
|
||||
fi
|
||||
|
||||
case "$target_os" in
|
||||
cygwin*|mingw32*)
|
||||
vtv_cygmin="yes"
|
||||
;;
|
||||
*)
|
||||
vtv_cygmin="no"
|
||||
;;
|
||||
esac
|
||||
|
||||
if test $vtv_cygmin = yes; then
|
||||
VTV_CYGMIN_TRUE=
|
||||
VTV_CYGMIN_FALSE='#'
|
||||
else
|
||||
VTV_CYGMIN_TRUE='#'
|
||||
VTV_CYGMIN_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
# 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
|
||||
as_fn_error "conditional \"am__fastdepCXX\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${VTV_CYGMIN_TRUE}" && test -z "${VTV_CYGMIN_FALSE}"; then
|
||||
as_fn_error "conditional \"VTV_CYGMIN\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
|
||||
: ${CONFIG_STATUS=./config.status}
|
||||
ac_write_fail=0
|
||||
|
Loading…
Reference in New Issue
Block a user