summaryrefslogtreecommitdiffstats
path: root/gcc/fixinc/fixincl.x
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/fixinc/fixincl.x')
-rw-r--r--gcc/fixinc/fixincl.x9
1 files changed, 5 insertions, 4 deletions
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 3abae02dac6..5b3728b28d0 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -2267,12 +2267,13 @@ tTestDesc aLibc1_Ifdefd_MemxTests[] = {
*/
const char* apzLibc1_Ifdefd_MemxPatch[] = {
"format",
- "%1 || defined(__cplusplus)\n\
-%2",
+ "%1",
"/\\* `mem...' is a built-in function for gcc 2\\.x\\. \\*/\n\
-(#if defined\\(__STDC__\\) && __GNUC__ < 2)\n\
+#if defined\\(__STDC__\\) && __GNUC__ < 2\n\
(/\\* .* \\*/\n\
-extern [a-z_]+ mem)",
+extern [a-z_]+ mem.*(\n\
+[^#].*)*;)\n\
+#endif",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
OpenPOWER on IntegriCloud