Skip to content

R
riscv-gcc-1
Commit 1a044f41 by Steven Bosscher
Options

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
parent 4d4b1b30
Showing with 10 additions and 4 deletions
libstdc++-v3/ChangeLog
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> 2012-08-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/54005 continued PR libstdc++/54005 continued
......
libstdc++-v3/include/Makefile.am
...@@ -1101,7 +1101,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ ...@@ -1101,7 +1101,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
visibility=`cat stamp-visibility` ;\ visibility=`cat stamp-visibility` ;\
externtemplate=`cat stamp-extern-template` ;\ externtemplate=`cat stamp-extern-template` ;\
ldbl_compat='s,g,g,' ;\ 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 \ ${CONFIG_HEADER} > /dev/null 2>&1 \
&& ldbl_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_COMPAT 1,' ;\ && ldbl_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_COMPAT 1,' ;\
sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \ sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \
...@@ -1115,7 +1115,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ ...@@ -1115,7 +1115,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
-e 's/VERSION/_GLIBCXX_VERSION/g' \ -e 's/VERSION/_GLIBCXX_VERSION/g' \
-e 's/WORDS_/_GLIBCXX_WORDS_/g' \ -e 's/WORDS_/_GLIBCXX_WORDS_/g' \
-e 's/ICONV_CONST/_GLIBCXX_ICONV_CONST/g' \ -e 's/ICONV_CONST/_GLIBCXX_ICONV_CONST/g' \
-e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \ -e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \
< ${CONFIG_HEADER} >> $@ ;\ < ${CONFIG_HEADER} >> $@ ;\
echo "" >> $@ ;\ echo "" >> $@ ;\
echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> $@ echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> $@
......
libstdc++-v3/include/Makefile.in
...@@ -1499,7 +1499,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ ...@@ -1499,7 +1499,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
visibility=`cat stamp-visibility` ;\ visibility=`cat stamp-visibility` ;\
externtemplate=`cat stamp-extern-template` ;\ externtemplate=`cat stamp-extern-template` ;\
ldbl_compat='s,g,g,' ;\ 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 \ ${CONFIG_HEADER} > /dev/null 2>&1 \
&& ldbl_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_COMPAT 1,' ;\ && ldbl_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_COMPAT 1,' ;\
sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \ sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \
...@@ -1513,7 +1513,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ ...@@ -1513,7 +1513,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
-e 's/VERSION/_GLIBCXX_VERSION/g' \ -e 's/VERSION/_GLIBCXX_VERSION/g' \
-e 's/WORDS_/_GLIBCXX_WORDS_/g' \ -e 's/WORDS_/_GLIBCXX_WORDS_/g' \
-e 's/ICONV_CONST/_GLIBCXX_ICONV_CONST/g' \ -e 's/ICONV_CONST/_GLIBCXX_ICONV_CONST/g' \
-e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \ -e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \
< ${CONFIG_HEADER} >> $@ ;\ < ${CONFIG_HEADER} >> $@ ;\
echo "" >> $@ ;\ echo "" >> $@ ;\
echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> $@ echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> $@
......
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