MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix sed script for sysv86_string fix

Browse Source 
From-SVN: r35908
This commit is contained in:
Eli Zaretskii 2000-08-23 17:03:47 +03:00 committed by Bruce Korb
parent ed4befff9a
commit f4306baa73
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2000-08-12 Eli Zaretskii <eliz@is.elta.co.il>
* fixinc/inclhack.def (sysv68_string): Fix the Sed script so it
works inside fixincl.
Wed Aug 23 04:55:48 2000 Alexandre Oliva <aoliva@redhat.com>
* simplify-rtx.c (simplify_rtx): Don't pass VOIDmode to

4
gcc/fixinc/fixincl.x
View File

@ -4217,12 +4217,12 @@ const char* apzSysv68_StringPatch[] = { "sed",
"-e", "s/strdup(char \\*s1);/strdup(const char *s1);/",
"-e", "/^extern char$/N",
"-e", "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/",
"-e", "/^extern int$/N",
"-e", "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/",
"-e", "/^\tstrncmp(),$/N",
"-e", "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n\
extern unsigned int\\\n\
\\2/",
"-e", "/^extern int$/N",
"-e", "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *

11
gcc/fixinc/inclhack.def
View File

@ -2587,17 +2587,13 @@ fix = {
sed = "/^extern char$/N";
sed = "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/";
/*
* This sed expression is broken inside fixincl.
* The same expression seems to work outside, however :-(
*/
sed = "/^extern int$/N";
sed = "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/";
sed = "/^\tstrncmp(),$/N";
sed = 's/^\(' "\t" 'strncmp()\),\n\(' "\t" 'strlen(),\)$/'
'\1;' "\\\nextern unsigned int\\\n\\2/";
sed = "/^extern int$/N";
sed = "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/";
test_text =
"extern int strlen();\n"
@ -2608,6 +2604,7 @@ fix = {
"\tmemcpy();\n"
"extern int\n"
"\tstrcmp(),\n"
"\tstrncmp(),\n"
"\tstrlen(),\n"
"\tstrspn();\n"