Skip to content

R
riscv-gcc-1
Commit c35a51a5 by Benjamin Kosnik
Options

re PR libstdc++/22554 (pb_assoc header build and install overflows exec) 


2005-09-12  Benjamin Kosnik  <bkoz@redhat.com>
	    David Edelsohn <dje@gcc.gnu.org>

	PR libstdc++/22554
	PR libstdc++/23734
	* include/Makefile.am (assoc_headers): Break into five sub values.
	(install-headers): Use them.
	(stamp-assoc): Same.
	* include/Makefile.in: Regenerate.

From-SVN: r104196
parent 6f25cb35
Showing with 125 additions and 32 deletions
libstdc++-v3/ChangeLog
2005-09-12 Benjamin Kosnik <bkoz@redhat.com>
David Edelsohn <dje@gcc.gnu.org>
PR libstdc++/22554
PR libstdc++/23734
* include/Makefile.am (assoc_headers): Break into five sub values.
(install-headers): Use them.
(stamp-assoc): Same.
* include/Makefile.in: Regenerate.
2005-09-12 Chris Jefferson <chris@bubblescope.net>
* include/bits/stl_algo.h (search_n): Delegate to specializations.
......@@ -8,8 +18,8 @@
2005-09-12 Jim Xochellis <jimxoch@yahoo.gr>
* include/bits/stl_algo.h (__search_n(std::random_access_iterator_tag)):
Add specialization.
* include/bits/stl_algo.h
(__search_n(std::random_access_iterator_tag)): Add specialization.
(__search_n(,,,,binary_predicate,std::random_access_iterator_tag)):
Likewise.
......
libstdc++-v3/Makefile.in
# 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,
......
libstdc++-v3/config.h.in
......@@ -667,7 +667,7 @@
/* Define if the compiler is configured for setjmp/longjmp exceptions. */
#undef _GLIBCXX_SJLJ_EXCEPTIONS
/* Define to use symbol versioning in the shared library. */
/* Define to use GNU symbol versioning in the shared library. */
#undef _GLIBCXX_SYMVER
/* Define if C99 functions or macros from <wchar.h>, <math.h>, <complex.h>,
......
libstdc++-v3/include/Makefile.am
......@@ -225,7 +225,10 @@ assoc_subdirs = \
${assoc_builddir}/detail/rb_tree_map_ \
${assoc_builddir}/detail/lu_map_
assoc_headers = \
# 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 five smaller ones.
assoc_headers1 = \
${assoc_srcdir}/detail/tree_assoc_cntnr/constructor_destructor_fn_imps.hpp \
${assoc_srcdir}/detail/type_utils.hpp \
${assoc_srcdir}/detail/order_statistics_imp.hpp \
......@@ -259,7 +262,9 @@ assoc_headers = \
${assoc_srcdir}/detail/ds_trait_imp.hpp \
${assoc_srcdir}/detail/basic_hash_assoc_cntnr/resize_fn_imps.hpp \
${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp \
${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructors_destructor_fn_imps.hpp \
${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructors_destructor_fn_imps.hpp
assoc_headers2 = \
${assoc_srcdir}/detail/cc_ht_map_/resize_store_hash_fn_imps.hpp \
${assoc_srcdir}/detail/cc_ht_map_/find_store_hash_fn_imps.hpp \
${assoc_srcdir}/detail/cc_ht_map_/erase_no_store_hash_fn_imps.hpp \
......@@ -308,7 +313,9 @@ assoc_headers = \
${assoc_srcdir}/detail/gp_ht_map_/gp_ht_map_.hpp \
${assoc_srcdir}/detail/gp_ht_map_/iterator_fn_imps.hpp \
${assoc_srcdir}/detail/gp_ht_map_/debug_no_store_hash_fn_imps.hpp \
${assoc_srcdir}/detail/gp_ht_map_/resize_no_store_hash_fn_imps.hpp \
${assoc_srcdir}/detail/gp_ht_map_/resize_no_store_hash_fn_imps.hpp
assoc_headers3 = \
${assoc_srcdir}/detail/tree_policy/order_statistics_imp.hpp \
${assoc_srcdir}/detail/tree_policy/null_node_updator_imp.hpp \
${assoc_srcdir}/detail/types_traits.hpp \
......@@ -345,7 +352,9 @@ assoc_headers = \
${assoc_srcdir}/detail/basic_tree_assoc_cntnr/range_iteration_fn_imps.hpp \
${assoc_srcdir}/detail/basic_tree_assoc_cntnr/constructors_destructor_fn_imps.hpp \
${assoc_srcdir}/detail/basic_tree_assoc_cntnr/node_iteration_fn_imps.hpp \
${assoc_srcdir}/detail/cc_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp \
${assoc_srcdir}/detail/cc_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp
assoc_headers4 = \
${assoc_srcdir}/detail/assoc_cntnr_base.hpp \
${assoc_srcdir}/detail/ms_category_imp.hpp \
${assoc_srcdir}/detail/hash_types_traits.hpp \
......@@ -383,7 +392,9 @@ assoc_headers = \
${assoc_srcdir}/detail/ov_tree_map_/info_fn_imps.hpp \
${assoc_srcdir}/detail/ov_tree_map_/iterators_fn_imps.hpp \
${assoc_srcdir}/detail/ov_tree_map_/debug_fn_imps.hpp \
${assoc_srcdir}/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp \
${assoc_srcdir}/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
assoc_headers5 = \
${assoc_srcdir}/detail/lu_assoc_cntnr/policy_access_fn_imps.hpp \
${assoc_srcdir}/detail/lu_assoc_cntnr/constructor_destructor_fn_imps.hpp \
${assoc_srcdir}/detail/hash_fn/linear_probe_fn_imp.hpp \
......@@ -729,12 +740,29 @@ stamp-ext: ${ext_headers}
# Have to deal with nested include directories, gah! Strip off source
# directory before making the link.
stamp-assoc: ${assoc_headers}
# XXX check ${assoc_headers}
stamp-assoc:
@if [ ! -d "${assoc_builddir}" ]; then \
mkdir -p ${assoc_subdirs} ;\
fi ;\
if [ ! -f stamp-assoc ]; then \
(cd ${assoc_builddir} && for h in $?; do \
(cd ${assoc_builddir} && for h in ${assoc_headers1}; do \
build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(LN_S) $$h $${build_name} || true ;\
done) ;\
(cd ${assoc_builddir} && for h in ${assoc_headers2}; do \
build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(LN_S) $$h $${build_name} || true ;\
done) ;\
(cd ${assoc_builddir} && for h in ${assoc_headers3}; do \
build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(LN_S) $$h $${build_name} || true ;\
done) ;\
(cd ${assoc_builddir} && for h in ${assoc_headers4}; do \
build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(LN_S) $$h $${build_name} || true ;\
done) ;\
(cd ${assoc_builddir} && for h in ${assoc_headers5}; do \
build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(LN_S) $$h $${build_name} || true ;\
done) ;\
......@@ -894,7 +922,23 @@ install-headers:
$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${assoc_builddir}
for dir in ${assoc_subdirs}; do \
$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/$${dir} ; done
for file in ${assoc_headers}; do \
for file in ${assoc_headers1}; do \
install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \
relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
for file in ${assoc_headers2}; do \
install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \
relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
for file in ${assoc_headers3}; do \
install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \
relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
for file in ${assoc_headers4}; do \
install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \
relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
for file in ${assoc_headers5}; do \
install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \
relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
......
libstdc++-v3/include/Makefile.in
# 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,
......@@ -438,7 +438,11 @@ assoc_subdirs = \
${assoc_builddir}/detail/rb_tree_map_ \
${assoc_builddir}/detail/lu_map_
assoc_headers = \
# 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 five smaller ones.
assoc_headers1 = \
${assoc_srcdir}/detail/tree_assoc_cntnr/constructor_destructor_fn_imps.hpp \
${assoc_srcdir}/detail/type_utils.hpp \
${assoc_srcdir}/detail/order_statistics_imp.hpp \
......@@ -472,7 +476,9 @@ assoc_headers = \
${assoc_srcdir}/detail/ds_trait_imp.hpp \
${assoc_srcdir}/detail/basic_hash_assoc_cntnr/resize_fn_imps.hpp \
${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp \
${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructors_destructor_fn_imps.hpp \
${assoc_srcdir}/detail/basic_hash_assoc_cntnr/constructors_destructor_fn_imps.hpp
assoc_headers2 = \
${assoc_srcdir}/detail/cc_ht_map_/resize_store_hash_fn_imps.hpp \
${assoc_srcdir}/detail/cc_ht_map_/find_store_hash_fn_imps.hpp \
${assoc_srcdir}/detail/cc_ht_map_/erase_no_store_hash_fn_imps.hpp \
......@@ -521,7 +527,9 @@ assoc_headers = \
${assoc_srcdir}/detail/gp_ht_map_/gp_ht_map_.hpp \
${assoc_srcdir}/detail/gp_ht_map_/iterator_fn_imps.hpp \
${assoc_srcdir}/detail/gp_ht_map_/debug_no_store_hash_fn_imps.hpp \
${assoc_srcdir}/detail/gp_ht_map_/resize_no_store_hash_fn_imps.hpp \
${assoc_srcdir}/detail/gp_ht_map_/resize_no_store_hash_fn_imps.hpp
assoc_headers3 = \
${assoc_srcdir}/detail/tree_policy/order_statistics_imp.hpp \
${assoc_srcdir}/detail/tree_policy/null_node_updator_imp.hpp \
${assoc_srcdir}/detail/types_traits.hpp \
......@@ -558,7 +566,9 @@ assoc_headers = \
${assoc_srcdir}/detail/basic_tree_assoc_cntnr/range_iteration_fn_imps.hpp \
${assoc_srcdir}/detail/basic_tree_assoc_cntnr/constructors_destructor_fn_imps.hpp \
${assoc_srcdir}/detail/basic_tree_assoc_cntnr/node_iteration_fn_imps.hpp \
${assoc_srcdir}/detail/cc_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp \
${assoc_srcdir}/detail/cc_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp
assoc_headers4 = \
${assoc_srcdir}/detail/assoc_cntnr_base.hpp \
${assoc_srcdir}/detail/ms_category_imp.hpp \
${assoc_srcdir}/detail/hash_types_traits.hpp \
......@@ -596,7 +606,9 @@ assoc_headers = \
${assoc_srcdir}/detail/ov_tree_map_/info_fn_imps.hpp \
${assoc_srcdir}/detail/ov_tree_map_/iterators_fn_imps.hpp \
${assoc_srcdir}/detail/ov_tree_map_/debug_fn_imps.hpp \
${assoc_srcdir}/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp \
${assoc_srcdir}/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
assoc_headers5 = \
${assoc_srcdir}/detail/lu_assoc_cntnr/policy_access_fn_imps.hpp \
${assoc_srcdir}/detail/lu_assoc_cntnr/constructor_destructor_fn_imps.hpp \
${assoc_srcdir}/detail/hash_fn/linear_probe_fn_imp.hpp \
......@@ -1104,12 +1116,29 @@ stamp-ext: ${ext_headers}
# Have to deal with nested include directories, gah! Strip off source
# directory before making the link.
stamp-assoc: ${assoc_headers}
# XXX check ${assoc_headers}
stamp-assoc:
@if [ ! -d "${assoc_builddir}" ]; then \
mkdir -p ${assoc_subdirs} ;\
fi ;\
if [ ! -f stamp-assoc ]; then \
(cd ${assoc_builddir} && for h in $?; do \
(cd ${assoc_builddir} && for h in ${assoc_headers1}; do \
build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(LN_S) $$h $${build_name} || true ;\
done) ;\
(cd ${assoc_builddir} && for h in ${assoc_headers2}; do \
build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(LN_S) $$h $${build_name} || true ;\
done) ;\
(cd ${assoc_builddir} && for h in ${assoc_headers3}; do \
build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(LN_S) $$h $${build_name} || true ;\
done) ;\
(cd ${assoc_builddir} && for h in ${assoc_headers4}; do \
build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(LN_S) $$h $${build_name} || true ;\
done) ;\
(cd ${assoc_builddir} && for h in ${assoc_headers5}; do \
build_name=`echo $$h | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(LN_S) $$h $${build_name} || true ;\
done) ;\
......@@ -1263,7 +1292,23 @@ install-headers:
$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${assoc_builddir}
for dir in ${assoc_subdirs}; do \
$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/$${dir} ; done
for file in ${assoc_headers}; do \
for file in ${assoc_headers1}; do \
install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \
relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
for file in ${assoc_headers2}; do \
install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \
relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
for file in ${assoc_headers3}; do \
install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \
relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
for file in ${assoc_headers4}; do \
install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \
relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
for file in ${assoc_headers5}; do \
install_base=$(DESTDIR)${gxx_include_dir}/${assoc_builddir} ; \
relative_name=`echo $$file | sed -e "s|${assoc_srcdir}|.|g"` ;\
$(INSTALL_DATA) $${file} $${install_base}/$${relative_name} ; done
......
libstdc++-v3/libmath/Makefile.in
# 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,
......@@ -14,8 +14,6 @@
@SET_MAKE@
SOURCES = $(libmath_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
......
libstdc++-v3/libsupc++/Makefile.in
# 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,
......@@ -15,8 +15,6 @@
@SET_MAKE@
SOURCES = $(libsupc___la_SOURCES) $(libsupc__convenience_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
......
libstdc++-v3/po/Makefile.in
# 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,
......
libstdc++-v3/src/Makefile.in
# 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,
......@@ -14,8 +14,6 @@
@SET_MAKE@
SOURCES = $(libstdc___la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
......
libstdc++-v3/testsuite/Makefile.in
# 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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment