This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
PATCH: [4.5 Regression] Revision 151352 breaks 32bit libstdc++
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: Ralf dot Wildenhues at gmx dot de
- Date: Sat, 5 Sep 2009 11:31:45 -0700
- Subject: PATCH: [4.5 Regression] Revision 151352 breaks 32bit libstdc++
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
See
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41280
for details. This patch fixes 32bit libstdc++ on Linux/x86-64. OK to
install?
Thanks.
H.J.
---
2009-09-05 H.J. Lu <hongjiu.lu@intel.com>
PR libstdc++/41280
* configure.ac: Run "${multi_basedir}/config-ml.in" to generate
MULTISUBDIR = in subdirectory Makefiles.
* configured: Regenerate.
Index: libstdc++-v3/configure
===================================================================
--- libstdc++-v3/configure (revision 151352)
+++ libstdc++-v3/configure (working copy)
@@ -61956,57 +61956,64 @@ fi
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
sed -f vpsed$$ $ac_file > tmp$$
- grep '^MULTISUBDIR =' Makefile >> tmp$$
mv tmp$$ $ac_file
rm vpsed$$
+ echo 'MULTISUBDIR =' >> $ac_file
+ . ${multi_basedir}/config-ml.in
;;
"libsupc++/Makefile":F) cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
sed -f vpsed$$ $ac_file > tmp$$
- grep '^MULTISUBDIR =' Makefile >> tmp$$
mv tmp$$ $ac_file
rm vpsed$$
+ echo 'MULTISUBDIR =' >> $ac_file
+ . ${multi_basedir}/config-ml.in
;;
"python/Makefile":F) cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
sed -f vpsed$$ $ac_file > tmp$$
- grep '^MULTISUBDIR =' Makefile >> tmp$$
mv tmp$$ $ac_file
rm vpsed$$
+ echo 'MULTISUBDIR =' >> $ac_file
+ . ${multi_basedir}/config-ml.in
;;
"src/Makefile":F) cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
sed -f vpsed$$ $ac_file > tmp$$
- grep '^MULTISUBDIR =' Makefile >> tmp$$
mv tmp$$ $ac_file
rm vpsed$$
+ echo 'MULTISUBDIR =' >> $ac_file
+ . ${multi_basedir}/config-ml.in
;;
"doc/Makefile":F) cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
sed -f vpsed$$ $ac_file > tmp$$
- grep '^MULTISUBDIR =' Makefile >> tmp$$
mv tmp$$ $ac_file
rm vpsed$$
+ echo 'MULTISUBDIR =' >> $ac_file
+ . ${multi_basedir}/config-ml.in
;;
"po/Makefile":F) cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
sed -f vpsed$$ $ac_file > tmp$$
- grep '^MULTISUBDIR =' Makefile >> tmp$$
mv tmp$$ $ac_file
rm vpsed$$
+ echo 'MULTISUBDIR =' >> $ac_file
+ . ${multi_basedir}/config-ml.in
;;
"testsuite/Makefile":F) cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
sed -f vpsed$$ $ac_file > tmp$$
- grep '^MULTISUBDIR =' Makefile >> tmp$$
mv tmp$$ $ac_file
rm vpsed$$
+ echo 'MULTISUBDIR =' >> $ac_file
+ . ${multi_basedir}/config-ml.in
;;
"generate-headers":C) (cd include && ${MAKE-make} pch_build= ) ;;
Index: libstdc++-v3/configure.ac
===================================================================
--- libstdc++-v3/configure.ac (revision 151352)
+++ libstdc++-v3/configure.ac (working copy)
@@ -404,9 +404,10 @@ AC_CONFIG_FILES(AC_FOREACH([DIR], glibcx
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
sed -f vpsed$$ $ac_file > tmp$$
- grep '^MULTISUBDIR =' Makefile >> tmp$$
mv tmp$$ $ac_file
rm vpsed$$
+ echo 'MULTISUBDIR =' >> $ac_file
+ . ${multi_basedir}/config-ml.in
])
AC_CONFIG_COMMANDS([generate-headers],