diff options
| author | Caroline Tice <cmtice@google.com> | 2016-02-10 14:40:41 -0800 |
|---|---|---|
| committer | Caroline Tice <cmtice@google.com> | 2016-02-26 08:25:55 -0800 |
| commit | 817a788f9eb01eff367191401d48f2aaa8d4f428 (patch) | |
| tree | 637f745404b37fbf3fcff629227d7d542725e5fe /gcc-4.9/libstdc++-v3/libsupc++ | |
| parent | a4ca82cac69c3147143d7b4b4d7cdeb5e02f20ef (diff) | |
| download | toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.tar.gz toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.tar.bz2 toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.zip | |
Unify ChromeOS and Android versions of GCC.
This CL updates Android's GCC to match ChromeOS's GCC (with
appropriate patches applied in both places to make sure no
cherry-picked changes are lost).
Change-Id: I390140c449b0e5df9ee78a06268319c8c510302f
Diffstat (limited to 'gcc-4.9/libstdc++-v3/libsupc++')
| -rw-r--r-- | gcc-4.9/libstdc++-v3/libsupc++/Makefile.in | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/gcc-4.9/libstdc++-v3/libsupc++/Makefile.in b/gcc-4.9/libstdc++-v3/libsupc++/Makefile.in index b836f7086..eee50fa2b 100644 --- a/gcc-4.9/libstdc++-v3/libsupc++/Makefile.in +++ b/gcc-4.9/libstdc++-v3/libsupc++/Makefile.in @@ -93,17 +93,18 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES) libsupc___la_LIBADD = am__objects_1 = array_type_info.lo atexit_arm.lo atexit_thread.lo \ bad_alloc.lo bad_array_length.lo bad_array_new.lo bad_cast.lo \ - bad_typeid.lo class_type_info.lo del_op.lo del_opsz.lo del_opnt.lo \ - del_opv.lo del_opvnt.lo dyncast.lo eh_alloc.lo eh_arm.lo \ - eh_aux_runtime.lo eh_call.lo eh_catch.lo eh_exception.lo \ - eh_globals.lo eh_personality.lo eh_ptr.lo eh_term_handler.lo \ - eh_terminate.lo eh_tm.lo eh_throw.lo eh_type.lo \ - eh_unex_handler.lo enum_type_info.lo function_type_info.lo \ - fundamental_type_info.lo guard.lo guard_error.lo hash_bytes.lo \ - nested_exception.lo 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 + bad_typeid.lo class_type_info.lo del_op.lo del_opsz.lo \ + del_opnt.lo del_opv.lo del_opvnt.lo dyncast.lo eh_alloc.lo \ + eh_arm.lo eh_aux_runtime.lo eh_call.lo eh_catch.lo \ + eh_exception.lo eh_globals.lo eh_personality.lo eh_ptr.lo \ + eh_term_handler.lo eh_terminate.lo eh_tm.lo eh_throw.lo \ + eh_type.lo eh_unex_handler.lo enum_type_info.lo \ + function_type_info.lo fundamental_type_info.lo guard.lo \ + guard_error.lo hash_bytes.lo nested_exception.lo \ + 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 @ENABLE_VTABLE_VERIFY_TRUE@am__objects_3 = vtv_stubs.lo am_libsupc___la_OBJECTS = $(am__objects_1) $(am__objects_2) \ @@ -236,6 +237,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ SYMVER_FILE = @SYMVER_FILE@ TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ +USE_BIONIC_LIBS = @USE_BIONIC_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VTV_CXXFLAGS = @VTV_CXXFLAGS@ @@ -298,6 +300,7 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ libtool_VERSION = @libtool_VERSION@ +libtool_version_info_string = @libtool_version_info_string@ localedir = @localedir@ localstatedir = @localstatedir@ lt_host_flags = @lt_host_flags@ |