Adapt alpha_assert fix to recent Tru64 UNIX V5.1
Rainer Orth
ro@CeBiTec.Uni-Bielefeld.DE
Tue Mar 30 13:26:00 GMT 2010
After upgrading my Tru64 UNIX V5.1 box to V5.1B-5, mainline bootstrap
failed in stage 2 building jc1. It turned out that <assert.h> had been
changed so the alpha_assert fix doesn't apply anymore.
The following patch fixes this and allows the 3-stage to finish, though
I'm now running into an ICE building libstdc++.
Ok for mainline?
Rainer
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University
2010-03-26 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* inclhack.def (alpha_assert): Allow for more whitespace in
select.
* fixincl.x: Regenerate.
diff -r bb55ed8dd84d fixincludes/inclhack.def
--- a/fixincludes/inclhack.def Fri Mar 26 09:51:32 2010 +0000
+++ b/fixincludes/inclhack.def Fri Mar 26 16:28:52 2010 +0100
@@ -607,7 +607,7 @@
fix = {
hackname = alpha_assert;
files = "assert.h";
- select = '(#define assert\(EX\).*)\(\(int\) \(EX\)\)';
+ select = '(#[ \t]*define assert\(EX\).*)\(\(int\) \(EX\)\)';
c_fix = format;
c_fix_arg = "%1(EX)";
test_text = '#define assert(EX) (((int) (EX)) ? (void)0 '
More information about the Gcc-patches
mailing list