diff options
| author | Joerg Richter <joerg.richter@pdv-fs.de> | 2007-07-05 11:45:24 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2007-07-05 11:45:24 +0000 |
| commit | 68d64ccd473dbb8169373b15b804312478b08836 (patch) | |
| tree | e2bb38a53fecaaf1500d106b26cc2d744e893f8d | |
| parent | 4643b71608fa0dfcd70943fea33159fc04510831 (diff) | |
| download | gcc-68d64ccd473dbb8169373b15b804312478b08836.zip gcc-68d64ccd473dbb8169373b15b804312478b08836.tar.gz gcc-68d64ccd473dbb8169373b15b804312478b08836.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.am | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.in | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8b8af16..fdfb780 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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> * include/bits/stl_algo.h (search(_ForwardIterator1, diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 406b313..f661ed4 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -1017,6 +1017,8 @@ stamp-visibility: echo 0 > stamp-visibility 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} \ ${glibcxx_srcdir}/include/bits/c++config \ stamp-${host_alias} \ @@ -1026,7 +1028,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ @date=`cat ${toplevel_srcdir}/gcc/DATESTAMP` ;\ nsa_version=`cat stamp-namespace-version` ;\ visibility=`cat stamp-visibility` ;\ - ldbl_compat='' ;\ + ldbl_compat='s,g,g,' ;\ 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,' ;\ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index bffba8d..9f5c7fb 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1404,6 +1404,8 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias} @ENABLE_VISIBILITY_FALSE@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} \ ${glibcxx_srcdir}/include/bits/c++config \ stamp-${host_alias} \ @@ -1413,7 +1415,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ @date=`cat ${toplevel_srcdir}/gcc/DATESTAMP` ;\ nsa_version=`cat stamp-namespace-version` ;\ visibility=`cat stamp-visibility` ;\ - ldbl_compat='' ;\ + ldbl_compat='s,g,g,' ;\ 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,' ;\ |