X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Finclude%2FMakefile.in;h=0b6205c1543ae6ce2ecc70075a3e1662b9e4d52b;hb=11ba5d591c5736e46afec6b9c43d97ba26b67836;hp=f8a971865bc60289fde569e975f4fca76105d1fc;hpb=86e067d23c26d4648ad1ed517e5823ea6a4b9bfd;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index f8a971865bc..0b6205c1543 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -14,8 +14,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -#o# Makefile for the include subdirectory of the GNU C++ Standard library. VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -40,13 +38,15 @@ DIST_COMMON = $(top_srcdir)/fragment.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/futex.m4 \ $(top_srcdir)/../config/iconv.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/lib-ld.m4 \ $(top_srcdir)/../config/lib-link.m4 \ $(top_srcdir)/../config/lib-prefix.m4 \ + $(top_srcdir)/../config/lthostflags.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../config/override.m4 \ @@ -106,8 +106,11 @@ CXXFILT = @CXXFILT@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ +DBLATEX = @DBLATEX@ DEBUG_FLAGS = @DEBUG_FLAGS@ DEFS = @DEFS@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -131,7 +134,6 @@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -157,6 +159,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PDFLATEX = @PDFLATEX@ RANLIB = @RANLIB@ SECTION_FLAGS = @SECTION_FLAGS@ SECTION_LDFLAGS = @SECTION_LDFLAGS@ @@ -170,6 +173,9 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_FLAGS = @WARN_FLAGS@ WERROR = @WERROR@ +XMLLINT = @XMLLINT@ +XSLTPROC = @XSLTPROC@ +XSL_STYLE_DIR = @XSL_STYLE_DIR@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -181,6 +187,7 @@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ baseline_dir = @baseline_dir@ +baseline_subdir_switch = @baseline_subdir_switch@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -200,10 +207,12 @@ glibcxx_MOFILES = @glibcxx_MOFILES@ glibcxx_PCHFLAGS = @glibcxx_PCHFLAGS@ glibcxx_POFILES = @glibcxx_POFILES@ glibcxx_builddir = @glibcxx_builddir@ +glibcxx_compiler_pic_flag = @glibcxx_compiler_pic_flag@ +glibcxx_compiler_shared_flag = @glibcxx_compiler_shared_flag@ glibcxx_localedir = @glibcxx_localedir@ +glibcxx_lt_pic_flag = @glibcxx_lt_pic_flag@ glibcxx_prefixdir = @glibcxx_prefixdir@ glibcxx_srcdir = @glibcxx_srcdir@ -glibcxx_thread_h = @glibcxx_thread_h@ glibcxx_toolexecdir = @glibcxx_toolexecdir@ glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@ gxx_include_dir = @gxx_include_dir@ @@ -221,6 +230,7 @@ libexecdir = @libexecdir@ libtool_VERSION = @libtool_VERSION@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_host_flags = @lt_host_flags@ mandir = @mandir@ mkdir_p = @mkdir_p@ multi_basedir = @multi_basedir@ @@ -230,6 +240,7 @@ port_specific_symbol_files = @port_specific_symbol_files@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +python_mod_dir = @python_mod_dir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -242,6 +253,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +toplevel_builddir = @toplevel_builddir@ toplevel_srcdir = @toplevel_srcdir@ # May be used by various substitution variables. @@ -252,14 +264,16 @@ PWD_COMMAND = $${PWDCMD-pwd} STAMP = echo timestamp > toolexecdir = $(glibcxx_toolexecdir) toolexeclibdir = $(glibcxx_toolexeclibdir) +@ENABLE_WERROR_FALSE@WERROR_FLAG = +@ENABLE_WERROR_TRUE@WERROR_FLAG = $(WERROR) # These bits are all figured out from configure. Look in acinclude.m4 # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS. CONFIG_CXXFLAGS = \ - $(SECTION_FLAGS) $(EXTRA_CXX_FLAGS) + $(SECTION_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ WARN_CXXFLAGS = \ - $(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once + $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once # -I/-D flags to pass when compiling. @@ -299,6 +313,7 @@ std_headers = \ ${std_srcdir}/random \ ${std_srcdir}/ratio \ ${std_srcdir}/regex \ + ${std_srcdir}/scoped_allocator \ ${std_srcdir}/set \ ${std_srcdir}/sstream \ ${std_srcdir}/stack \ @@ -319,13 +334,10 @@ std_headers = \ bits_srcdir = ${glibcxx_srcdir}/include/bits bits_builddir = ./bits bits_headers = \ - ${bits_srcdir}/algorithmfwd.h \ + ${bits_srcdir}/algorithmfwd.h \ + ${bits_srcdir}/alloc_traits.h \ ${bits_srcdir}/allocator.h \ ${bits_srcdir}/atomic_base.h \ - ${bits_srcdir}/atomicfwd_c.h \ - ${bits_srcdir}/atomicfwd_cxx.h \ - ${bits_srcdir}/atomic_0.h \ - ${bits_srcdir}/atomic_2.h \ ${bits_srcdir}/basic_ios.h \ ${bits_srcdir}/basic_ios.tcc \ ${bits_srcdir}/basic_string.h \ @@ -362,6 +374,7 @@ bits_headers = \ ${bits_srcdir}/ostream.tcc \ ${bits_srcdir}/ostream_insert.h \ ${bits_srcdir}/postypes.h \ + ${bits_srcdir}/ptr_traits.h \ ${bits_srcdir}/random.h \ ${bits_srcdir}/random.tcc \ ${bits_srcdir}/range_access.h \ @@ -410,12 +423,22 @@ bits_headers = \ ${bits_srcdir}/unique_ptr.h \ ${bits_srcdir}/unordered_map.h \ ${bits_srcdir}/unordered_set.h \ + ${bits_srcdir}/uses_allocator.h \ ${bits_srcdir}/valarray_array.h \ ${bits_srcdir}/valarray_array.tcc \ ${bits_srcdir}/valarray_before.h \ ${bits_srcdir}/valarray_after.h \ ${bits_srcdir}/vector.tcc +bits_sup_srcdir = ${glibcxx_srcdir}/libsupc++ +bits_sup_headers = \ + ${bits_sup_srcdir}/atomic_lockfree_defines.h \ + ${bits_sup_srcdir}/cxxabi_forced.h \ + ${bits_sup_srcdir}/exception_defines.h \ + ${bits_sup_srcdir}/exception_ptr.h \ + ${bits_sup_srcdir}/hash_bytes.h \ + ${bits_sup_srcdir}/nested_exception.h + backward_srcdir = ${glibcxx_srcdir}/include/backward backward_builddir = ./backward backward_headers = \ @@ -435,7 +458,7 @@ pb_subdirs = \ ${pb_builddir}/detail/pairing_heap_ \ ${pb_builddir}/detail/splay_tree_ \ ${pb_builddir}/detail/list_update_map_ \ - ${pb_builddir}/detail/basic_tree_policy \ + ${pb_builddir}/detail/branch_policy \ ${pb_builddir}/detail/trie_policy \ ${pb_builddir}/detail/gp_hash_table_map_ \ ${pb_builddir}/detail/tree_policy \ @@ -470,13 +493,12 @@ pb_headers1 = \ ${pb_srcdir}/tag_and_trait.hpp \ ${pb_srcdir}/tree_policy.hpp \ ${pb_srcdir}/trie_policy.hpp \ - ${pb_srcdir}/detail/basic_tree_policy/basic_tree_policy_base.hpp \ - ${pb_srcdir}/detail/basic_tree_policy/null_node_metadata.hpp \ - ${pb_srcdir}/detail/basic_tree_policy/traits.hpp \ - ${pb_srcdir}/detail/basic_types.hpp \ + ${pb_srcdir}/detail/branch_policy/branch_policy.hpp \ + ${pb_srcdir}/detail/branch_policy/null_node_metadata.hpp \ + ${pb_srcdir}/detail/branch_policy/traits.hpp \ ${pb_srcdir}/detail/binary_heap_/binary_heap_.hpp \ ${pb_srcdir}/detail/binary_heap_/const_iterator.hpp \ - ${pb_srcdir}/detail/binary_heap_/const_point_iterator.hpp \ + ${pb_srcdir}/detail/binary_heap_/point_const_iterator.hpp \ ${pb_srcdir}/detail/binary_heap_/constructors_destructor_fn_imps.hpp \ ${pb_srcdir}/detail/binary_heap_/debug_fn_imps.hpp \ ${pb_srcdir}/detail/binary_heap_/entry_cmp.hpp \ @@ -500,9 +522,7 @@ pb_headers1 = \ ${pb_srcdir}/detail/binomial_heap_/binomial_heap_.hpp \ ${pb_srcdir}/detail/binomial_heap_/constructors_destructor_fn_imps.hpp \ ${pb_srcdir}/detail/binomial_heap_/debug_fn_imps.hpp \ - ${pb_srcdir}/detail/bin_search_tree_/bin_search_tree_.hpp \ - ${pb_srcdir}/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp \ - ${pb_srcdir}/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp + ${pb_srcdir}/detail/bin_search_tree_/bin_search_tree_.hpp pb_headers2 = \ ${pb_srcdir}/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp \ @@ -549,7 +569,6 @@ pb_headers2 = \ pb_headers3 = \ ${pb_srcdir}/detail/cc_hash_table_map_/trace_fn_imps.hpp \ ${pb_srcdir}/detail/cond_dealtor.hpp \ - ${pb_srcdir}/detail/constructors_destructor_fn_imps.hpp \ ${pb_srcdir}/detail/container_base_dispatch.hpp \ ${pb_srcdir}/detail/eq_fn/eq_by_less.hpp \ ${pb_srcdir}/detail/eq_fn/hash_eq_fn.hpp \ @@ -593,7 +612,7 @@ pb_headers4 = \ ${pb_srcdir}/detail/hash_fn/sample_ranged_probe_fn.hpp \ ${pb_srcdir}/detail/hash_fn/sample_range_hashing.hpp \ ${pb_srcdir}/detail/left_child_next_sibling_heap_/const_iterator.hpp \ - ${pb_srcdir}/detail/left_child_next_sibling_heap_/const_point_iterator.hpp \ + ${pb_srcdir}/detail/left_child_next_sibling_heap_/point_const_iterator.hpp \ ${pb_srcdir}/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp \ ${pb_srcdir}/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp \ ${pb_srcdir}/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp \ @@ -602,7 +621,6 @@ pb_headers4 = \ ${pb_srcdir}/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp \ ${pb_srcdir}/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp \ ${pb_srcdir}/detail/left_child_next_sibling_heap_/node.hpp \ - ${pb_srcdir}/detail/left_child_next_sibling_heap_/null_metadata.hpp \ ${pb_srcdir}/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp \ ${pb_srcdir}/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp \ ${pb_srcdir}/detail/list_update_map_/constructor_destructor_fn_imps.hpp \ @@ -615,12 +633,9 @@ pb_headers4 = \ ${pb_srcdir}/detail/list_update_map_/iterators_fn_imps.hpp \ ${pb_srcdir}/detail/list_update_map_/lu_map_.hpp \ ${pb_srcdir}/detail/list_update_map_/trace_fn_imps.hpp \ - ${pb_srcdir}/detail/list_update_policy/counter_lu_metadata.hpp \ - ${pb_srcdir}/detail/list_update_policy/counter_lu_policy_imp.hpp \ - ${pb_srcdir}/detail/list_update_policy/mtf_lu_policy_imp.hpp \ + ${pb_srcdir}/detail/list_update_policy/lu_counter_metadata.hpp \ ${pb_srcdir}/detail/list_update_policy/sample_update_policy.hpp \ ${pb_srcdir}/detail/debug_map_base.hpp \ - ${pb_srcdir}/detail/ov_tree_map_/cond_dtor.hpp \ ${pb_srcdir}/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp \ ${pb_srcdir}/detail/ov_tree_map_/debug_fn_imps.hpp \ ${pb_srcdir}/detail/ov_tree_map_/erase_fn_imps.hpp \ @@ -641,30 +656,20 @@ pb_headers5 = \ ${pb_srcdir}/detail/pairing_heap_/insert_fn_imps.hpp \ ${pb_srcdir}/detail/pairing_heap_/pairing_heap_.hpp \ ${pb_srcdir}/detail/pairing_heap_/split_join_fn_imps.hpp \ - ${pb_srcdir}/detail/pat_trie_/child_iterator.hpp \ - ${pb_srcdir}/detail/pat_trie_/cond_dtor_entry_dealtor.hpp \ - ${pb_srcdir}/detail/pat_trie_/const_child_iterator.hpp \ ${pb_srcdir}/detail/pat_trie_/constructors_destructor_fn_imps.hpp \ ${pb_srcdir}/detail/pat_trie_/debug_fn_imps.hpp \ ${pb_srcdir}/detail/pat_trie_/erase_fn_imps.hpp \ ${pb_srcdir}/detail/pat_trie_/find_fn_imps.hpp \ - ${pb_srcdir}/detail/pat_trie_/head.hpp \ ${pb_srcdir}/detail/pat_trie_/info_fn_imps.hpp \ ${pb_srcdir}/detail/pat_trie_/insert_join_fn_imps.hpp \ - ${pb_srcdir}/detail/pat_trie_/internal_node.hpp \ ${pb_srcdir}/detail/pat_trie_/iterators_fn_imps.hpp \ - ${pb_srcdir}/detail/pat_trie_/leaf.hpp \ - ${pb_srcdir}/detail/pat_trie_/node_base.hpp \ - ${pb_srcdir}/detail/pat_trie_/node_iterators.hpp \ - ${pb_srcdir}/detail/pat_trie_/node_metadata_base.hpp \ ${pb_srcdir}/detail/pat_trie_/pat_trie_.hpp \ - ${pb_srcdir}/detail/pat_trie_/point_iterators.hpp \ + ${pb_srcdir}/detail/pat_trie_/pat_trie_base.hpp \ ${pb_srcdir}/detail/pat_trie_/policy_access_fn_imps.hpp \ ${pb_srcdir}/detail/pat_trie_/r_erase_fn_imps.hpp \ ${pb_srcdir}/detail/pat_trie_/rotate_fn_imps.hpp \ ${pb_srcdir}/detail/pat_trie_/split_fn_imps.hpp \ - ${pb_srcdir}/detail/pat_trie_/split_join_branch_bag.hpp \ - ${pb_srcdir}/detail/pat_trie_/synth_e_access_traits.hpp \ + ${pb_srcdir}/detail/pat_trie_/synth_access_traits.hpp \ ${pb_srcdir}/detail/pat_trie_/trace_fn_imps.hpp \ ${pb_srcdir}/detail/pat_trie_/traits.hpp \ ${pb_srcdir}/detail/pat_trie_/update_fn_imps.hpp \ @@ -721,22 +726,20 @@ pb_headers7 = \ ${pb_srcdir}/detail/thin_heap_/thin_heap_.hpp \ ${pb_srcdir}/detail/thin_heap_/trace_fn_imps.hpp \ ${pb_srcdir}/detail/tree_policy/node_metadata_selector.hpp \ - ${pb_srcdir}/detail/tree_policy/null_node_update_imp.hpp \ ${pb_srcdir}/detail/tree_policy/order_statistics_imp.hpp \ ${pb_srcdir}/detail/tree_policy/sample_tree_node_update.hpp \ ${pb_srcdir}/detail/tree_trace_base.hpp \ ${pb_srcdir}/detail/trie_policy/node_metadata_selector.hpp \ - ${pb_srcdir}/detail/trie_policy/null_node_update_imp.hpp \ ${pb_srcdir}/detail/trie_policy/order_statistics_imp.hpp \ ${pb_srcdir}/detail/trie_policy/prefix_search_node_update_imp.hpp \ - ${pb_srcdir}/detail/trie_policy/sample_trie_e_access_traits.hpp \ + ${pb_srcdir}/detail/trie_policy/sample_trie_access_traits.hpp \ ${pb_srcdir}/detail/trie_policy/sample_trie_node_update.hpp \ - ${pb_srcdir}/detail/trie_policy/string_trie_e_access_traits_imp.hpp \ + ${pb_srcdir}/detail/trie_policy/trie_string_access_traits_imp.hpp \ ${pb_srcdir}/detail/trie_policy/trie_policy_base.hpp \ ${pb_srcdir}/detail/types_traits.hpp \ ${pb_srcdir}/detail/type_utils.hpp \ ${pb_srcdir}/detail/unordered_iterator/const_iterator.hpp \ - ${pb_srcdir}/detail/unordered_iterator/const_point_iterator.hpp \ + ${pb_srcdir}/detail/unordered_iterator/point_const_iterator.hpp \ ${pb_srcdir}/detail/unordered_iterator/iterator.hpp \ ${pb_srcdir}/detail/unordered_iterator/point_iterator.hpp @@ -744,6 +747,7 @@ ext_srcdir = ${glibcxx_srcdir}/include/ext ext_builddir = ./ext ext_headers = \ ${ext_srcdir}/algorithm \ + ${ext_srcdir}/alloc_traits.h \ ${ext_srcdir}/atomicity.h \ ${ext_srcdir}/array_allocator.h \ ${ext_srcdir}/bitmap_allocator.h \ @@ -852,24 +856,14 @@ tr1_headers = \ ${tr1_srcdir}/wchar.h \ ${tr1_srcdir}/wctype.h -tr1_impl_srcdir = ${glibcxx_srcdir}/include/tr1_impl -tr1_impl_builddir = ./tr1_impl -tr1_impl_headers = \ - ${tr1_impl_srcdir}/array \ - ${tr1_impl_srcdir}/boost_sp_counted_base.h \ - ${tr1_impl_srcdir}/cctype \ - ${tr1_impl_srcdir}/cfenv \ - ${tr1_impl_srcdir}/cinttypes \ - ${tr1_impl_srcdir}/cmath \ - ${tr1_impl_srcdir}/complex \ - ${tr1_impl_srcdir}/cstdint \ - ${tr1_impl_srcdir}/cstdio \ - ${tr1_impl_srcdir}/cstdlib \ - ${tr1_impl_srcdir}/cwchar \ - ${tr1_impl_srcdir}/cwctype \ - ${tr1_impl_srcdir}/regex \ - ${tr1_impl_srcdir}/type_traits \ - ${tr1_impl_srcdir}/utility +tr2_srcdir = ${glibcxx_srcdir}/include/tr2 +tr2_builddir = ./tr2 +tr2_headers = \ + ${tr2_srcdir}/bool_set \ + ${tr2_srcdir}/bool_set.tcc \ + ${tr2_srcdir}/dynamic_bitset \ + ${tr2_srcdir}/ratio \ + ${tr2_srcdir}/type_traits decimal_srcdir = ${glibcxx_srcdir}/include/decimal decimal_builddir = ./decimal @@ -895,6 +889,7 @@ c_base_headers = \ ${c_base_srcdir}/cmath \ ${c_base_srcdir}/csetjmp \ ${c_base_srcdir}/csignal \ + ${c_base_srcdir}/cstdalign \ ${c_base_srcdir}/cstdarg \ ${c_base_srcdir}/cstdbool \ ${c_base_srcdir}/cstddef \ @@ -914,8 +909,7 @@ c_compatibility_builddir = . @GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@c_compatibility_headers = \ @GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@ ${c_compatibility_srcdir}/complex.h \ @GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@ ${c_compatibility_srcdir}/fenv.h \ -@GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@ ${c_compatibility_srcdir}/tgmath.h \ -@GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@ ${c_compatibility_srcdir}/stdatomic.h +@GLIBCXX_C_HEADERS_C_GLOBAL_TRUE@ ${c_compatibility_srcdir}/tgmath.h @GLIBCXX_C_HEADERS_C_STD_TRUE@c_compatibility_headers = @GLIBCXX_C_HEADERS_C_TRUE@c_compatibility_headers = \ @@ -953,6 +947,7 @@ debug_headers = \ ${debug_srcdir}/debug.h \ ${debug_srcdir}/deque \ ${debug_srcdir}/formatter.h \ + ${debug_srcdir}/forward_list \ ${debug_srcdir}/functions.h \ ${debug_srcdir}/list \ ${debug_srcdir}/map \ @@ -963,7 +958,13 @@ debug_headers = \ ${debug_srcdir}/safe_base.h \ ${debug_srcdir}/safe_iterator.h \ ${debug_srcdir}/safe_iterator.tcc \ + ${debug_srcdir}/safe_local_iterator.h \ + ${debug_srcdir}/safe_local_iterator.tcc \ ${debug_srcdir}/safe_sequence.h \ + ${debug_srcdir}/safe_sequence.tcc \ + ${debug_srcdir}/safe_unordered_base.h \ + ${debug_srcdir}/safe_unordered_container.h \ + ${debug_srcdir}/safe_unordered_container.tcc \ ${debug_srcdir}/set \ ${debug_srcdir}/set.h \ ${debug_srcdir}/string \ @@ -977,49 +978,49 @@ parallel_srcdir = ${glibcxx_srcdir}/include/parallel parallel_builddir = ./parallel @ENABLE_PARALLEL_FALSE@parallel_headers = @ENABLE_PARALLEL_TRUE@parallel_headers = \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algo.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algobase.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algorithm \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algorithmfwd.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/balanced_quicksort.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/base.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/basic_iterator.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/checkers.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/compatibility.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/compiletime_settings.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/equally_split.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/features.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/find.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/find_selectors.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/for_each.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/for_each_selectors.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/iterator.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/list_partition.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/losertree.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/merge.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiseq_selection.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiway_merge.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiway_mergesort.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/numeric \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/numericfwd.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/omp_loop.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/omp_loop_static.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/par_loop.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/parallel.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/partial_sum.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/partition.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/queue.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/quicksort.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/random_number.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/random_shuffle.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/search.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/set_operations.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/settings.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/sort.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/tags.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/types.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/unique_copy.h \ -@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/workstealing.h +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algo.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algobase.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algorithm \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/algorithmfwd.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/balanced_quicksort.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/base.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/basic_iterator.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/checkers.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/compatibility.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/compiletime_settings.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/equally_split.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/features.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/find.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/find_selectors.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/for_each.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/for_each_selectors.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/iterator.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/list_partition.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/losertree.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/merge.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiseq_selection.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiway_merge.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/multiway_mergesort.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/numeric \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/numericfwd.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/omp_loop.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/omp_loop_static.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/par_loop.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/parallel.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/partial_sum.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/partition.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/queue.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/quicksort.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/random_number.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/random_shuffle.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/search.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/set_operations.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/settings.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/sort.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/tags.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/types.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/unique_copy.h \ +@ENABLE_PARALLEL_TRUE@ ${parallel_srcdir}/workstealing.h # Profile mode headers @@ -1032,6 +1033,7 @@ profile_headers = \ ${profile_srcdir}/vector \ ${profile_srcdir}/bitset \ ${profile_srcdir}/deque \ + ${profile_srcdir}/forward_list \ ${profile_srcdir}/list \ ${profile_srcdir}/map \ ${profile_srcdir}/map.h \ @@ -1069,7 +1071,6 @@ host_installdir = ${gxx_include_dir}/${host_alias}$(MULTISUBDIR)/bits host_headers = \ ${host_srcdir}/ctype_base.h \ ${host_srcdir}/ctype_inline.h \ - ${host_srcdir}/ctype_noninline.h \ ${host_srcdir}/os_defines.h \ ${glibcxx_srcdir}/$(ATOMIC_WORD_SRCDIR)/atomic_word.h \ ${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \ @@ -1101,7 +1102,6 @@ thread_host_headers = \ ${host_builddir}/gthr.h \ ${host_builddir}/gthr-single.h \ ${host_builddir}/gthr-posix.h \ - ${host_builddir}/gthr-tpf.h \ ${host_builddir}/gthr-default.h pch1_source = ${glibcxx_srcdir}/include/precompiled/stdc++.h @@ -1135,10 +1135,10 @@ PCHFLAGS = -x c++-header -nostdinc++ $(CXXFLAGS) # List of all timestamp files. By keeping only one copy of this list, both # CLEANFILES and all-local are kept up-to-date. allstamped = \ - stamp-std stamp-bits stamp-c_base stamp-c_compatibility \ - stamp-backward stamp-ext stamp-pb stamp-tr1 stamp-tr1-impl \ - stamp-decimal stamp-debug stamp-parallel stamp-profile \ - stamp-profile-impl stamp-host + stamp-std stamp-bits stamp-bits-sup stamp-c_base stamp-c_compatibility \ + stamp-backward stamp-ext stamp-pb stamp-tr1 stamp-tr2 stamp-decimal \ + stamp-debug stamp-parallel stamp-profile stamp-profile-impl \ + stamp-host # List of all files that are created by explicit building, editing, or @@ -1326,6 +1326,10 @@ stamp-bits: ${bits_headers} @-cd ${bits_builddir} && $(LN_S) $? . 2>/dev/null @$(STAMP) stamp-bits +stamp-bits-sup: stamp-bits ${bits_sup_headers} + @-cd ${bits_builddir} && $(LN_S) $? . 2>/dev/null + @$(STAMP) stamp-bits-sup + stamp-c_base: ${c_base_headers} @-mkdir -p ${c_base_builddir} @-cd ${c_base_builddir} && $(LN_S) $? . 2>/dev/null @@ -1409,10 +1413,10 @@ stamp-tr1: ${tr1_headers} @-cd ${tr1_builddir} && $(LN_S) $? . 2>/dev/null @$(STAMP) stamp-tr1 -stamp-tr1-impl: ${tr1_impl_headers} - @-mkdir -p ${tr1_impl_builddir} - @-cd ${tr1_impl_builddir} && $(LN_S) $? . 2>/dev/null - @$(STAMP) stamp-tr1-impl +stamp-tr2: ${tr2_headers} + @-mkdir -p ${tr2_builddir} + @-cd ${tr2_builddir} && $(LN_S) $? . 2>/dev/null + @$(STAMP) stamp-tr2 stamp-decimal: ${decimal_headers} @-mkdir -p ${decimal_builddir} @@ -1465,6 +1469,11 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias} @ENABLE_SYMVERS_GNU_NAMESPACE_FALSE@stamp-namespace-version: @ENABLE_SYMVERS_GNU_NAMESPACE_FALSE@ echo 0 > stamp-namespace-version +@ENABLE_EXTERN_TEMPLATE_TRUE@stamp-extern-template: +@ENABLE_EXTERN_TEMPLATE_TRUE@ echo 1 > stamp-extern-template +@ENABLE_EXTERN_TEMPLATE_FALSE@stamp-extern-template: +@ENABLE_EXTERN_TEMPLATE_FALSE@ echo 0 > stamp-extern-template + @ENABLE_VISIBILITY_TRUE@stamp-visibility: @ENABLE_VISIBILITY_TRUE@ echo 1 > stamp-visibility @ENABLE_VISIBILITY_FALSE@stamp-visibility: @@ -1477,19 +1486,22 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ stamp-${host_alias} \ ${toplevel_srcdir}/gcc/DATESTAMP \ stamp-namespace-version \ - stamp-visibility + stamp-visibility \ + stamp-extern-template @date=`cat ${toplevel_srcdir}/gcc/DATESTAMP` ;\ - nsa_version=`cat stamp-namespace-version` ;\ + ns_version=`cat stamp-namespace-version` ;\ visibility=`cat stamp-visibility` ;\ + externtemplate=`cat stamp-extern-template` ;\ ldbl_compat='s,g,g,' ;\ grep "^[ ]*#[ ]*define[ ][ ]*_GLIBCXX_LONG_DOUBLE_COMPAT[ ][ ]*1[ ]*$$" \ ${CONFIG_HEADER} > /dev/null 2>&1 \ && ldbl_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_COMPAT 1,' ;\ sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \ - -e "s,define _GLIBCXX_NAMESPACE_ASSOCIATION_VERSION, define _GLIBCXX_NAMESPACE_ASSOCIATION_VERSION $$nsa_version," \ + -e "s,define _GLIBCXX_INLINE_VERSION, define _GLIBCXX_INLINE_VERSION $$ns_version," \ -e "s,define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY, define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY $$visibility," \ + -e "s,define _GLIBCXX_EXTERN_TEMPLATE$$, define _GLIBCXX_EXTERN_TEMPLATE $$externtemplate," \ -e "$$ldbl_compat" \ - < ${glibcxx_srcdir}/include/bits/c++config > $@ ;\ + < ${glibcxx_srcdir}/include/bits/c++config > $@ ;\ sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \ -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \ -e 's/VERSION/_GLIBCXX_VERSION/g' \ @@ -1500,43 +1512,35 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ echo "" >> $@ ;\ echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> $@ -${host_builddir}/gthr.h: ${toplevel_srcdir}/gcc/gthr.h stamp-${host_alias} +${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias} sed -e '/^#pragma/b' \ -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \ -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \ -e 's,^#include "\(.*\)",#include ,g' \ - < ${toplevel_srcdir}/gcc/gthr.h > $@ + < $< > $@ -${host_builddir}/gthr-single.h: ${toplevel_srcdir}/gcc/gthr-single.h \ +${host_builddir}/gthr-single.h: ${toplevel_srcdir}/libgcc/gthr-single.h \ stamp-${host_alias} sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ - < ${toplevel_srcdir}/gcc/gthr-single.h > $@ - -${host_builddir}/gthr-posix.h: ${toplevel_srcdir}/gcc/gthr-posix.h \ - stamp-${host_alias} - sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ - -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ - -e 's/SUPPORTS_WEAK/__GXX_WEAK__/g' \ - -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \ - < ${toplevel_srcdir}/gcc/gthr-posix.h > $@ + < $< > $@ -${host_builddir}/gthr-tpf.h: ${toplevel_srcdir}/gcc/gthr-tpf.h \ +${host_builddir}/gthr-posix.h: ${toplevel_srcdir}/libgcc/gthr-posix.h \ stamp-${host_alias} sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ -e 's/SUPPORTS_WEAK/__GXX_WEAK__/g' \ -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \ - < ${toplevel_srcdir}/gcc/gthr-tpf.h > $@ + < $< > $@ -${host_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcxx_thread_h} \ +${host_builddir}/gthr-default.h: ${toplevel_builddir}/libgcc/gthr-default.h \ stamp-${host_alias} sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ -e 's/SUPPORTS_WEAK/__GXX_WEAK__/g' \ -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \ -e 's,^#include "\(.*\)",#include ,g' \ - < ${toplevel_srcdir}/gcc/${glibcxx_thread_h} > $@ + < $< > $@ # Build two precompiled C++ includes, stdc++.h.gch/*.gch ${pch1a_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source} @@ -1576,9 +1580,13 @@ ${pch3_output}: ${pch3_source} ${pch2_output} # are installed by libsupc++, so only the first four and the sub-includes # are copied here. install-freestanding-headers: - $(mkinstalldirs) $(DESTDIR)${gxx_include_dir} + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/bits $(mkinstalldirs) $(DESTDIR)${host_installdir} - for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h; do \ + $(INSTALL_DATA) ${glibcxx_srcdir}/include/bits/c++0x_warning.h \ + $(DESTDIR)${gxx_include_dir}/bits + for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \ + ${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \ + ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir} $(INSTALL_DATA) ${std_builddir}/limits $(DESTDIR)${gxx_include_dir}/${std_builddir} @@ -1632,9 +1640,9 @@ install-headers: $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${tr1_builddir} for file in ${tr1_headers}; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${tr1_builddir}; done - $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${tr1_impl_builddir} - for file in ${tr1_impl_headers}; do \ - $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${tr1_impl_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${tr2_builddir} + for file in ${tr2_headers}; do \ + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${tr2_builddir}; done $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${decimal_builddir} for file in ${decimal_headers}; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${decimal_builddir}; done @@ -1678,12 +1686,11 @@ clean-local: # developer tries to create them via make in the include build # directory. (This is more of an example of how this kind of rule can # be made.) -.PRECIOUS: $(std_headers) $(c_base_headers) $(tr1_headers) $(tr1_impl_headers) +.PRECIOUS: $(std_headers) $(c_base_headers) $(tr1_headers) $(tr2_headers) $(decimal_headers) $(ext_headers) $(std_headers): ; @: $(c_base_headers): ; @: $(tr1_headers): ; @: -$(tr1_impl_headers): ; @: $(decimal_headers): ; @: $(ext_headers): ; @: