OSDN Git Service

gcc:
[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / Makefile.in
index 44723be..9f9c299 100644 (file)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -40,11 +40,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/fragment.am
 subdir = include
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-       $(top_srcdir)/linkage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \
+       $(top_srcdir)/../config/lead-dot.m4 \
+       $(top_srcdir)/../config/multi.m4 \
        $(top_srcdir)/../config/no-executables.m4 \
+       $(top_srcdir)/../config/unwind_ipinfo.m4 \
        $(top_srcdir)/../libtool.m4 $(top_srcdir)/crossconfig.m4 \
-       $(top_srcdir)/configure.ac
+       $(top_srcdir)/linkage.m4 $(top_srcdir)/acinclude.m4 \
+       $(top_srcdir)/../config/tls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -71,7 +74,6 @@ BASIC_FILE_CC = @BASIC_FILE_CC@
 BASIC_FILE_H = @BASIC_FILE_H@
 CC = @CC@
 CCODECVT_CC = @CCODECVT_CC@
-CCODECVT_H = @CCODECVT_H@
 CCOLLATE_CC = @CCOLLATE_CC@
 CCTYPE_CC = @CCTYPE_CC@
 CFLAGS = @CFLAGS@
@@ -84,6 +86,7 @@ CMONEY_CC = @CMONEY_CC@
 CNUMERIC_CC = @CNUMERIC_CC@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CPU_DEFINES_SRCDIR = @CPU_DEFINES_SRCDIR@
 CSTDIO_H = @CSTDIO_H@
 CTIME_CC = @CTIME_CC@
 CTIME_H = @CTIME_H@
@@ -98,14 +101,22 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ENABLE_SYMVERS_DARWIN_FALSE = @ENABLE_SYMVERS_DARWIN_FALSE@
+ENABLE_SYMVERS_DARWIN_TRUE = @ENABLE_SYMVERS_DARWIN_TRUE@
+ENABLE_SYMVERS_FALSE = @ENABLE_SYMVERS_FALSE@
+ENABLE_SYMVERS_GNU_FALSE = @ENABLE_SYMVERS_GNU_FALSE@
+ENABLE_SYMVERS_GNU_NAMESPACE_FALSE = @ENABLE_SYMVERS_GNU_NAMESPACE_FALSE@
+ENABLE_SYMVERS_GNU_NAMESPACE_TRUE = @ENABLE_SYMVERS_GNU_NAMESPACE_TRUE@
+ENABLE_SYMVERS_GNU_TRUE = @ENABLE_SYMVERS_GNU_TRUE@
+ENABLE_SYMVERS_TRUE = @ENABLE_SYMVERS_TRUE@
+ENABLE_VISIBILITY_FALSE = @ENABLE_VISIBILITY_FALSE@
+ENABLE_VISIBILITY_TRUE = @ENABLE_VISIBILITY_TRUE@
 EXEEXT = @EXEEXT@
 EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
 GLIBCXX_BUILD_DEBUG_FALSE = @GLIBCXX_BUILD_DEBUG_FALSE@
 GLIBCXX_BUILD_DEBUG_TRUE = @GLIBCXX_BUILD_DEBUG_TRUE@
 GLIBCXX_BUILD_PCH_FALSE = @GLIBCXX_BUILD_PCH_FALSE@
 GLIBCXX_BUILD_PCH_TRUE = @GLIBCXX_BUILD_PCH_TRUE@
-GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE = @GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@
-GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE = @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@
 GLIBCXX_C_HEADERS_COMPATIBILITY_FALSE = @GLIBCXX_C_HEADERS_COMPATIBILITY_FALSE@
 GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE = @GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE@
 GLIBCXX_C_HEADERS_C_FALSE = @GLIBCXX_C_HEADERS_C_FALSE@
@@ -115,12 +126,8 @@ GLIBCXX_C_HEADERS_C_TRUE = @GLIBCXX_C_HEADERS_C_TRUE@
 GLIBCXX_HOSTED_FALSE = @GLIBCXX_HOSTED_FALSE@
 GLIBCXX_HOSTED_TRUE = @GLIBCXX_HOSTED_TRUE@
 GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
-GLIBCXX_TEST_ABI_FALSE = @GLIBCXX_TEST_ABI_FALSE@
-GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@
-GLIBCXX_TEST_THREAD_FALSE = @GLIBCXX_TEST_THREAD_FALSE@
-GLIBCXX_TEST_THREAD_TRUE = @GLIBCXX_TEST_THREAD_TRUE@
-GLIBCXX_TEST_WCHAR_T_FALSE = @GLIBCXX_TEST_WCHAR_T_FALSE@
-GLIBCXX_TEST_WCHAR_T_TRUE = @GLIBCXX_TEST_WCHAR_T_TRUE@
+GLIBCXX_LDBL_COMPAT_FALSE = @GLIBCXX_LDBL_COMPAT_FALSE@
+GLIBCXX_LDBL_COMPAT_TRUE = @GLIBCXX_LDBL_COMPAT_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -154,7 +161,7 @@ SECTION_LDFLAGS = @SECTION_LDFLAGS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYMVER_MAP = @SYMVER_MAP@
+SYMVER_FILE = @SYMVER_FILE@
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -220,6 +227,9 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 toplevel_srcdir = @toplevel_srcdir@
+
+# May be used by various substitution variables.
+gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 MAINT_CHARSET = latin1
 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 PWD_COMMAND = $${PWDCMD-pwd}
@@ -309,7 +319,6 @@ bits_srcdir = ${glibcxx_srcdir}/include/bits
 bits_builddir = ./bits
 bits_headers = \
        ${bits_srcdir}/allocator.h \
-       ${bits_srcdir}/atomicity.h \
        ${bits_srcdir}/basic_ios.h \
        ${bits_srcdir}/basic_ios.tcc \
        ${bits_srcdir}/basic_string.h \
@@ -318,7 +327,6 @@ bits_headers = \
        ${bits_srcdir}/char_traits.h \
        ${bits_srcdir}/codecvt.h \
        ${bits_srcdir}/concept_check.h \
-       ${bits_srcdir}/concurrence.h \
        ${bits_srcdir}/cpp_type_traits.h \
        ${bits_srcdir}/deque.tcc \
        ${bits_srcdir}/fstream.tcc \
@@ -367,7 +375,6 @@ bits_headers = \
        ${bits_srcdir}/stl_vector.h \
        ${bits_srcdir}/streambuf.tcc \
        ${bits_srcdir}/stringfwd.h \
-       ${bits_srcdir}/type_traits.h \
        ${bits_srcdir}/valarray_array.h \
        ${bits_srcdir}/valarray_array.tcc \
        ${bits_srcdir}/valarray_before.h \
@@ -414,19 +421,335 @@ backward_headers = \
        ${backward_srcdir}/strstream \
        ${backward_srcdir}/backward_warning.h
 
+pb_srcdir = ${glibcxx_srcdir}/include/ext/pb_ds
+pb_builddir = ./ext/pb_ds
+pb_subdirs = \
+       ${pb_builddir}/detail \
+       ${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/trie_policy \
+       ${pb_builddir}/detail/gp_hash_table_map_ \
+       ${pb_builddir}/detail/tree_policy \
+       ${pb_builddir}/detail/binomial_heap_base_ \
+       ${pb_builddir}/detail/resize_policy \
+       ${pb_builddir}/detail/bin_search_tree_ \
+       ${pb_builddir}/detail/binomial_heap_ \
+       ${pb_builddir}/detail/thin_heap_ \
+       ${pb_builddir}/detail/pat_trie_ \
+       ${pb_builddir}/detail/cc_hash_table_map_ \
+       ${pb_builddir}/detail/rc_binomial_heap_ \
+       ${pb_builddir}/detail/left_child_next_sibling_heap_ \
+       ${pb_builddir}/detail/unordered_iterator \
+       ${pb_builddir}/detail/binary_heap_ \
+       ${pb_builddir}/detail/ov_tree_map_ \
+       ${pb_builddir}/detail/hash_fn \
+       ${pb_builddir}/detail/eq_fn \
+       ${pb_builddir}/detail/rb_tree_map_ \
+       ${pb_builddir}/detail/list_update_policy
+
+
+# The ability for make and the underlying host to deal with this
+# unweildy list as one entire entity is not a sure thing, and may
+# cause build errors. Thus, split one list into many smaller
+# mini-lists, with the maximum size per mini-list of no more than 42.
+pb_headers1 = \
+       ${pb_srcdir}/assoc_container.hpp \
+       ${pb_srcdir}/exception.hpp \
+       ${pb_srcdir}/hash_policy.hpp \
+       ${pb_srcdir}/list_update_policy.hpp \
+       ${pb_srcdir}/priority_queue.hpp \
+       ${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/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_/constructors_destructor_fn_imps.hpp \
+       ${pb_srcdir}/detail/binary_heap_/debug_fn_imps.hpp \
+       ${pb_srcdir}/detail/binary_heap_/entry_cmp.hpp \
+       ${pb_srcdir}/detail/binary_heap_/entry_pred.hpp \
+       ${pb_srcdir}/detail/binary_heap_/erase_fn_imps.hpp \
+       ${pb_srcdir}/detail/binary_heap_/find_fn_imps.hpp \
+       ${pb_srcdir}/detail/binary_heap_/info_fn_imps.hpp \
+       ${pb_srcdir}/detail/binary_heap_/insert_fn_imps.hpp \
+       ${pb_srcdir}/detail/binary_heap_/iterators_fn_imps.hpp \
+       ${pb_srcdir}/detail/binary_heap_/policy_access_fn_imps.hpp \
+       ${pb_srcdir}/detail/binary_heap_/resize_policy.hpp \
+       ${pb_srcdir}/detail/binary_heap_/split_join_fn_imps.hpp \
+       ${pb_srcdir}/detail/binary_heap_/trace_fn_imps.hpp \
+       ${pb_srcdir}/detail/binomial_heap_base_/binomial_heap_base_.hpp \
+       ${pb_srcdir}/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp \
+       ${pb_srcdir}/detail/binomial_heap_base_/debug_fn_imps.hpp \
+       ${pb_srcdir}/detail/binomial_heap_base_/erase_fn_imps.hpp \
+       ${pb_srcdir}/detail/binomial_heap_base_/find_fn_imps.hpp \
+       ${pb_srcdir}/detail/binomial_heap_base_/insert_fn_imps.hpp \
+       ${pb_srcdir}/detail/binomial_heap_base_/split_join_fn_imps.hpp \
+       ${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_headers2 = \
+       ${pb_srcdir}/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp \
+       ${pb_srcdir}/detail/bin_search_tree_/debug_fn_imps.hpp \
+       ${pb_srcdir}/detail/bin_search_tree_/erase_fn_imps.hpp \
+       ${pb_srcdir}/detail/bin_search_tree_/find_fn_imps.hpp \
+       ${pb_srcdir}/detail/bin_search_tree_/info_fn_imps.hpp \
+       ${pb_srcdir}/detail/bin_search_tree_/insert_fn_imps.hpp \
+       ${pb_srcdir}/detail/bin_search_tree_/iterators_fn_imps.hpp \
+       ${pb_srcdir}/detail/bin_search_tree_/node_iterators.hpp \
+       ${pb_srcdir}/detail/bin_search_tree_/point_iterators.hpp \
+       ${pb_srcdir}/detail/bin_search_tree_/policy_access_fn_imps.hpp \
+       ${pb_srcdir}/detail/bin_search_tree_/r_erase_fn_imps.hpp \
+       ${pb_srcdir}/detail/bin_search_tree_/rotate_fn_imps.hpp \
+       ${pb_srcdir}/detail/bin_search_tree_/split_join_fn_imps.hpp \
+       ${pb_srcdir}/detail/bin_search_tree_/traits.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/cc_ht_map_.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/cmp_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/debug_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/entry_list_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/erase_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/find_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/info_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/insert_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/iterators_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/policy_access_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/resize_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/size_fn_imps.hpp \
+       ${pb_srcdir}/detail/cc_hash_table_map_/standard_policies.hpp 
+
+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 \
+       ${pb_srcdir}/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/debug_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/erase_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/find_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/gp_ht_map_.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/info_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/insert_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/iterator_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/policy_access_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/resize_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/standard_policies.hpp \
+       ${pb_srcdir}/detail/gp_hash_table_map_/trace_fn_imps.hpp \
+       ${pb_srcdir}/detail/hash_fn/direct_mask_range_hashing_imp.hpp \
+       ${pb_srcdir}/detail/hash_fn/direct_mod_range_hashing_imp.hpp \
+       ${pb_srcdir}/detail/hash_fn/linear_probe_fn_imp.hpp \
+       ${pb_srcdir}/detail/hash_fn/mask_based_range_hashing.hpp \
+       ${pb_srcdir}/detail/hash_fn/mod_based_range_hashing.hpp \
+       ${pb_srcdir}/detail/hash_fn/probe_fn_base.hpp \
+       ${pb_srcdir}/detail/hash_fn/quadratic_probe_fn_imp.hpp \
+       ${pb_srcdir}/detail/hash_fn/ranged_hash_fn.hpp \
+       ${pb_srcdir}/detail/hash_fn/ranged_probe_fn.hpp 
+
+pb_headers4 = \
+       ${pb_srcdir}/detail/hash_fn/sample_probe_fn.hpp \
+       ${pb_srcdir}/detail/hash_fn/sample_ranged_hash_fn.hpp \
+       ${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_/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 \
+       ${pb_srcdir}/detail/left_child_next_sibling_heap_/info_fn_imps.hpp \
+       ${pb_srcdir}/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp \
+       ${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 \
+       ${pb_srcdir}/detail/list_update_map_/debug_fn_imps.hpp \
+       ${pb_srcdir}/detail/list_update_map_/entry_metadata_base.hpp \
+       ${pb_srcdir}/detail/list_update_map_/erase_fn_imps.hpp \
+       ${pb_srcdir}/detail/list_update_map_/find_fn_imps.hpp \
+       ${pb_srcdir}/detail/list_update_map_/info_fn_imps.hpp \
+       ${pb_srcdir}/detail/list_update_map_/insert_fn_imps.hpp \
+       ${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/sample_update_policy.hpp \
+       ${pb_srcdir}/detail/map_debug_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 \
+       ${pb_srcdir}/detail/ov_tree_map_/info_fn_imps.hpp \
+       ${pb_srcdir}/detail/ov_tree_map_/insert_fn_imps.hpp \
+       ${pb_srcdir}/detail/ov_tree_map_/iterators_fn_imps.hpp \
+       ${pb_srcdir}/detail/ov_tree_map_/node_iterators.hpp \
+       ${pb_srcdir}/detail/ov_tree_map_/ov_tree_map_.hpp 
+
+pb_headers5 = \
+       ${pb_srcdir}/detail/ov_tree_map_/policy_access_fn_imps.hpp \
+       ${pb_srcdir}/detail/ov_tree_map_/split_join_fn_imps.hpp \
+       ${pb_srcdir}/detail/ov_tree_map_/traits.hpp \
+       ${pb_srcdir}/detail/pairing_heap_/constructors_destructor_fn_imps.hpp \
+       ${pb_srcdir}/detail/pairing_heap_/debug_fn_imps.hpp \
+       ${pb_srcdir}/detail/pairing_heap_/erase_fn_imps.hpp \
+       ${pb_srcdir}/detail/pairing_heap_/find_fn_imps.hpp \
+       ${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_/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_/trace_fn_imps.hpp \
+       ${pb_srcdir}/detail/pat_trie_/traits.hpp \
+       ${pb_srcdir}/detail/pat_trie_/update_fn_imps.hpp \
+       ${pb_srcdir}/detail/priority_queue_base_dispatch.hpp \
+       ${pb_srcdir}/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp \
+       ${pb_srcdir}/detail/rb_tree_map_/debug_fn_imps.hpp 
+
+pb_headers6 = \
+       ${pb_srcdir}/detail/rb_tree_map_/erase_fn_imps.hpp \
+       ${pb_srcdir}/detail/rb_tree_map_/find_fn_imps.hpp \
+       ${pb_srcdir}/detail/rb_tree_map_/info_fn_imps.hpp \
+       ${pb_srcdir}/detail/rb_tree_map_/insert_fn_imps.hpp \
+       ${pb_srcdir}/detail/rb_tree_map_/node.hpp \
+       ${pb_srcdir}/detail/rb_tree_map_/rb_tree_.hpp \
+       ${pb_srcdir}/detail/rb_tree_map_/split_join_fn_imps.hpp \
+       ${pb_srcdir}/detail/rb_tree_map_/traits.hpp \
+       ${pb_srcdir}/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp \
+       ${pb_srcdir}/detail/rc_binomial_heap_/debug_fn_imps.hpp \
+       ${pb_srcdir}/detail/rc_binomial_heap_/erase_fn_imps.hpp \
+       ${pb_srcdir}/detail/rc_binomial_heap_/insert_fn_imps.hpp \
+       ${pb_srcdir}/detail/rc_binomial_heap_/rc_binomial_heap_.hpp \
+       ${pb_srcdir}/detail/rc_binomial_heap_/rc.hpp \
+       ${pb_srcdir}/detail/rc_binomial_heap_/split_join_fn_imps.hpp \
+       ${pb_srcdir}/detail/rc_binomial_heap_/trace_fn_imps.hpp \
+       ${pb_srcdir}/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp \
+       ${pb_srcdir}/detail/resize_policy/hash_exponential_size_policy_imp.hpp \
+       ${pb_srcdir}/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp \
+       ${pb_srcdir}/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp \
+       ${pb_srcdir}/detail/resize_policy/hash_prime_size_policy_imp.hpp \
+       ${pb_srcdir}/detail/resize_policy/hash_standard_resize_policy_imp.hpp \
+       ${pb_srcdir}/detail/resize_policy/sample_resize_policy.hpp \
+       ${pb_srcdir}/detail/resize_policy/sample_resize_trigger.hpp \
+       ${pb_srcdir}/detail/resize_policy/sample_size_policy.hpp \
+       ${pb_srcdir}/detail/splay_tree_/constructors_destructor_fn_imps.hpp \
+       ${pb_srcdir}/detail/splay_tree_/debug_fn_imps.hpp \
+       ${pb_srcdir}/detail/splay_tree_/erase_fn_imps.hpp \
+       ${pb_srcdir}/detail/splay_tree_/find_fn_imps.hpp \
+       ${pb_srcdir}/detail/splay_tree_/info_fn_imps.hpp \
+       ${pb_srcdir}/detail/splay_tree_/insert_fn_imps.hpp \
+       ${pb_srcdir}/detail/splay_tree_/node.hpp \
+       ${pb_srcdir}/detail/splay_tree_/splay_fn_imps.hpp \
+       ${pb_srcdir}/detail/splay_tree_/splay_tree_.hpp \
+       ${pb_srcdir}/detail/splay_tree_/split_join_fn_imps.hpp \
+       ${pb_srcdir}/detail/splay_tree_/traits.hpp \
+       ${pb_srcdir}/detail/standard_policies.hpp \
+       ${pb_srcdir}/detail/thin_heap_/constructors_destructor_fn_imps.hpp \
+       ${pb_srcdir}/detail/thin_heap_/debug_fn_imps.hpp \
+       ${pb_srcdir}/detail/thin_heap_/erase_fn_imps.hpp 
+
+pb_headers7 = \
+       ${pb_srcdir}/detail/thin_heap_/find_fn_imps.hpp \
+       ${pb_srcdir}/detail/thin_heap_/insert_fn_imps.hpp \
+       ${pb_srcdir}/detail/thin_heap_/split_join_fn_imps.hpp \
+       ${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_node_update.hpp \
+       ${pb_srcdir}/detail/trie_policy/string_trie_e_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/iterator.hpp \
+       ${pb_srcdir}/detail/unordered_iterator/point_iterator.hpp 
+
 ext_srcdir = ${glibcxx_srcdir}/include/ext
-ext_builddir = ./ext
+ext_builddir = ./ext 
 ext_headers = \
        ${ext_srcdir}/algorithm \
+       ${ext_srcdir}/atomicity.h \
        ${ext_srcdir}/array_allocator.h \
        ${ext_srcdir}/bitmap_allocator.h \
+       ${ext_srcdir}/codecvt_specializations.h \
+       ${ext_srcdir}/concurrence.h \
        ${ext_srcdir}/debug_allocator.h \
-       ${ext_srcdir}/enc_filebuf.h \
        ${ext_srcdir}/stdio_filebuf.h \
        ${ext_srcdir}/stdio_sync_filebuf.h \
        ${ext_srcdir}/functional \
        ${ext_srcdir}/hash_map \
        ${ext_srcdir}/hash_set \
+       ${ext_srcdir}/hash_fun.h \
+       ${ext_srcdir}/hashtable.h \
        ${ext_srcdir}/iterator \
        ${ext_srcdir}/malloc_allocator.h \
        ${ext_srcdir}/memory \
@@ -439,17 +762,73 @@ ext_headers = \
        ${ext_srcdir}/rope \
        ${ext_srcdir}/ropeimpl.h \
        ${ext_srcdir}/slist \
-       ${ext_srcdir}/hash_fun.h \
-       ${ext_srcdir}/hashtable.h
+       ${ext_srcdir}/throw_allocator.h \
+       ${ext_srcdir}/typelist.h \
+       ${ext_srcdir}/type_traits.h \
+       ${ext_srcdir}/rc_string_base.h \
+       ${ext_srcdir}/sso_string_base.h \
+       ${ext_srcdir}/vstring.h \
+       ${ext_srcdir}/vstring.tcc \
+       ${ext_srcdir}/vstring_fwd.h \
+       ${ext_srcdir}/vstring_util.h    
 
 tr1_srcdir = ${glibcxx_srcdir}/include/tr1
 tr1_builddir = ./tr1
 tr1_headers = \
        ${tr1_srcdir}/array \
+       ${tr1_srcdir}/bind_repeat.h \
+       ${tr1_srcdir}/bind_iterate.h \
+       ${tr1_srcdir}/boost_shared_ptr.h \
+       ${tr1_srcdir}/cctype \
+       ${tr1_srcdir}/cfenv \
+       ${tr1_srcdir}/cfloat \
+       ${tr1_srcdir}/cinttypes \
+       ${tr1_srcdir}/climits \
+       ${tr1_srcdir}/cmath \
+       ${tr1_srcdir}/common.h \
+       ${tr1_srcdir}/complex \
+       ${tr1_srcdir}/cstdarg \
+       ${tr1_srcdir}/cstdbool \
+       ${tr1_srcdir}/cstdint \
+       ${tr1_srcdir}/cstdio \
+       ${tr1_srcdir}/cstdlib \
+       ${tr1_srcdir}/ctgmath \
+       ${tr1_srcdir}/ctime \
+       ${tr1_srcdir}/ctype.h \
+       ${tr1_srcdir}/cwchar \
+       ${tr1_srcdir}/cwctype \
+       ${tr1_srcdir}/fenv.h \
+       ${tr1_srcdir}/float.h \
        ${tr1_srcdir}/functional \
+       ${tr1_srcdir}/functional_iterate.h \
+       ${tr1_srcdir}/hashtable \
+       ${tr1_srcdir}/hashtable_policy.h \
+       ${tr1_srcdir}/inttypes.h \
+       ${tr1_srcdir}/limits.h \
+       ${tr1_srcdir}/math.h \
+       ${tr1_srcdir}/memory \
+       ${tr1_srcdir}/mu_iterate.h \
+       ${tr1_srcdir}/random \
+       ${tr1_srcdir}/random.tcc \
+       ${tr1_srcdir}/ref_fwd.h \
+       ${tr1_srcdir}/ref_wrap_iterate.h \
+       ${tr1_srcdir}/repeat.h \
+       ${tr1_srcdir}/stdarg.h \
+       ${tr1_srcdir}/stdbool.h \
+       ${tr1_srcdir}/stdint.h \
+       ${tr1_srcdir}/stdio.h \
+       ${tr1_srcdir}/stdlib.h \
+       ${tr1_srcdir}/tgmath.h \
        ${tr1_srcdir}/tuple \
+       ${tr1_srcdir}/tuple_defs.h \
+       ${tr1_srcdir}/tuple_iterate.h \
+       ${tr1_srcdir}/type_traits \
+       ${tr1_srcdir}/type_traits_fwd.h \
+       ${tr1_srcdir}/unordered_set \
+       ${tr1_srcdir}/unordered_map \
        ${tr1_srcdir}/utility \
-       ${tr1_srcdir}/type_traits
+       ${tr1_srcdir}/wchar.h \
+       ${tr1_srcdir}/wctype.h
 
 
 # This is the common subset of files that all three "C" header models use.
@@ -528,6 +907,7 @@ debug_headers = \
        ${debug_srcdir}/debug.h \
        ${debug_srcdir}/deque \
        ${debug_srcdir}/formatter.h \
+       ${debug_srcdir}/functions.h \
        ${debug_srcdir}/hash_map \
        ${debug_srcdir}/hash_map.h \
        ${debug_srcdir}/hash_multimap.h \
@@ -536,6 +916,7 @@ debug_headers = \
        ${debug_srcdir}/hash_set.h \
        ${debug_srcdir}/list \
        ${debug_srcdir}/map \
+       ${debug_srcdir}/macros.h \
        ${debug_srcdir}/map.h \
        ${debug_srcdir}/multimap.h \
        ${debug_srcdir}/multiset.h \
@@ -558,18 +939,22 @@ debug_headers = \
 @GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE@c_compatibility_headers_extra = ${c_compatibility_headers}
 host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
 host_builddir = ./${host_alias}/bits
+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
+       ${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \
+       ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h   
 
 
 # Non-installed host_header files.
+COMPATIBILITY_H = config/abi/compatibility.h
 host_headers_noinst = \
-       ${glibcxx_srcdir}/$(CLOCALE_INTERNAL_H)
+       ${glibcxx_srcdir}/$(CLOCALE_INTERNAL_H) \
+       ${glibcxx_srcdir}/$(COMPATIBILITY_H)
 
 
 # These host_headers_extra files are all built with ad hoc naming rules.
@@ -580,8 +965,7 @@ host_headers_extra = \
        ${host_builddir}/c++io.h \
        ${host_builddir}/c++locale.h \
        ${host_builddir}/messages_members.h \
-       ${host_builddir}/time_members.h \
-       ${host_builddir}/codecvt_specializations.h
+       ${host_builddir}/time_members.h 
 
 thread_host_headers = \
        ${host_builddir}/gthr.h \
@@ -590,12 +974,33 @@ thread_host_headers = \
        ${host_builddir}/gthr-tpf.h \
        ${host_builddir}/gthr-default.h
 
-pch_input = ${host_builddir}/stdc++.h
-pch_output_builddir = ${host_builddir}/stdc++.h.gch
-pch_source = ${glibcxx_srcdir}/include/stdc++.h
+pch1_source = ${glibcxx_srcdir}/include/precompiled/stdc++.h
+pch1_output_builddir = ${host_builddir}/stdc++.h.gch
+pch1_output_anchor = ${host_builddir}/stdc++.h
+pch1_output_installdir = ${host_installdir}/stdc++.h.gch
+pch1a_output = ${pch1_output_builddir}/O0g.gch
+pch1b_output = ${pch1_output_builddir}/O2g.gch
+pch1_output = ${pch1a_output} ${pch1b_output}
+pch2_source = ${glibcxx_srcdir}/include/precompiled/stdtr1c++.h
+pch2_output_builddir = ${host_builddir}/stdtr1c++.h.gch
+pch2_output_anchor = ${host_builddir}/stdtr1c++.h
+pch2_output_installdir = ${host_installdir}/stdtr1c++.h.gch
+pch2_output = ${pch2_output_builddir}/O2g.gch
+pch3_source = ${glibcxx_srcdir}/include/precompiled/extc++.h
+pch3_output_builddir = ${host_builddir}/extc++.h.gch
+pch3_output_anchor = ${host_builddir}/extc++.h
+pch3_output_installdir = ${host_installdir}/extc++.h.gch
+pch3_output = ${pch3_output_builddir}/O2g.gch
+pch_output = ${pch1_output} ${pch2_output} ${pch3_output}
+pch_output_dirs = \
+       ${pch1_output_builddir} ${pch2_output_builddir} ${pch3_output_builddir}
+
+pch_output_anchors = \
+       ${pch1_output_anchor} ${pch2_output_anchor} ${pch3_output_anchor}
+
 PCHFLAGS = -Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS)
 @GLIBCXX_BUILD_PCH_FALSE@pch_build = 
-@GLIBCXX_BUILD_PCH_TRUE@pch_build = ${pch_input}
+@GLIBCXX_BUILD_PCH_TRUE@pch_build = ${pch_output}
 @GLIBCXX_BUILD_PCH_FALSE@pch_install = 
 @GLIBCXX_BUILD_PCH_TRUE@pch_install = install-pch
 
@@ -603,7 +1008,7 @@ PCHFLAGS = -Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS)
 # 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-tr1 stamp-debug stamp-host
+       stamp-backward stamp-ext stamp-pb stamp-tr1 stamp-debug stamp-host
 
 
 # List of all files that are created by explicit building, editing, or
@@ -618,7 +1023,7 @@ allcreated = \
 uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
 
 # By adding these files here, automake will remove them for 'make clean'
-CLEANFILES = ${pch_input} ${pch_output_builddir}/*
+CLEANFILES = ${pch_output} ${pch_output_anchors}
 all: all-am
 
 .SUFFIXES:
@@ -726,7 +1131,7 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
@@ -771,14 +1176,15 @@ ps-am:
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-       clean-libtool distclean distclean-generic distclean-libtool \
-       distdir dvi dvi-am html html-am info info-am install \
-       install-am install-data install-data-am install-data-local \
-       install-exec install-exec-am install-info install-info-am \
-       install-man install-strip installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-generic \
-       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-       ps ps-am uninstall uninstall-am uninstall-info-am
+       clean-libtool clean-local distclean distclean-generic \
+       distclean-libtool distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am \
+       install-data-local install-exec install-exec-am install-info \
+       install-info-am install-man install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+       uninstall-info-am
 
 
 # Here are the rules for building the headers
@@ -792,8 +1198,8 @@ stamp-std: ${std_headers}
        fi ;\
        if [ ! -f stamp-std ]; then \
          (cd ${std_builddir} && for h in $?; do \
-           official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
-           $(LN_S) $$h ./$${official_name} || true ;\
+           build_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
+           $(LN_S) $$h ./$${build_name} || true ;\
          done) ;\
        fi ;\
        $(STAMP) stamp-std
@@ -813,8 +1219,8 @@ stamp-c_base: stamp-bits ${c_base_headers} ${c_base_headers_extra}
        fi ;\
        if [ ! -f stamp-c_base ]; then \
          (cd ${c_base_builddir} && for h in ${c_base_headers}; do \
-           official_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
-           $(LN_S) $$h ./$${official_name} || true ;\
+           build_name=`echo $$h | sed -e 's,.*/std_,,' -e 's,\.h$$,,'` ;\
+           $(LN_S) $$h ./$${build_name} || true ;\
          done) ;\
          if [ ! -z "${c_base_headers_extra}" ]; then \
          (cd ${bits_builddir} && $(LN_S) ${c_base_headers_extra}  . || true) ;\
@@ -851,6 +1257,57 @@ stamp-ext: ${ext_headers}
        fi ;\
        $(STAMP) stamp-ext
 
+# Have to deal with nested include directories, gah! Strip off source
+# directory before making the link.
+# XXX check  ${pb_headers}
+stamp-pb:
+       @if [ ! -d "${pb_builddir}" ]; then \
+           mkdir -p ${pb_subdirs} ;\
+       fi 
+       @if [ ! -f stamp-pb ]; then \
+           cd ${pb_builddir} && for h in ${pb_headers1}; do \
+               build_name=`echo $$h | sed -e "s|${pb_srcdir}|.|g"` ;\
+               $(LN_S) $$h $${build_name} || true ;\
+             done ;\
+       fi
+       @if [ ! -f stamp-pb ]; then \
+           cd ${pb_builddir} && for h in ${pb_headers2}; do \
+               build_name=`echo $$h | sed -e "s|${pb_srcdir}|.|g"` ;\
+               $(LN_S) $$h $${build_name} || true ;\
+             done ;\
+       fi
+       @if [ ! -f stamp-pb ]; then \
+           cd ${pb_builddir} && for h in ${pb_headers3}; do \
+               build_name=`echo $$h | sed -e "s|${pb_srcdir}|.|g"` ;\
+               $(LN_S) $$h $${build_name} || true ;\
+             done ;\
+       fi
+       @if [ ! -f stamp-pb ]; then \
+           cd ${pb_builddir} && for h in ${pb_headers4}; do \
+               build_name=`echo $$h | sed -e "s|${pb_srcdir}|.|g"` ;\
+               $(LN_S) $$h $${build_name} || true ;\
+             done ;\
+       fi
+       @if [ ! -f stamp-pb ]; then \
+           cd ${pb_builddir} && for h in ${pb_headers5}; do \
+               build_name=`echo $$h | sed -e "s|${pb_srcdir}|.|g"` ;\
+               $(LN_S) $$h $${build_name} || true ;\
+             done ;\
+       fi
+       @if [ ! -f stamp-pb ]; then \
+           cd ${pb_builddir} && for h in ${pb_headers6}; do \
+               build_name=`echo $$h | sed -e "s|${pb_srcdir}|.|g"` ;\
+               $(LN_S) $$h $${build_name} || true ;\
+             done ;\
+       fi
+       @if [ ! -f stamp-pb ]; then \
+           cd ${pb_builddir} && for h in ${pb_headers7}; do \
+               build_name=`echo $$h | sed -e "s|${pb_srcdir}|.|g"` ;\
+               $(LN_S) $$h $${build_name} || true ;\
+             done ;\
+       fi
+       $(STAMP) stamp-pb
+
 stamp-tr1: ${tr1_headers}
        @if [ ! -d "${tr1_builddir}" ]; then \
            mkdir -p ${tr1_builddir} ;\
@@ -886,6 +1343,7 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
          $(LN_S) ${glibcxx_srcdir}/$(CSTDIO_H) c++io.h || true ;\
          $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_H) c++locale.h || true ;\
          $(LN_S) ${glibcxx_srcdir}/$(CLOCALE_INTERNAL_H) . || true ;\
+         $(LN_S) ${glibcxx_srcdir}/$(COMPATIBILITY_H) . || true ;\
          $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\
          $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true ;\
          $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_H) codecvt_specializations.h || true);\
@@ -893,16 +1351,42 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
        $(STAMP) stamp-host
 
 # Host includes dynamic.
-${host_builddir}/c++config.h: ${top_builddir}/config.h \
-                               ${glibcxx_srcdir}/include/bits/c++config \
-                               stamp-${host_alias}
-       @cat ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
+@ENABLE_SYMVERS_GNU_NAMESPACE_TRUE@stamp-namespace-version:
+@ENABLE_SYMVERS_GNU_NAMESPACE_TRUE@    echo 1 > stamp-namespace-version
+@ENABLE_SYMVERS_GNU_NAMESPACE_FALSE@stamp-namespace-version:
+@ENABLE_SYMVERS_GNU_NAMESPACE_FALSE@   echo 0 > stamp-namespace-version
+
+@ENABLE_VISIBILITY_TRUE@stamp-visibility:
+@ENABLE_VISIBILITY_TRUE@       echo 1 > stamp-visibility
+@ENABLE_VISIBILITY_FALSE@stamp-visibility:
+@ENABLE_VISIBILITY_FALSE@      echo 0 > stamp-visibility
+
+${host_builddir}/c++config.h: ${CONFIG_HEADER} \
+                             ${glibcxx_srcdir}/include/bits/c++config \
+                             stamp-${host_alias} \
+                             ${toplevel_srcdir}/gcc/DATESTAMP \
+                             stamp-namespace-version \
+                             stamp-visibility
+       @date=`cat ${toplevel_srcdir}/gcc/DATESTAMP` ;\
+       nsa_version=`cat stamp-namespace-version` ;\
+       visibility=`cat stamp-visibility` ;\
+       ldbl_compat='' ;\
+       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_HAVE_ATTRIBUTE_VISIBILITY, define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY $$visibility," \
+       -e "$$ldbl_compat" \
+            < ${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' \
            -e 's/WORDS_/_GLIBCXX_WORDS_/g' \
+           -e '/[      ]_GLIBCXX_LONG_DOUBLE_COMPAT[   ]/d' \
            < ${CONFIG_HEADER} >> $@ ;\
-       echo "#endif // _CXXCONFIG_" >>$@
+       echo "" >> $@ ;\
+       echo "#endif // _CXXCONFIG_" >> $@
 
 ${host_builddir}/gthr.h: ${toplevel_srcdir}/gcc/gthr.h stamp-${host_alias}
        sed -e '/^#pragma/b' \
@@ -942,14 +1426,36 @@ ${host_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcxx_thread_h} \
            -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
            < ${toplevel_srcdir}/gcc/${glibcxx_thread_h} > $@
 
-# Build a precompiled C++ include, stdc++.h.gch.
-${pch_input}: ${allstamped} ${host_builddir}/c++config.h ${pch_source}
-       touch ${pch_input}; \
-       if [ ! -d "${pch_output_builddir}" ]; then \
-         mkdir -p ${pch_output_builddir}; \
+# Build two precompiled C++ includes, stdc++.h.gch/*.gch
+${pch1a_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source}
+       if [ ! -d "${pch1_output_builddir}" ]; then \
+         mkdir -p ${pch1_output_builddir}; \
+       fi; \
+       $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O0 -g ${pch1_source} -o $@
+       touch ${pch1_output_anchor}
+
+${pch1b_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source}
+       if [ ! -d "${pch1_output_builddir}" ]; then \
+         mkdir -p ${pch1_output_builddir}; \
+       fi; \
+       $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch1_source} -o $@
+       touch ${pch1_output_anchor}
+
+# Build a precompiled TR1 include, stdtr1c++.h.gch/O2.gch
+${pch2_output}: ${pch2_source} ${pch1_output}
+       if [ ! -d "${pch2_output_builddir}" ]; then \
+         mkdir -p ${pch2_output_builddir}; \
+       fi; \
+       $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch2_source} -o $@
+       touch ${pch2_output_anchor}
+
+# Build a precompiled extension include, extc++.h.gch/O2.gch
+${pch3_output}: ${pch3_source} ${pch2_output}
+       if [ ! -d "${pch3_output_builddir}" ]; then \
+         mkdir -p ${pch3_output_builddir}; \
        fi; \
-       $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g.gch; \
-       $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g.gch;
+       $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch3_source} -o $@
+       touch ${pch3_output_anchor}
 
 # For robustness sake (in light of junk files or in-source
 # configuration), copy from the build or source tree to the install
@@ -970,9 +1476,9 @@ ${pch_input}: ${allstamped} ${host_builddir}/c++config.h ${pch_source}
 # are copied here.
 install-freestanding-headers:
        $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}
-       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${host_builddir}
+       $(mkinstalldirs) $(DESTDIR)${host_installdir}
        for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h; do \
-         $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${host_builddir}; done
+         $(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}
        $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${c_base_builddir}
@@ -991,6 +1497,37 @@ install-headers:
        $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${ext_builddir}
        for file in ${ext_headers}; do \
          $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${ext_builddir}; done
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${pb_builddir}
+       for dir in ${pb_subdirs}; do \
+         $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/$${dir} ; done
+       for file in ${pb_headers1}; do \
+         install_base=$(DESTDIR)${gxx_include_dir}/${pb_builddir} ; \
+         relative_name=`echo $$file | sed -e "s|${pb_srcdir}|.|g"` ;\
+         $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
+       for file in ${pb_headers2}; do \
+         install_base=$(DESTDIR)${gxx_include_dir}/${pb_builddir} ; \
+         relative_name=`echo $$file | sed -e "s|${pb_srcdir}|.|g"` ;\
+         $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
+       for file in ${pb_headers3}; do \
+         install_base=$(DESTDIR)${gxx_include_dir}/${pb_builddir} ; \
+         relative_name=`echo $$file | sed -e "s|${pb_srcdir}|.|g"` ;\
+         $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
+       for file in ${pb_headers4}; do \
+         install_base=$(DESTDIR)${gxx_include_dir}/${pb_builddir} ; \
+         relative_name=`echo $$file | sed -e "s|${pb_srcdir}|.|g"` ;\
+         $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
+       for file in ${pb_headers5}; do \
+         install_base=$(DESTDIR)${gxx_include_dir}/${pb_builddir} ; \
+         relative_name=`echo $$file | sed -e "s|${pb_srcdir}|.|g"` ;\
+         $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
+       for file in ${pb_headers6}; do \
+         install_base=$(DESTDIR)${gxx_include_dir}/${pb_builddir} ; \
+         relative_name=`echo $$file | sed -e "s|${pb_srcdir}|.|g"` ;\
+         $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
+       for file in ${pb_headers7}; do \
+         install_base=$(DESTDIR)${gxx_include_dir}/${pb_builddir} ; \
+         relative_name=`echo $$file | sed -e "s|${pb_srcdir}|.|g"` ;\
+         $(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
        $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${tr1_builddir}
        for file in ${tr1_headers}; do \
          $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${tr1_builddir}; done
@@ -1009,15 +1546,24 @@ install-headers:
        $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${debug_builddir}
        for file in ${debug_headers}; do \
          $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${debug_builddir}; done
-       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${host_builddir}
+       $(mkinstalldirs) $(DESTDIR)${host_installdir}
        for file in ${host_headers} ${host_headers_extra} \
         ${thread_host_headers}; do \
-         $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${host_builddir}; done
+         $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
 
 install-pch:
-       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${pch_output_builddir}
-       for file in ${pch_output_builddir}/*; do \
-         $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}/${pch_output_builddir}; done
+       $(mkinstalldirs) $(DESTDIR)${pch1_output_installdir}
+       for file in ${pch1_output_builddir}/*; do \
+         $(INSTALL_DATA) $$file $(DESTDIR)${pch1_output_installdir}; done
+       $(mkinstalldirs) $(DESTDIR)${pch2_output_installdir}
+       for file in ${pch2_output_builddir}/*; do \
+         $(INSTALL_DATA) $$file $(DESTDIR)${pch2_output_installdir}; done
+       $(INSTALL_DATA) ${pch1_output_anchor} $(DESTDIR)${host_installdir}
+       $(INSTALL_DATA) ${pch2_output_anchor} $(DESTDIR)${host_installdir}
+
+# To remove directories.
+clean-local:
+       rm -rf ${pch_output_dirs}
 
 # Stop implicit '.o' make rules from ever stomping on extensionless
 # headers, in the improbable case where some foolish, crack-addled