diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 807f4ac99cdc2eb84ebe7ff7f9841ecf14c5df0c..65b7e8e3d4e420fd57d47a492191d9a336d920a2 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,10 +1,15 @@ +2012-12-04 Steven Bosscher <steven@gcc.gnu.org> + + * include/Makefile.am: Fix regexp broken by previous commit. + * include/Makefile.in: Likewise. + 2012-12-03 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp: Remove. * include/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp: Remove. - * include/Makefile.am (pb_headers): Remove include files. + * include/Makefile.am (pb_headers): Remove include files. * include/Makefile.in: Regenerated. 2012-12-01 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 27454c7f71ed4ccabc753e6804c370c4dc12129f..6760bd8ab76bff99b5f869f1342b62de87de02ab 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -1105,7 +1105,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ visibility=`cat stamp-visibility` ;\ externtemplate=`cat stamp-extern-template` ;\ ldbl_compat='s,g,g,' ;\ - grep "^[ ]*#[ ]*define[ ][ ]*_GLIBCXX_LONG_DOUBLE_COMPAT[ ][ ]*1[ ]*$$" \ + 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," \ @@ -1119,7 +1119,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ -e 's/VERSION/_GLIBCXX_VERSION/g' \ -e 's/WORDS_/_GLIBCXX_WORDS_/g' \ -e 's/ICONV_CONST/_GLIBCXX_ICONV_CONST/g' \ - -e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \ + -e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \ < ${CONFIG_HEADER} >> $@ ;\ echo "" >> $@ ;\ echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> $@ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 759bcd128484d5a2c1a19625c9d6b623a4d43d7f..7fd84874277eaae3df2254a0de718aa3c869dbab 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1507,7 +1507,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ visibility=`cat stamp-visibility` ;\ externtemplate=`cat stamp-extern-template` ;\ ldbl_compat='s,g,g,' ;\ - grep "^[ ]*#[ ]*define[ ][ ]*_GLIBCXX_LONG_DOUBLE_COMPAT[ ][ ]*1[ ]*$$" \ + 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," \ @@ -1521,7 +1521,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ -e 's/VERSION/_GLIBCXX_VERSION/g' \ -e 's/WORDS_/_GLIBCXX_WORDS_/g' \ -e 's/ICONV_CONST/_GLIBCXX_ICONV_CONST/g' \ - -e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \ + -e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \ < ${CONFIG_HEADER} >> $@ ;\ echo "" >> $@ ;\ echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> $@