git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libstdc++/31957 (Build of compiler fails with 'error: #endif without #if') 

2007-07-05  Joerg Richter  <joerg.richter@pdv-fs.de>

	PR libstdc++/31957
	* include/Makefile.am: Work around an AIX sed oddity.
	* include/Makefile.in: Regenerate.

From-SVN: r126362
This commit is contained in:
Joerg Richter 2007-07-05 11:45:24 +00:00 committed by Paolo Carlini
parent 4643b71608
commit 68d64ccd47
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2007-07-05 Joerg Richter <joerg.richter@pdv-fs.de>
PR libstdc++/31957
* include/Makefile.am: Work around an AIX sed oddity.
* include/Makefile.in: Regenerate.
2007-07-04 Jim Xochellis <jimxoch@yahoo.gr> 2007-07-04 Jim Xochellis <jimxoch@yahoo.gr>
* include/bits/stl_algo.h (search(_ForwardIterator1, * include/bits/stl_algo.h (search(_ForwardIterator1,

4
libstdc++-v3/include/Makefile.am
View File

@ -1017,6 +1017,8 @@ stamp-visibility:
echo 0 > stamp-visibility echo 0 > stamp-visibility
endif endif
# NB: The non-empty default ldbl_compat works around an AIX sed
# oddity, see libstdc++/31957 for details.
${host_builddir}/c++config.h: ${CONFIG_HEADER} \ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
${glibcxx_srcdir}/include/bits/c++config \ ${glibcxx_srcdir}/include/bits/c++config \
stamp-${host_alias} \ stamp-${host_alias} \
@ -1026,7 +1028,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
@date=`cat ${toplevel_srcdir}/gcc/DATESTAMP` ;\ @date=`cat ${toplevel_srcdir}/gcc/DATESTAMP` ;\
nsa_version=`cat stamp-namespace-version` ;\ nsa_version=`cat stamp-namespace-version` ;\
visibility=`cat stamp-visibility` ;\ visibility=`cat stamp-visibility` ;\
ldbl_compat='' ;\ 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,' ;\

4
libstdc++-v3/include/Makefile.in
View File

@ -1404,6 +1404,8 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
@ENABLE_VISIBILITY_FALSE@stamp-visibility: @ENABLE_VISIBILITY_FALSE@stamp-visibility:
@ENABLE_VISIBILITY_FALSE@ echo 0 > stamp-visibility @ENABLE_VISIBILITY_FALSE@ echo 0 > stamp-visibility
# NB: The non-empty default ldbl_compat works around an AIX sed
# oddity, see libstdc++/31957 for details.
${host_builddir}/c++config.h: ${CONFIG_HEADER} \ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
${glibcxx_srcdir}/include/bits/c++config \ ${glibcxx_srcdir}/include/bits/c++config \
stamp-${host_alias} \ stamp-${host_alias} \
@ -1413,7 +1415,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
@date=`cat ${toplevel_srcdir}/gcc/DATESTAMP` ;\ @date=`cat ${toplevel_srcdir}/gcc/DATESTAMP` ;\
nsa_version=`cat stamp-namespace-version` ;\ nsa_version=`cat stamp-namespace-version` ;\
visibility=`cat stamp-visibility` ;\ visibility=`cat stamp-visibility` ;\
ldbl_compat='' ;\ 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,' ;\