[3.0.1 and mainline] PATCH for libstdc++/3284
Loren James Rittle
rittle@latour.rsch.comm.mot.com
Mon Jul 2 15:37:00 GMT 2001
This patch was pre-approved for use on 3.0.1 and mainline over a week
ago by Alexandre Oliva. Fully rebuilt libstdc++-v3 and checked with
no regressions in either location on i386-unknown-freebsd4.2. (I also
verified that the staged include/bits/gthr*.h files were identical
before and after this patch.) Installed on mainline and 3.0.1 branch.
It is strongly believed that this will allow Mandrake 8.0 to bootstrap
without users having to reset locale, etc. Either way, the old
construct was not considered portable by our shell/autoconf expert.
But I will only close the PR once a report comes in from a Mandrake
8.0 user that gcc bootstrap works with 3.0.1 (or mainline, since they
had the exact same issue) without unsetting their locale.
2001-07-02 Loren J. Rittle <ljrittle@acm.org>
libstdc++/3284
* acinclude.m4 (GLIBCPP_ENABLE_THREADS): Portability enhancement.
* aclocal.m4: Regenerate.
* configure: Regenerate.
Index: libstdc++-v3/acinclude.m4
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/acinclude.m4,v
retrieving revision 1.162
diff -c -r1.162 acinclude.m4
*** acinclude.m4 2001/07/02 21:30:30 1.162
--- acinclude.m4 2001/07/02 21:50:49
***************
*** 1159,1173 ****
AC_DEFINE(HAVE_GTHR_DEFAULT)
AC_DEFINE(_GLIBCPP_SUPPORTS_WEAK, __GXX_WEAK__)
fi
! AC_OUTPUT_COMMANDS([d=include/bits
rm -f $d/gthr.h $d/gthr-single.h $d/gthr-default.h
! sed '/^#/s/\([A-Z_][A-Z_]*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
| sed 's,"gthr-,"bits/gthr-,' >$d/gthr.h
sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-single.h-in \
! | sed 's/\(GCC[A-Z_]*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-default.h-in \
! | sed 's/\(GCC[A-Z_]*_H\)/_GLIBCPP_\1/g' \
! | sed 's/\([A-Z_]*WEAK\)/_GLIBCPP_\1/g' >$d/gthr-default.h])
])
--- 1159,1173 ----
AC_DEFINE(HAVE_GTHR_DEFAULT)
AC_DEFINE(_GLIBCPP_SUPPORTS_WEAK, __GXX_WEAK__)
fi
! AC_OUTPUT_COMMANDS([d=include/bits; a='[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]'
rm -f $d/gthr.h $d/gthr-single.h $d/gthr-default.h
! sed '/^#/s/\('$a$a'*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
| sed 's,"gthr-,"bits/gthr-,' >$d/gthr.h
sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-single.h-in \
! | sed 's/\(GCC'$a'*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-default.h-in \
! | sed 's/\(GCC'$a'*_H\)/_GLIBCPP_\1/g' \
! | sed 's/\('$a'*WEAK\)/_GLIBCPP_\1/g' >$d/gthr-default.h])
])
More information about the Libstdc++
mailing list