re PR bootstrap/54453 (r190783 breaks bootstrap on powerpc64-unknown-linux-gnu)

	PR bootstrap/54453
	* include/Makefile.am: Fix regex.
	* include/Makefile.in: Regenerate.

From-SVN: r190939

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f6539889ee244536ebb94f5f29e41bb3c2b98cde..74391d6b1d24d0f61bd9c79d8937d3e5a4e4c3a2 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-04  Steven Bosscher  <steven@gcc.gnu.org>
+
+       PR bootstrap/54453
+       * include/Makefile.am: Fix regex.
+       * include/Makefile.in: Regenerate.
+
 2012-08-30  Benjamin Kosnik  <bkoz@redhat.com>
 
        PR libstdc++/54005 continued

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index d3d6f4af858b1f5f34d35216ddd2961ca2c1719b..bce14ca6736bbe5c6841cb8552090c376cc75976 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -1101,7 +1101,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," \
@@ -1115,7 +1115,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 34fcf78bcb3d54fdd737fada1f786b9dddb2b2da..9e4d253515aa59b1796674c49a285885047a5e02 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -1499,7 +1499,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," \
@@ -1513,7 +1513,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" >> $@