Skip to content

R
riscv-gcc-1
Commit c329beb0 by Bruce Korb Committed by Bruce Korb
Options

KandR-ification of fixincl.x 

From-SVN: r27024
parent 7ec6a04e
Showing with 459 additions and 522 deletions
gcc/ChangeLog
...@@ -3,10 +3,10 @@ Wed May 19 03:56:56 1999 Mark Mitchell <mark@codesourcery.com> ...@@ -3,10 +3,10 @@ Wed May 19 03:56:56 1999 Mark Mitchell <mark@codesourcery.com>
* stmt.c (expand_return): Call start_cleanup_deferral and * stmt.c (expand_return): Call start_cleanup_deferral and
end_cleanup_deferral around conditional code. end_cleanup_deferral around conditional code.
Wed May 19 03:10:08 1999 Bruce Korb <ddsinc09@ix.netcom.com> Wed May 19 08:40:08 1999 Bruce Korb <ddsinc09@ix.netcom.com>
* fixinc/fixincl.tpl: Avoid depending on ANSI C features for * fixinc/fixincl.tpl: Avoid depending on ANSI C features for
filename lists. filename lists. Utilizes new "krstr" AutoGen function.
* fixinc/fixincl.x: Rebuilt. * fixinc/fixincl.x: Rebuilt.
Wed May 19 02:47:11 1999 Jan Hubicka (hubicka@freesoft.cz) Wed May 19 02:47:11 1999 Jan Hubicka (hubicka@freesoft.cz)
......
gcc/fixinc/fixincl.tpl
...@@ -22,7 +22,7 @@ _FOR fix =] ...@@ -22,7 +22,7 @@ _FOR fix =]
* Description [=_eval _index 1 + "#%3d -" _printf=] [=hackname _Cap=] fix * Description [=_eval _index 1 + "#%3d -" _printf=] [=hackname _Cap=] fix
*/ */
tSCC z[=hackname _cap=]Name[] = tSCC z[=hackname _cap=]Name[] =
[=hackname _cap _str=]; [=hackname _cap _krstr=];
/* /*
* File name selection pattern * File name selection pattern
*/[= */[=
...@@ -41,7 +41,7 @@ tSCC z[=hackname _cap=]List[] = ...@@ -41,7 +41,7 @@ tSCC z[=hackname _cap=]List[] =
_IF mach _exist=] _IF mach _exist=]
tSCC* apz[=hackname _cap=]Machs[] = {[= tSCC* apz[=hackname _cap=]Machs[] = {[=
_FOR mach =] _FOR mach =]
[=mach _str=],[= [=mach _krstr=],[=
/mach=] /mach=]
(const char*)NULL };[= (const char*)NULL };[=
...@@ -58,7 +58,7 @@ tSCC* apz[=hackname _cap=]Machs[] = {[= ...@@ -58,7 +58,7 @@ tSCC* apz[=hackname _cap=]Machs[] = {[=
*/[= */[=
_FOR exesel =] _FOR exesel =]
tSCC z[=hackname _cap=]Select[=_eval _index=][] = tSCC z[=hackname _cap=]Select[=_eval _index=][] =
[=exesel _str=];[= [=exesel _krstr=];[=
/exesel =][= /exesel =][=
_ELIF select _exist=] _ELIF select _exist=]
...@@ -68,7 +68,7 @@ tSCC z[=hackname _cap=]Select[=_eval _index=][] = ...@@ -68,7 +68,7 @@ tSCC z[=hackname _cap=]Select[=_eval _index=][] =
*/[= */[=
_FOR select =] _FOR select =]
tSCC z[=hackname _cap=]Select[=_eval _index=][] = tSCC z[=hackname _cap=]Select[=_eval _index=][] =
[=select _str=];[= [=select _krstr=];[=
/select =][= /select =][=
_ENDIF =][= _ENDIF =][=
...@@ -79,7 +79,7 @@ tSCC z[=hackname _cap=]Select[=_eval _index=][] = ...@@ -79,7 +79,7 @@ tSCC z[=hackname _cap=]Select[=_eval _index=][] =
*/[= */[=
_FOR bypass =] _FOR bypass =]
tSCC z[=hackname _cap=]Bypass[=_eval _index=][] = tSCC z[=hackname _cap=]Bypass[=_eval _index=][] =
[=bypass _str=];[= [=bypass _krstr=];[=
/bypass =][= /bypass =][=
_ENDIF =][= _ENDIF =][=
...@@ -90,7 +90,7 @@ tSCC z[=hackname _cap=]Bypass[=_eval _index=][] = ...@@ -90,7 +90,7 @@ tSCC z[=hackname _cap=]Bypass[=_eval _index=][] =
*/[= */[=
_FOR test =] _FOR test =]
tSCC z[=hackname _cap=]Test[=_eval _index=][] = tSCC z[=hackname _cap=]Test[=_eval _index=][] =
[=test _str=];[= [=test _krstr=];[=
/test =][= /test =][=
_ENDIF =][= _ENDIF =][=
...@@ -157,9 +157,9 @@ tTestDesc a[=hackname _cap=]Tests[] = {[= ...@@ -157,9 +157,9 @@ tTestDesc a[=hackname _cap=]Tests[] = {[=
*/ */
const char* apz[=hackname _cap=]Patch[] = {[= const char* apz[=hackname _cap=]Patch[] = {[=
_IF sed _exist =] "sed"[=_FOR sed=], _IF sed _exist =] "sed"[=_FOR sed=],
"-e", [=sed _str=][=/sed=][= "-e", [=sed _krstr=][=/sed=][=
_ELIF shell _exist =] "sh", "-c", _ELIF shell _exist =] "sh", "-c",
[=shell _str=][= [=shell _krstr=][=
_ENDIF=], _ENDIF=],
(char*)NULL }; (char*)NULL };
......
gcc/fixinc/fixincl.x
...@@ -58,8 +58,8 @@ tTestDesc aAix_SyswaitTests[] = { ...@@ -58,8 +58,8 @@ tTestDesc aAix_SyswaitTests[] = {
* Fix Command Arguments for Aix_Syswait * Fix Command Arguments for Aix_Syswait
*/ */
const char* apzAix_SyswaitPatch[] = { "sed", const char* apzAix_SyswaitPatch[] = { "sed",
"-e", "/^extern pid_t wait3();$/i\\\n" "-e", "/^extern pid_t wait3();$/i\\\n\
"struct rusage;\n", struct rusage;\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -140,7 +140,7 @@ tSCC zAlpha_ParensName[] = ...@@ -140,7 +140,7 @@ tSCC zAlpha_ParensName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zAlpha_ParensList[] = tSCC zAlpha_ParensList[] =
"|" "sym.h" "|"; "|sym.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -174,7 +174,7 @@ tSCC zAlpha_SbrkName[] = ...@@ -174,7 +174,7 @@ tSCC zAlpha_SbrkName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zAlpha_SbrkList[] = tSCC zAlpha_SbrkList[] =
"|" "unistd.h" "|"; "|unistd.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -208,7 +208,7 @@ tSCC zArm_Norcroft_HintName[] = ...@@ -208,7 +208,7 @@ tSCC zArm_Norcroft_HintName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zArm_Norcroft_HintList[] = tSCC zArm_Norcroft_HintList[] =
"|" "X11/Intrinsic.h" "|"; "|X11/Intrinsic.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -242,7 +242,7 @@ tSCC zArm_WcharName[] = ...@@ -242,7 +242,7 @@ tSCC zArm_WcharName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zArm_WcharList[] = tSCC zArm_WcharList[] =
"|" "stdlib.h" "|"; "|stdlib.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -277,7 +277,7 @@ tSCC zAux_AsmName[] = ...@@ -277,7 +277,7 @@ tSCC zAux_AsmName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zAux_AsmList[] = tSCC zAux_AsmList[] =
"|" "sys/param.h" "|"; "|sys/param.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -311,10 +311,7 @@ tSCC zAvoid_BoolName[] = ...@@ -311,10 +311,7 @@ tSCC zAvoid_BoolName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zAvoid_BoolList[] = tSCC zAvoid_BoolList[] =
"|" "curses.h" "|curses.h|curses_colr/curses.h|term.h|tinfo.h|";
"|" "curses_colr/curses.h"
"|" "term.h"
"|" "tinfo.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -327,18 +324,18 @@ tSCC zAvoid_BoolList[] = ...@@ -327,18 +324,18 @@ tSCC zAvoid_BoolList[] =
* Fix Command Arguments for Avoid_Bool * Fix Command Arguments for Avoid_Bool
*/ */
const char* apzAvoid_BoolPatch[] = { "sed", const char* apzAvoid_BoolPatch[] = { "sed",
"-e", "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/i\\\n" "-e", "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/i\\\n\
"#ifndef __cplusplus\n", #ifndef __cplusplus\n",
"-e", "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/a\\\n" "-e", "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/a\\\n\
"#endif\n", #endif\n",
"-e", "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/i\\\n" "-e", "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/i\\\n\
"#ifndef __cplusplus\n", #ifndef __cplusplus\n",
"-e", "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/a\\\n" "-e", "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/a\\\n\
"#endif\n", #endif\n",
"-e", "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/i\\\n" "-e", "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/i\\\n\
"#ifndef __cplusplus\n", #ifndef __cplusplus\n",
"-e", "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/a\\\n" "-e", "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/a\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -351,7 +348,7 @@ tSCC zBad_Struct_TermName[] = ...@@ -351,7 +348,7 @@ tSCC zBad_Struct_TermName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zBad_Struct_TermList[] = tSCC zBad_Struct_TermList[] =
"|" "curses.h" "|"; "|curses.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -385,7 +382,7 @@ tSCC zBadquoteName[] = ...@@ -385,7 +382,7 @@ tSCC zBadquoteName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zBadquoteList[] = tSCC zBadquoteList[] =
"|" "sundev/vuid_event.h" "|"; "|sundev/vuid_event.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -411,20 +408,7 @@ tSCC zBad_LvalName[] = ...@@ -411,20 +408,7 @@ tSCC zBad_LvalName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zBad_LvalList[] = tSCC zBad_LvalList[] =
"|" "libgen.h" "|libgen.h|dirent.h|ftw.h|grp.h|ndbm.h|pthread.h|pwd.h|signal.h|standards.h|stdlib.h|string.h|stropts.h|time.h|unistd.h|";
"|" "dirent.h"
"|" "ftw.h"
"|" "grp.h"
"|" "ndbm.h"
"|" "pthread.h"
"|" "pwd.h"
"|" "signal.h"
"|" "standards.h"
"|" "stdlib.h"
"|" "string.h"
"|" "stropts.h"
"|" "time.h"
"|" "unistd.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -458,7 +442,7 @@ tSCC zBroken_Assert_StdioName[] = ...@@ -458,7 +442,7 @@ tSCC zBroken_Assert_StdioName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zBroken_Assert_StdioList[] = tSCC zBroken_Assert_StdioList[] =
"|" "assert.h" "|"; "|assert.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -486,8 +470,8 @@ tTestDesc aBroken_Assert_StdioTests[] = { ...@@ -486,8 +470,8 @@ tTestDesc aBroken_Assert_StdioTests[] = {
* Fix Command Arguments for Broken_Assert_Stdio * Fix Command Arguments for Broken_Assert_Stdio
*/ */
const char* apzBroken_Assert_StdioPatch[] = { "sed", const char* apzBroken_Assert_StdioPatch[] = { "sed",
"-e", "1i\\\n" "-e", "1i\\\n\
"#include <stdio.h>\n", #include <stdio.h>\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -500,7 +484,7 @@ tSCC zBroken_Assert_StdlibName[] = ...@@ -500,7 +484,7 @@ tSCC zBroken_Assert_StdlibName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zBroken_Assert_StdlibList[] = tSCC zBroken_Assert_StdlibList[] =
"|" "assert.h" "|"; "|assert.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -528,10 +512,10 @@ tTestDesc aBroken_Assert_StdlibTests[] = { ...@@ -528,10 +512,10 @@ tTestDesc aBroken_Assert_StdlibTests[] = {
* Fix Command Arguments for Broken_Assert_Stdlib * Fix Command Arguments for Broken_Assert_Stdlib
*/ */
const char* apzBroken_Assert_StdlibPatch[] = { "sed", const char* apzBroken_Assert_StdlibPatch[] = { "sed",
"-e", "1i\\\n" "-e", "1i\\\n\
"#ifdef __cplusplus\\\n" #ifdef __cplusplus\\\n\
"#include <stdlib.h>\\\n" #include <stdlib.h>\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -578,7 +562,7 @@ tSCC zDec_Intern_AsmName[] = ...@@ -578,7 +562,7 @@ tSCC zDec_Intern_AsmName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zDec_Intern_AsmList[] = tSCC zDec_Intern_AsmList[] =
"|" "c_asm.h" "|"; "|c_asm.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -591,10 +575,10 @@ tSCC zDec_Intern_AsmList[] = ...@@ -591,10 +575,10 @@ tSCC zDec_Intern_AsmList[] =
* Fix Command Arguments for Dec_Intern_Asm * Fix Command Arguments for Dec_Intern_Asm
*/ */
const char* apzDec_Intern_AsmPatch[] = { "sed", const char* apzDec_Intern_AsmPatch[] = { "sed",
"-e", "/^[ \t]*float[ \t]*fasm/i\\\n" "-e", "/^[ \t]*float[ \t]*fasm/i\\\n\
"#ifdef __DECC\n", #ifdef __DECC\n",
"-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n" "-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -648,8 +632,7 @@ tSCC zEcd_CursorName[] = ...@@ -648,8 +632,7 @@ tSCC zEcd_CursorName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zEcd_CursorList[] = tSCC zEcd_CursorList[] =
"|" "sunwindow/win_lock.h" "|sunwindow/win_lock.h|sunwindow/win_cursor.h|";
"|" "sunwindow/win_cursor.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -675,7 +658,7 @@ tSCC zSco5_Stat_WrappersName[] = ...@@ -675,7 +658,7 @@ tSCC zSco5_Stat_WrappersName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSco5_Stat_WrappersList[] = tSCC zSco5_Stat_WrappersList[] =
"|" "sys/stat.h" "|"; "|sys/stat.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -690,15 +673,15 @@ tSCC* apzSco5_Stat_WrappersMachs[] = { ...@@ -690,15 +673,15 @@ tSCC* apzSco5_Stat_WrappersMachs[] = {
* Fix Command Arguments for Sco5_Stat_Wrappers * Fix Command Arguments for Sco5_Stat_Wrappers
*/ */
const char* apzSco5_Stat_WrappersPatch[] = { "sed", const char* apzSco5_Stat_WrappersPatch[] = { "sed",
"-e", "/^static int[ \t]*[a-z]*stat(/i\\\n" "-e", "/^static int[ \t]*[a-z]*stat(/i\\\n\
"#ifdef __cplusplus\\\n" #ifdef __cplusplus\\\n\
"extern \"C\"\\\n" extern \"C\"\\\n\
"{\\\n" {\\\n\
"#endif\\\n", #endif\\\n",
"-e", "/^}$/a\\\n" "-e", "/^}$/a\\\n\
"#ifdef __cplusplus\\\n" #ifdef __cplusplus\\\n\
"}\\\n" }\\\n\
"#endif /* __cplusplus */\\\n", #endif /* __cplusplus */\\\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -731,13 +714,13 @@ tTestDesc aElse_LabelTests[] = { ...@@ -731,13 +714,13 @@ tTestDesc aElse_LabelTests[] = {
* Fix Command Arguments for Else_Label * Fix Command Arguments for Else_Label
*/ */
const char* apzElse_LabelPatch[] = { "sed", const char* apzElse_LabelPatch[] = { "sed",
"-e", ":loop\n" "-e", ":loop\n\
"/\\\\$/N\n" /\\\\$/N\n\
"s/\\\\$/\\\\+++fixinc_eol+++/\n" s/\\\\$/\\\\+++fixinc_eol+++/\n\
"/\\\\$/b loop\n" /\\\\$/b loop\n\
"s/\\\\+++fixinc_eol+++/\\\\/g\n" s/\\\\+++fixinc_eol+++/\\\\/g\n\
"s%^\\([ \t]*#[ \t]*else\\)[ \t]*/[^*].*%\\1%\n" s%^\\([ \t]*#[ \t]*else\\)[ \t]*/[^*].*%\\1%\n\
"s%^\\([ \t]*#[ \t]*else\\)[ \t]*[^/ \t].*%\\1%", s%^\\([ \t]*#[ \t]*else\\)[ \t]*[^/ \t].*%\\1%",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -770,14 +753,14 @@ tTestDesc aEndif_LabelTests[] = { ...@@ -770,14 +753,14 @@ tTestDesc aEndif_LabelTests[] = {
* Fix Command Arguments for Endif_Label * Fix Command Arguments for Endif_Label
*/ */
const char* apzEndif_LabelPatch[] = { "sed", const char* apzEndif_LabelPatch[] = { "sed",
"-e", ":loop\n" "-e", ":loop\n\
"/\\\\$/N\n" /\\\\$/N\n\
"s/\\\\$/\\\\+++fixinc_eol+++/\n" s/\\\\$/\\\\+++fixinc_eol+++/\n\
"/\\\\$/b loop\n" /\\\\$/b loop\n\
"s/\\\\+++fixinc_eol+++/\\\\/g\n" s/\\\\+++fixinc_eol+++/\\\\/g\n\
"s%^\\([ \t]*#[ \t]*endif\\)[ \t]*/[^*].*%\\1%\n" s%^\\([ \t]*#[ \t]*endif\\)[ \t]*/[^*].*%\\1%\n\
"s%^\\([ \t]*#[ \t]*endif\\)[ \t]*\\*[^/].*%\\1%\n" s%^\\([ \t]*#[ \t]*endif\\)[ \t]*\\*[^/].*%\\1%\n\
"s%^\\([ \t]*#[ \t]*endif\\)[ \t]*[^/* \t].*%\\1%", s%^\\([ \t]*#[ \t]*endif\\)[ \t]*[^/* \t].*%\\1%",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -790,7 +773,7 @@ tSCC zHp_InlineName[] = ...@@ -790,7 +773,7 @@ tSCC zHp_InlineName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zHp_InlineList[] = tSCC zHp_InlineList[] =
"|" "sys/spinlock.h" "|"; "|sys/spinlock.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -825,7 +808,7 @@ tSCC zHp_SysfileName[] = ...@@ -825,7 +808,7 @@ tSCC zHp_SysfileName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zHp_SysfileList[] = tSCC zHp_SysfileList[] =
"|" "sys/file.h" "|"; "|sys/file.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -859,8 +842,7 @@ tSCC zCxx_UnreadyName[] = ...@@ -859,8 +842,7 @@ tSCC zCxx_UnreadyName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zCxx_UnreadyList[] = tSCC zCxx_UnreadyList[] =
"|" "sys/mman.h" "|sys/mman.h|rpc/types.h|";
"|" "rpc/types.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -881,15 +863,15 @@ tTestDesc aCxx_UnreadyTests[] = { ...@@ -881,15 +863,15 @@ tTestDesc aCxx_UnreadyTests[] = {
* Fix Command Arguments for Cxx_Unready * Fix Command Arguments for Cxx_Unready
*/ */
const char* apzCxx_UnreadyPatch[] = { "sed", const char* apzCxx_UnreadyPatch[] = { "sed",
"-e", "1i\\\n" "-e", "1i\\\n\
"#ifdef __cplusplus\\\n" #ifdef __cplusplus\\\n\
"extern \"C\" {\\\n" extern \"C\" {\\\n\
"#endif\\\n" #endif\\\n\
"\n", \n",
"-e", "$a\\\n" "-e", "$a\\\n\
"#ifdef __cplusplus\\\n" #ifdef __cplusplus\\\n\
"}\\\n" }\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -902,7 +884,7 @@ tSCC zHpux_MaxintName[] = ...@@ -902,7 +884,7 @@ tSCC zHpux_MaxintName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zHpux_MaxintList[] = tSCC zHpux_MaxintList[] =
"|" "sys/param.h" "|"; "|sys/param.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -915,10 +897,10 @@ tSCC zHpux_MaxintList[] = ...@@ -915,10 +897,10 @@ tSCC zHpux_MaxintList[] =
* Fix Command Arguments for Hpux_Maxint * Fix Command Arguments for Hpux_Maxint
*/ */
const char* apzHpux_MaxintPatch[] = { "sed", const char* apzHpux_MaxintPatch[] = { "sed",
"-e", "/^#[ \t]*define[ \t]*MAXINT[ \t]/i\\\n" "-e", "/^#[ \t]*define[ \t]*MAXINT[ \t]/i\\\n\
"#ifndef MAXINT\n", #ifndef MAXINT\n",
"-e", "/^#[ \t]*define[ \t]*MAXINT[ \t]/a\\\n" "-e", "/^#[ \t]*define[ \t]*MAXINT[ \t]/a\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -931,7 +913,7 @@ tSCC zHpux_SystimeName[] = ...@@ -931,7 +913,7 @@ tSCC zHpux_SystimeName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zHpux_SystimeList[] = tSCC zHpux_SystimeList[] =
"|" "sys/time.h" "|"; "|sys/time.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -965,12 +947,7 @@ tSCC zInteractv_Add1Name[] = ...@@ -965,12 +947,7 @@ tSCC zInteractv_Add1Name[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zInteractv_Add1List[] = tSCC zInteractv_Add1List[] =
"|" "stdio.h" "|stdio.h|math.h|ctype.h|sys/limits.h|sys/fcntl.h|sys/dirent.h|";
"|" "math.h"
"|" "ctype.h"
"|" "sys/limits.h"
"|" "sys/fcntl.h"
"|" "sys/dirent.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1007,7 +984,7 @@ tSCC zInteractv_Add2Name[] = ...@@ -1007,7 +984,7 @@ tSCC zInteractv_Add2Name[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zInteractv_Add2List[] = tSCC zInteractv_Add2List[] =
"|" "math.h" "|"; "|math.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1044,7 +1021,7 @@ tSCC zInteractv_Add3Name[] = ...@@ -1044,7 +1021,7 @@ tSCC zInteractv_Add3Name[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zInteractv_Add3List[] = tSCC zInteractv_Add3List[] =
"|" "sys/limits.h" "|"; "|sys/limits.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1154,7 +1131,7 @@ tSCC zIp_Missing_SemiName[] = ...@@ -1154,7 +1131,7 @@ tSCC zIp_Missing_SemiName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zIp_Missing_SemiList[] = tSCC zIp_Missing_SemiList[] =
"|" "netinet/ip.h" "|"; "|netinet/ip.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1180,7 +1157,7 @@ tSCC zIrix_Multiline_CmntName[] = ...@@ -1180,7 +1157,7 @@ tSCC zIrix_Multiline_CmntName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zIrix_Multiline_CmntList[] = tSCC zIrix_Multiline_CmntList[] =
"|" "sys/types.h" "|"; "|sys/types.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1207,7 +1184,7 @@ tSCC zIrix_SockaddrName[] = ...@@ -1207,7 +1184,7 @@ tSCC zIrix_SockaddrName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zIrix_SockaddrList[] = tSCC zIrix_SockaddrList[] =
"|" "rpc/auth.h" "|"; "|rpc/auth.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1228,8 +1205,8 @@ tTestDesc aIrix_SockaddrTests[] = { ...@@ -1228,8 +1205,8 @@ tTestDesc aIrix_SockaddrTests[] = {
* Fix Command Arguments for Irix_Sockaddr * Fix Command Arguments for Irix_Sockaddr
*/ */
const char* apzIrix_SockaddrPatch[] = { "sed", const char* apzIrix_SockaddrPatch[] = { "sed",
"-e", "/authdes_create.*struct sockaddr/i\\\n" "-e", "/authdes_create.*struct sockaddr/i\\\n\
"struct sockaddr;\n", struct sockaddr;\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -1242,7 +1219,7 @@ tSCC zIrix_Struct__FileName[] = ...@@ -1242,7 +1219,7 @@ tSCC zIrix_Struct__FileName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zIrix_Struct__FileList[] = tSCC zIrix_Struct__FileList[] =
"|" "rpc/xdr.h" "|"; "|rpc/xdr.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1255,8 +1232,8 @@ tSCC zIrix_Struct__FileList[] = ...@@ -1255,8 +1232,8 @@ tSCC zIrix_Struct__FileList[] =
* Fix Command Arguments for Irix_Struct__File * Fix Command Arguments for Irix_Struct__File
*/ */
const char* apzIrix_Struct__FilePatch[] = { "sed", const char* apzIrix_Struct__FilePatch[] = { "sed",
"-e", "/xdrstdio_create.*struct __file_s/i\\\n" "-e", "/xdrstdio_create.*struct __file_s/i\\\n\
"struct __file_s;\n", struct __file_s;\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -1269,7 +1246,7 @@ tSCC zIsc_FmodName[] = ...@@ -1269,7 +1246,7 @@ tSCC zIsc_FmodName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zIsc_FmodList[] = tSCC zIsc_FmodList[] =
"|" "math.h" "|"; "|math.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1303,8 +1280,7 @@ tSCC zMotorola_NestedName[] = ...@@ -1303,8 +1280,7 @@ tSCC zMotorola_NestedName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zMotorola_NestedList[] = tSCC zMotorola_NestedList[] =
"|" "limits.h" "|limits.h|sys/limits.h|";
"|" "sys/limits.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1333,7 +1309,7 @@ tSCC zIsc_Sys_LimitsName[] = ...@@ -1333,7 +1309,7 @@ tSCC zIsc_Sys_LimitsName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zIsc_Sys_LimitsList[] = tSCC zIsc_Sys_LimitsList[] =
"|" "sys/limits.h" "|"; "|sys/limits.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1368,24 +1344,7 @@ tSCC zKandr_ConcatName[] = ...@@ -1368,24 +1344,7 @@ tSCC zKandr_ConcatName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zKandr_ConcatList[] = tSCC zKandr_ConcatList[] =
"|" "sparc/asm_linkage.h" "|sparc/asm_linkage.h|sun3/asm_linkage.h|sun3x/asm_linkage.h|sun4/asm_linkage.h|sun4c/asm_linkage.h|sun4m/asm_linkage.h|sun4c/debug/asm_linkage.h|sun4m/debug/asm_linkage.h|arm/as_support.h|arm/mc_type.h|arm/xcb.h|dev/chardefmac.h|dev/ps_irq.h|dev/screen.h|dev/scsi.h|sys/tty.h|Xm.acorn/XmP.h|bsd43/bsd43_.h|";
"|" "sun3/asm_linkage.h"
"|" "sun3x/asm_linkage.h"
"|" "sun4/asm_linkage.h"
"|" "sun4c/asm_linkage.h"
"|" "sun4m/asm_linkage.h"
"|" "sun4c/debug/asm_linkage.h"
"|" "sun4m/debug/asm_linkage.h"
"|" "arm/as_support.h"
"|" "arm/mc_type.h"
"|" "arm/xcb.h"
"|" "dev/chardefmac.h"
"|" "dev/ps_irq.h"
"|" "dev/screen.h"
"|" "dev/scsi.h"
"|" "sys/tty.h"
"|" "Xm.acorn/XmP.h"
"|" "bsd43/bsd43_.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1419,7 +1378,7 @@ tSCC zLimits_IfndefsName[] = ...@@ -1419,7 +1378,7 @@ tSCC zLimits_IfndefsName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zLimits_IfndefsList[] = tSCC zLimits_IfndefsList[] =
"|" "limits.h" "|"; "|limits.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1440,30 +1399,30 @@ tTestDesc aLimits_IfndefsTests[] = { ...@@ -1440,30 +1399,30 @@ tTestDesc aLimits_IfndefsTests[] = {
* Fix Command Arguments for Limits_Ifndefs * Fix Command Arguments for Limits_Ifndefs
*/ */
const char* apzLimits_IfndefsPatch[] = { "sed", const char* apzLimits_IfndefsPatch[] = { "sed",
"-e", "/[ \t]FLT_MIN[ \t]/i\\\n" "-e", "/[ \t]FLT_MIN[ \t]/i\\\n\
"#ifndef FLT_MIN\n", #ifndef FLT_MIN\n",
"-e", "/[ \t]FLT_MIN[ \t]/a\\\n" "-e", "/[ \t]FLT_MIN[ \t]/a\\\n\
"#endif\n", #endif\n",
"-e", "/[ \t]FLT_MAX[ \t]/i\\\n" "-e", "/[ \t]FLT_MAX[ \t]/i\\\n\
"#ifndef FLT_MAX\n", #ifndef FLT_MAX\n",
"-e", "/[ \t]FLT_MAX[ \t]/a\\\n" "-e", "/[ \t]FLT_MAX[ \t]/a\\\n\
"#endif\n", #endif\n",
"-e", "/[ \t]FLT_DIG[ \t]/i\\\n" "-e", "/[ \t]FLT_DIG[ \t]/i\\\n\
"#ifndef FLT_DIG\n", #ifndef FLT_DIG\n",
"-e", "/[ \t]FLT_DIG[ \t]/a\\\n" "-e", "/[ \t]FLT_DIG[ \t]/a\\\n\
"#endif\n", #endif\n",
"-e", "/[ \t]DBL_MIN[ \t]/i\\\n" "-e", "/[ \t]DBL_MIN[ \t]/i\\\n\
"#ifndef DBL_MIN\n", #ifndef DBL_MIN\n",
"-e", "/[ \t]DBL_MIN[ \t]/a\\\n" "-e", "/[ \t]DBL_MIN[ \t]/a\\\n\
"#endif\n", #endif\n",
"-e", "/[ \t]DBL_MAX[ \t]/i\\\n" "-e", "/[ \t]DBL_MAX[ \t]/i\\\n\
"#ifndef DBL_MAX\n", #ifndef DBL_MAX\n",
"-e", "/[ \t]DBL_MAX[ \t]/a\\\n" "-e", "/[ \t]DBL_MAX[ \t]/a\\\n\
"#endif\n", #endif\n",
"-e", "/[ \t]DBL_DIG[ \t]/i\\\n" "-e", "/[ \t]DBL_DIG[ \t]/i\\\n\
"#ifndef DBL_DIG\n", #ifndef DBL_DIG\n",
"-e", "/[ \t]DBL_DIG[ \t]/a\\\n" "-e", "/[ \t]DBL_DIG[ \t]/a\\\n\
"#endif\n", #endif\n",
"-e", "/^\\(\\/\\*#define\tHUGE_VAL\t3\\.[0-9e+]* *\\)\\/\\*/s//\\1/", "-e", "/^\\(\\/\\*#define\tHUGE_VAL\t3\\.[0-9e+]* *\\)\\/\\*/s//\\1/",
(char*)NULL }; (char*)NULL };
...@@ -1477,7 +1436,7 @@ tSCC zLynx_Void_IntName[] = ...@@ -1477,7 +1436,7 @@ tSCC zLynx_Void_IntName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zLynx_Void_IntList[] = tSCC zLynx_Void_IntList[] =
"|" "curses.h" "|"; "|curses.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1511,7 +1470,7 @@ tSCC zLynxos_Fcntl_ProtoName[] = ...@@ -1511,7 +1470,7 @@ tSCC zLynxos_Fcntl_ProtoName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zLynxos_Fcntl_ProtoList[] = tSCC zLynxos_Fcntl_ProtoList[] =
"|" "fcntl.h" "|"; "|fcntl.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1545,7 +1504,7 @@ tSCC zM88k_Bad_Hypot_OptName[] = ...@@ -1545,7 +1504,7 @@ tSCC zM88k_Bad_Hypot_OptName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zM88k_Bad_Hypot_OptList[] = tSCC zM88k_Bad_Hypot_OptList[] =
"|" "math.h" "|"; "|math.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1561,19 +1520,19 @@ tSCC* apzM88k_Bad_Hypot_OptMachs[] = { ...@@ -1561,19 +1520,19 @@ tSCC* apzM88k_Bad_Hypot_OptMachs[] = {
*/ */
const char* apzM88k_Bad_Hypot_OptPatch[] = { "sed", const char* apzM88k_Bad_Hypot_OptPatch[] = { "sed",
"-e", "s/extern double floor(), ceil(), fmod(), fabs();/extern double floor(), ceil(), fmod(), fabs _PARAMS((double));/", "-e", "s/extern double floor(), ceil(), fmod(), fabs();/extern double floor(), ceil(), fmod(), fabs _PARAMS((double));/",
"-e", "/^extern double hypot();$/a\\\n" "-e", "/^extern double hypot();$/a\\\n\
"\\/* Workaround a stupid Motorola optimization if one\\\n" \\/* Workaround a stupid Motorola optimization if one\\\n\
" of x or y is 0.0 and the other is negative! *\\/\\\n" of x or y is 0.0 and the other is negative! *\\/\\\n\
"#ifdef __STDC__\\\n" #ifdef __STDC__\\\n\
"static __inline__ double fake_hypot (double x, double y)\\\n" static __inline__ double fake_hypot (double x, double y)\\\n\
"#else\\\n" #else\\\n\
"static __inline__ double fake_hypot (x, y)\\\n" static __inline__ double fake_hypot (x, y)\\\n\
"\tdouble x, y;\\\n" \tdouble x, y;\\\n\
"#endif\\\n" #endif\\\n\
"{\\\n" {\\\n\
"\treturn fabs (hypot (x, y));\\\n" \treturn fabs (hypot (x, y));\\\n\
"}\\\n" }\\\n\
"#define hypot\tfake_hypot\n", #define hypot\tfake_hypot\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -1586,7 +1545,7 @@ tSCC zM88k_Bad_S_IfName[] = ...@@ -1586,7 +1545,7 @@ tSCC zM88k_Bad_S_IfName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zM88k_Bad_S_IfList[] = tSCC zM88k_Bad_S_IfList[] =
"|" "sys/stat.h" "|"; "|sys/stat.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1623,7 +1582,7 @@ tSCC zM88k_Multi_InclName[] = ...@@ -1623,7 +1582,7 @@ tSCC zM88k_Multi_InclName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zM88k_Multi_InclList[] = tSCC zM88k_Multi_InclList[] =
"|" "time.h" "|"; "|time.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1646,12 +1605,12 @@ tTestDesc aM88k_Multi_InclTests[] = { ...@@ -1646,12 +1605,12 @@ tTestDesc aM88k_Multi_InclTests[] = {
* Fix Command Arguments for M88k_Multi_Incl * Fix Command Arguments for M88k_Multi_Incl
*/ */
const char* apzM88k_Multi_InclPatch[] = { "sh", "-c", const char* apzM88k_Multi_InclPatch[] = { "sh", "-c",
"echo Fixing $file, to protect against multiple inclusion. >&2\n" "echo Fixing $file, to protect against multiple inclusion. >&2\n\
" cpp_wrapper=`echo $file | sed -e 's,\\.,_,g' -e 's,/,_,g'`\n" cpp_wrapper=`echo $file | sed -e 's,\\.,_,g' -e 's,/,_,g'`\n\
" echo \"#ifndef __GCC_GOT_${cpp_wrapper}_\"\n" echo \"#ifndef __GCC_GOT_${cpp_wrapper}_\"\n\
" echo \"#define __GCC_GOT_${cpp_wrapper}_\"\n" echo \"#define __GCC_GOT_${cpp_wrapper}_\"\n\
" cat\n" cat\n\
" echo \"#endif /* ! __GCC_GOT_${cpp_wrapper}_ */\"", echo \"#endif /* ! __GCC_GOT_${cpp_wrapper}_ */\"",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -1686,41 +1645,41 @@ tTestDesc aMachine_NameTests[] = { ...@@ -1686,41 +1645,41 @@ tTestDesc aMachine_NameTests[] = {
* Fix Command Arguments for Machine_Name * Fix Command Arguments for Machine_Name
*/ */
const char* apzMachine_NamePatch[] = { "sed", const char* apzMachine_NamePatch[] = { "sed",
"-e", ":loop\n" "-e", ":loop\n\
"/\\\\$/N\n" /\\\\$/N\n\
"s/\\\\$/\\\\+++fixinc_eol+++/\n" s/\\\\$/\\\\+++fixinc_eol+++/\n\
"/\\\\$/b loop\n" /\\\\$/b loop\n\
"s/\\\\+++fixinc_eol+++/\\\\/g\n" s/\\\\+++fixinc_eol+++/\\\\/g\n\
"/#[\t ]*[el]*if/ {\n" /#[\t ]*[el]*if/ {\n\
"\ts/[a-zA-Z0-9_][a-zA-Z0-9_]*/ & /g\n" \ts/[a-zA-Z0-9_][a-zA-Z0-9_]*/ & /g\n\
"\ts/ M32 / __M32__ /g\n" \ts/ M32 / __M32__ /g\n\
"\ts/ _*MIPSE\\([LB]\\) / __MIPSE\\1__ /g\n" \ts/ _*MIPSE\\([LB]\\) / __MIPSE\\1__ /g\n\
"\ts/ _*SYSTYPE_\\([A-Z0-9]*\\) / __SYSTYPE_\\1__ /g\n" \ts/ _*SYSTYPE_\\([A-Z0-9]*\\) / __SYSTYPE_\\1__ /g\n\
"\ts/ _*\\([Rr][34]\\)000 / __\\1000__ /g\n" \ts/ _*\\([Rr][34]\\)000 / __\\1000__ /g\n\
"\ts/ _*host_mips / __host_mips__ /g\n" \ts/ _*host_mips / __host_mips__ /g\n\
"\ts/ _*i386 / __i386__ /g\n" \ts/ _*i386 / __i386__ /g\n\
"\ts/ _*mips / __mips__ /g\n" \ts/ _*mips / __mips__ /g\n\
"\ts/ bsd4\\([0-9]\\) / __bsd4\\1__ /g\n" \ts/ bsd4\\([0-9]\\) / __bsd4\\1__ /g\n\
"\ts/ is68k / __is68k__ /g\n" \ts/ is68k / __is68k__ /g\n\
"\ts/ m68k / __m68k__ /g\n" \ts/ m68k / __m68k__ /g\n\
"\ts/ m88k / __m88k__ /g\n" \ts/ m88k / __m88k__ /g\n\
"\ts/ mc680\\([0-9]\\)0 / __mc680\\10__ /g\n" \ts/ mc680\\([0-9]\\)0 / __mc680\\10__ /g\n\
"\ts/ news\\([0-9]*\\) / __news\\1__ /g\n" \ts/ news\\([0-9]*\\) / __news\\1__ /g\n\
"\ts/ ns32000 / __ns32000__ /g\n" \ts/ ns32000 / __ns32000__ /g\n\
"\ts/ pdp11 / __pdp11__ /g\n" \ts/ pdp11 / __pdp11__ /g\n\
"\ts/ pyr / __pyr__ /g\n" \ts/ pyr / __pyr__ /g\n\
"\ts/ sel / __sel__ /g\n" \ts/ sel / __sel__ /g\n\
"\ts/ sony_news / __sony_news__ /g\n" \ts/ sony_news / __sony_news__ /g\n\
"\ts/ sparc / __sparc__ /g\n" \ts/ sparc / __sparc__ /g\n\
"\ts/ sun\\([a-z0-9]*\\) / __sun\\1__ /g\n" \ts/ sun\\([a-z0-9]*\\) / __sun\\1__ /g\n\
"\ts/ tahoe / __tahoe__ /g\n" \ts/ tahoe / __tahoe__ /g\n\
"\ts/ tower\\([_0-9]*\\) / __tower\\1__ /g\n" \ts/ tower\\([_0-9]*\\) / __tower\\1__ /g\n\
"\ts/ u370 / __u370__ /g\n" \ts/ u370 / __u370__ /g\n\
"\ts/ u3b\\([0-9]*\\) / __u3b\\1__ /g\n" \ts/ u3b\\([0-9]*\\) / __u3b\\1__ /g\n\
"\ts/ unix / __unix__ /g\n" \ts/ unix / __unix__ /g\n\
"\ts/ vax / __vax__ /g\n" \ts/ vax / __vax__ /g\n\
"\ts/ \\([a-zA-Z0-9_][a-zA-Z0-9_]*\\) /\\1/g\n" \ts/ \\([a-zA-Z0-9_][a-zA-Z0-9_]*\\) /\\1/g\n\
"\t}", \t}",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -1733,7 +1692,7 @@ tSCC zMath_ExceptionName[] = ...@@ -1733,7 +1692,7 @@ tSCC zMath_ExceptionName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zMath_ExceptionList[] = tSCC zMath_ExceptionList[] =
"|" "math.h" "|"; "|math.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1754,22 +1713,22 @@ tTestDesc aMath_ExceptionTests[] = { ...@@ -1754,22 +1713,22 @@ tTestDesc aMath_ExceptionTests[] = {
* Fix Command Arguments for Math_Exception * Fix Command Arguments for Math_Exception
*/ */
const char* apzMath_ExceptionPatch[] = { "sed", const char* apzMath_ExceptionPatch[] = { "sed",
"-e", "/struct exception/i\\\n" "-e", "/struct exception/i\\\n\
"#ifdef __cplusplus\\\n" #ifdef __cplusplus\\\n\
"#define exception __math_exception\\\n" #define exception __math_exception\\\n\
"#endif\n", #endif\n",
"-e", "/struct exception/a\\\n" "-e", "/struct exception/a\\\n\
"#ifdef __cplusplus\\\n" #ifdef __cplusplus\\\n\
"#undef exception\\\n" #undef exception\\\n\
"#endif\n", #endif\n",
"-e", "/matherr/i\\\n" "-e", "/matherr/i\\\n\
"#ifdef __cplusplus\\\n" #ifdef __cplusplus\\\n\
"#define exception __math_exception\\\n" #define exception __math_exception\\\n\
"#endif\n", #endif\n",
"-e", "/matherr/a\\\n" "-e", "/matherr/a\\\n\
"#ifdef __cplusplus\\\n" #ifdef __cplusplus\\\n\
"#undef exception\\\n" #undef exception\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -1782,7 +1741,7 @@ tSCC zMath_Gcc_IfndefsName[] = ...@@ -1782,7 +1741,7 @@ tSCC zMath_Gcc_IfndefsName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zMath_Gcc_IfndefsList[] = tSCC zMath_Gcc_IfndefsList[] =
"|" "math.h" "|"; "|math.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1795,19 +1754,19 @@ tSCC zMath_Gcc_IfndefsList[] = ...@@ -1795,19 +1754,19 @@ tSCC zMath_Gcc_IfndefsList[] =
* Fix Command Arguments for Math_Gcc_Ifndefs * Fix Command Arguments for Math_Gcc_Ifndefs
*/ */
const char* apzMath_Gcc_IfndefsPatch[] = { "sh", "-c", const char* apzMath_Gcc_IfndefsPatch[] = { "sh", "-c",
"\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h 2>/dev/null`\n" "\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h 2>/dev/null`\n\
"\n" \n\
"\tif ( test -n \"${dbl_max_def}\" \\\n" \tif ( test -n \"${dbl_max_def}\" \\\n\
"\t\t-a -n \"`egrep '#define[ \t]*HUGE_VAL[ \t]+DBL_MAX' $file`\" \\\n" \t\t-a -n \"`egrep '#define[ \t]*HUGE_VAL[ \t]+DBL_MAX' $file`\" \\\n\
"\t\t-a -z \"`egrep '#define[ \t]+DBL_MAX[ \t]+' $file`\"\n" \t\t-a -z \"`egrep '#define[ \t]+DBL_MAX[ \t]+' $file`\"\n\
"\t ) > /dev/null 2>&1\n" \t ) > /dev/null 2>&1\n\
"\tthen sed -e '/define[ \t]HUGE_VAL[ \t]DBL_MAX/s/DBL_MAX/$dbl_max_def/'\n" \tthen sed -e '/define[ \t]HUGE_VAL[ \t]DBL_MAX/s/DBL_MAX/$dbl_max_def/'\n\
"\telse cat ; fi |\n" \telse cat ; fi |\n\
"\tsed -e'/define[ \t]HUGE_VAL[ \t]/i\\\n" \tsed -e'/define[ \t]HUGE_VAL[ \t]/i\\\n\
"#ifndef HUGE_VAL\n" #ifndef HUGE_VAL\n\
"' -e'/define[ \t]HUGE_VAL[ \t]/a\\\n" ' -e'/define[ \t]HUGE_VAL[ \t]/a\\\n\
"#endif\n" #endif\n\
"'", '",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -1820,7 +1779,7 @@ tSCC zNested_CommentName[] = ...@@ -1820,7 +1779,7 @@ tSCC zNested_CommentName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zNested_CommentList[] = tSCC zNested_CommentList[] =
"|" "rpc/rpc.h" "|"; "|rpc/rpc.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1846,7 +1805,7 @@ tSCC zNews_Os_RecursionName[] = ...@@ -1846,7 +1805,7 @@ tSCC zNews_Os_RecursionName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zNews_Os_RecursionList[] = tSCC zNews_Os_RecursionList[] =
"|" "stdlib.h" "|"; "|stdlib.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1867,10 +1826,10 @@ tTestDesc aNews_Os_RecursionTests[] = { ...@@ -1867,10 +1826,10 @@ tTestDesc aNews_Os_RecursionTests[] = {
* Fix Command Arguments for News_Os_Recursion * Fix Command Arguments for News_Os_Recursion
*/ */
const char* apzNews_Os_RecursionPatch[] = { "sed", const char* apzNews_Os_RecursionPatch[] = { "sed",
"-e", "/^#include <stdlib.h>/i\\\n" "-e", "/^#include <stdlib.h>/i\\\n\
"#ifdef BOGUS_RECURSION\n", #ifdef BOGUS_RECURSION\n",
"-e", "/^#include <stdlib.h>/a\\\n" "-e", "/^#include <stdlib.h>/a\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -1883,7 +1842,7 @@ tSCC zNext_Math_PrefixName[] = ...@@ -1883,7 +1842,7 @@ tSCC zNext_Math_PrefixName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zNext_Math_PrefixList[] = tSCC zNext_Math_PrefixList[] =
"|" "ansi/math.h" "|"; "|ansi/math.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1921,7 +1880,7 @@ tSCC zNext_TemplateName[] = ...@@ -1921,7 +1880,7 @@ tSCC zNext_TemplateName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zNext_TemplateList[] = tSCC zNext_TemplateList[] =
"|" "bsd/libc.h" "|"; "|bsd/libc.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1956,7 +1915,7 @@ tSCC zNext_VolitileName[] = ...@@ -1956,7 +1915,7 @@ tSCC zNext_VolitileName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zNext_VolitileList[] = tSCC zNext_VolitileList[] =
"|" "ansi/stdlib.h" "|"; "|ansi/stdlib.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -1991,7 +1950,7 @@ tSCC zNext_Wait_UnionName[] = ...@@ -1991,7 +1950,7 @@ tSCC zNext_Wait_UnionName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zNext_Wait_UnionList[] = tSCC zNext_Wait_UnionList[] =
"|" "sys/wait.h" "|"; "|sys/wait.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2025,7 +1984,7 @@ tSCC zNodeent_SyntaxName[] = ...@@ -2025,7 +1984,7 @@ tSCC zNodeent_SyntaxName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zNodeent_SyntaxList[] = tSCC zNodeent_SyntaxList[] =
"|" "netdnet/dnetdb.h" "|"; "|netdnet/dnetdb.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2051,8 +2010,7 @@ tSCC zOsf_Namespace_AName[] = ...@@ -2051,8 +2010,7 @@ tSCC zOsf_Namespace_AName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zOsf_Namespace_AList[] = tSCC zOsf_Namespace_AList[] =
"|" "reg_types.h" "|reg_types.h|sys/lc_core.h|";
"|" "sys/lc_core.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2097,7 +2055,7 @@ tSCC zOsf_Namespace_BName[] = ...@@ -2097,7 +2055,7 @@ tSCC zOsf_Namespace_BName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zOsf_Namespace_BList[] = tSCC zOsf_Namespace_BList[] =
"|" "regex.h" "|"; "|regex.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2127,10 +2085,10 @@ tTestDesc aOsf_Namespace_BTests[] = { ...@@ -2127,10 +2085,10 @@ tTestDesc aOsf_Namespace_BTests[] = {
* Fix Command Arguments for Osf_Namespace_B * Fix Command Arguments for Osf_Namespace_B
*/ */
const char* apzOsf_Namespace_BPatch[] = { "sed", const char* apzOsf_Namespace_BPatch[] = { "sed",
"-e", "/#include <reg_types.h>/a\\\n" "-e", "/#include <reg_types.h>/a\\\n\
"typedef __regex_t\tregex_t;\\\n" typedef __regex_t\tregex_t;\\\n\
"typedef __regoff_t\tregoff_t;\\\n" typedef __regoff_t\tregoff_t;\\\n\
"typedef __regmatch_t\tregmatch_t;\n", typedef __regmatch_t\tregmatch_t;\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -2143,7 +2101,7 @@ tSCC zPthread_Page_SizeName[] = ...@@ -2143,7 +2101,7 @@ tSCC zPthread_Page_SizeName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zPthread_Page_SizeList[] = tSCC zPthread_Page_SizeList[] =
"|" "pthread.h" "|"; "|pthread.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2177,7 +2135,7 @@ tSCC zRs6000_DoubleName[] = ...@@ -2177,7 +2135,7 @@ tSCC zRs6000_DoubleName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zRs6000_DoubleList[] = tSCC zRs6000_DoubleList[] =
"|" "math.h" "|"; "|math.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2198,10 +2156,10 @@ tTestDesc aRs6000_DoubleTests[] = { ...@@ -2198,10 +2156,10 @@ tTestDesc aRs6000_DoubleTests[] = {
* Fix Command Arguments for Rs6000_Double * Fix Command Arguments for Rs6000_Double
*/ */
const char* apzRs6000_DoublePatch[] = { "sed", const char* apzRs6000_DoublePatch[] = { "sed",
"-e", "/class[(]/i\\\n" "-e", "/class[(]/i\\\n\
"#ifndef __cplusplus\n", #ifndef __cplusplus\n",
"-e", "/class[(]/a\\\n" "-e", "/class[(]/a\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -2214,7 +2172,7 @@ tSCC zRs6000_FchmodName[] = ...@@ -2214,7 +2172,7 @@ tSCC zRs6000_FchmodName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zRs6000_FchmodList[] = tSCC zRs6000_FchmodList[] =
"|" "sys/stat.h" "|"; "|sys/stat.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2248,8 +2206,7 @@ tSCC zRs6000_ParamName[] = ...@@ -2248,8 +2206,7 @@ tSCC zRs6000_ParamName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zRs6000_ParamList[] = tSCC zRs6000_ParamList[] =
"|" "stdio.h" "|stdio.h|unistd.h|";
"|" "unistd.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2275,7 +2232,7 @@ tSCC zSony_IncludeName[] = ...@@ -2275,7 +2232,7 @@ tSCC zSony_IncludeName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSony_IncludeList[] = tSCC zSony_IncludeList[] =
"|" "machine/machparam.h" "|"; "|machine/machparam.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2309,7 +2266,7 @@ tSCC zStatsswtchName[] = ...@@ -2309,7 +2266,7 @@ tSCC zStatsswtchName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zStatsswtchList[] = tSCC zStatsswtchList[] =
"|" "rpcsvc/rstat.h" "|"; "|rpcsvc/rstat.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2343,7 +2300,7 @@ tSCC zStdio_Va_ListName[] = ...@@ -2343,7 +2300,7 @@ tSCC zStdio_Va_ListName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zStdio_Va_ListList[] = tSCC zStdio_Va_ListList[] =
"|" "stdio.h" "|"; "|stdio.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2356,24 +2313,24 @@ tSCC zStdio_Va_ListList[] = ...@@ -2356,24 +2313,24 @@ tSCC zStdio_Va_ListList[] =
* Fix Command Arguments for Stdio_Va_List * Fix Command Arguments for Stdio_Va_List
*/ */
const char* apzStdio_Va_ListPatch[] = { "sh", "-c", const char* apzStdio_Va_ListPatch[] = { "sh", "-c",
"if ( egrep \"__need___va_list\" $file ) > /dev/null 2>&1 ; then\n" "if ( egrep \"__need___va_list\" $file ) > /dev/null 2>&1 ; then\n\
" :\n" :\n\
" else\n" else\n\
" echo \"#define __need___va_list\"\n" echo \"#define __need___va_list\"\n\
" echo \"#include <stdarg.h>\"\n" echo \"#include <stdarg.h>\"\n\
" fi\n" fi\n\
"\n" \n\
" sed -e 's@ va_list @ __gnuc_va_list @' \\\n" sed -e 's@ va_list @ __gnuc_va_list @' \\\n\
" -e 's@ va_list)@ __gnuc_va_list)@' \\\n" -e 's@ va_list)@ __gnuc_va_list)@' \\\n\
" -e 's@ _BSD_VA_LIST_));@ __gnuc_va_list));@' \\\n" -e 's@ _BSD_VA_LIST_));@ __gnuc_va_list));@' \\\n\
" -e 's@ _VA_LIST_));@ __gnuc_va_list));@' \\\n" -e 's@ _VA_LIST_));@ __gnuc_va_list));@' \\\n\
" -e 's@ va_list@ __va_list__@' \\\n" -e 's@ va_list@ __va_list__@' \\\n\
" -e 's@\\*va_list@*__va_list__@' \\\n" -e 's@\\*va_list@*__va_list__@' \\\n\
" -e 's@ __va_list)@ __gnuc_va_list)@' \\\n" -e 's@ __va_list)@ __gnuc_va_list)@' \\\n\
" -e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \\\n" -e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \\\n\
" -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \\\n" -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \\\n\
" -e 's@VA_LIST@DUMMY_VA_LIST@' \\\n" -e 's@VA_LIST@DUMMY_VA_LIST@' \\\n\
" -e 's@_Va_LIST@_VA_LIST@'", -e 's@_Va_LIST@_VA_LIST@'",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -2386,8 +2343,7 @@ tSCC zSun_Bogus_IfdefName[] = ...@@ -2386,8 +2343,7 @@ tSCC zSun_Bogus_IfdefName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSun_Bogus_IfdefList[] = tSCC zSun_Bogus_IfdefList[] =
"|" "hsfs/hsfs_spec.h" "|hsfs/hsfs_spec.h|hsfs/iso_spec.h|";
"|" "hsfs/iso_spec.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2421,7 +2377,7 @@ tSCC zSun_Bogus_Ifdef_Sun4cName[] = ...@@ -2421,7 +2377,7 @@ tSCC zSun_Bogus_Ifdef_Sun4cName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSun_Bogus_Ifdef_Sun4cList[] = tSCC zSun_Bogus_Ifdef_Sun4cList[] =
"|" "hsfs/hsnode.h" "|"; "|hsfs/hsnode.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2455,7 +2411,7 @@ tSCC zSun_CatmacroName[] = ...@@ -2455,7 +2411,7 @@ tSCC zSun_CatmacroName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSun_CatmacroList[] = tSCC zSun_CatmacroList[] =
"|" "pixrect/memvar.h" "|"; "|pixrect/memvar.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2476,12 +2432,12 @@ tTestDesc aSun_CatmacroTests[] = { ...@@ -2476,12 +2432,12 @@ tTestDesc aSun_CatmacroTests[] = {
* Fix Command Arguments for Sun_Catmacro * Fix Command Arguments for Sun_Catmacro
*/ */
const char* apzSun_CatmacroPatch[] = { "sed", const char* apzSun_CatmacroPatch[] = { "sed",
"-e", "/^#define[ \t]CAT(a,b)/ i\\\n" "-e", "/^#define[ \t]CAT(a,b)/ i\\\n\
"#ifdef __STDC__ \\\n" #ifdef __STDC__ \\\n\
"#define CAT(a,b) a##b\\\n" #define CAT(a,b) a##b\\\n\
"#else\n", #else\n",
"-e", "/^#define[ \t]CAT(a,b)/ a\\\n" "-e", "/^#define[ \t]CAT(a,b)/ a\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -2494,7 +2450,7 @@ tSCC zSun_MallocName[] = ...@@ -2494,7 +2450,7 @@ tSCC zSun_MallocName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSun_MallocList[] = tSCC zSun_MallocList[] =
"|" "malloc.h" "|"; "|malloc.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2523,7 +2479,7 @@ tSCC zSun_MemcpyName[] = ...@@ -2523,7 +2479,7 @@ tSCC zSun_MemcpyName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSun_MemcpyList[] = tSCC zSun_MemcpyList[] =
"|" "memory.h" "|"; "|memory.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2544,26 +2500,26 @@ tTestDesc aSun_MemcpyTests[] = { ...@@ -2544,26 +2500,26 @@ tTestDesc aSun_MemcpyTests[] = {
* Fix Command Arguments for Sun_Memcpy * Fix Command Arguments for Sun_Memcpy
*/ */
const char* apzSun_MemcpyPatch[] = { "sed", const char* apzSun_MemcpyPatch[] = { "sed",
"-e", "1i\\\n" "-e", "1i\\\n\
"/* This file was generated by fixincludes */\\\n" /* This file was generated by fixincludes */\\\n\
"#ifndef __memory_h__\\\n" #ifndef __memory_h__\\\n\
"#define __memory_h__\\\n" #define __memory_h__\\\n\
"\\\n" \\\n\
"#ifdef __STDC__\\\n" #ifdef __STDC__\\\n\
"extern void *memccpy();\\\n" extern void *memccpy();\\\n\
"extern void *memchr();\\\n" extern void *memchr();\\\n\
"extern void *memcpy();\\\n" extern void *memcpy();\\\n\
"extern void *memset();\\\n" extern void *memset();\\\n\
"#else\\\n" #else\\\n\
"extern char *memccpy();\\\n" extern char *memccpy();\\\n\
"extern char *memchr();\\\n" extern char *memchr();\\\n\
"extern char *memcpy();\\\n" extern char *memcpy();\\\n\
"extern char *memset();\\\n" extern char *memset();\\\n\
"#endif /* __STDC__ */\\\n" #endif /* __STDC__ */\\\n\
"\\\n" \\\n\
"extern int memcmp();\\\n" extern int memcmp();\\\n\
"\\\n" \\\n\
"#endif /* __memory_h__ */\n", #endif /* __memory_h__ */\n",
"-e", "1,$d", "-e", "1,$d",
(char*)NULL }; (char*)NULL };
...@@ -2577,7 +2533,7 @@ tSCC zSun_Rusers_SemiName[] = ...@@ -2577,7 +2533,7 @@ tSCC zSun_Rusers_SemiName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSun_Rusers_SemiList[] = tSCC zSun_Rusers_SemiList[] =
"|" "rpcsvc/rusers.h" "|"; "|rpcsvc/rusers.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2611,8 +2567,7 @@ tSCC zSun_SignalName[] = ...@@ -2611,8 +2567,7 @@ tSCC zSun_SignalName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSun_SignalList[] = tSCC zSun_SignalList[] =
"|" "sys/signal.h" "|sys/signal.h|signal.h|";
"|" "signal.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2633,12 +2588,12 @@ tTestDesc aSun_SignalTests[] = { ...@@ -2633,12 +2588,12 @@ tTestDesc aSun_SignalTests[] = {
* Fix Command Arguments for Sun_Signal * Fix Command Arguments for Sun_Signal
*/ */
const char* apzSun_SignalPatch[] = { "sed", const char* apzSun_SignalPatch[] = { "sed",
"-e", "/^void\t(\\*signal())();$/i\\\n" "-e", "/^void\t(\\*signal())();$/i\\\n\
"#ifdef __cplusplus\\\n" #ifdef __cplusplus\\\n\
"void\t(*signal(...))(...);\\\n" void\t(*signal(...))(...);\\\n\
"#else\n", #else\n",
"-e", "/^void\t(\\*signal())();$/a\\\n" "-e", "/^void\t(\\*signal())();$/a\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -2651,10 +2606,7 @@ tSCC zSun_Auth_ProtoName[] = ...@@ -2651,10 +2606,7 @@ tSCC zSun_Auth_ProtoName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSun_Auth_ProtoList[] = tSCC zSun_Auth_ProtoList[] =
"|" "rpc/auth.h" "|rpc/auth.h|rpc/clnt.h|rpc/svc.h|rpc/xdr.h|";
"|" "rpc/clnt.h"
"|" "rpc/svc.h"
"|" "rpc/xdr.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2682,12 +2634,12 @@ tTestDesc aSun_Auth_ProtoTests[] = { ...@@ -2682,12 +2634,12 @@ tTestDesc aSun_Auth_ProtoTests[] = {
* Fix Command Arguments for Sun_Auth_Proto * Fix Command Arguments for Sun_Auth_Proto
*/ */
const char* apzSun_Auth_ProtoPatch[] = { "sed", const char* apzSun_Auth_ProtoPatch[] = { "sed",
"-e", "s/^\\(.*(\\*[a-z][a-z_]*)(\\)\\();.*\\)/\\\n" "-e", "s/^\\(.*(\\*[a-z][a-z_]*)(\\)\\();.*\\)/\\\n\
"#ifdef __cplusplus\\\n" #ifdef __cplusplus\\\n\
"\\1...\\2\\\n" \\1...\\2\\\n\
"#else\\\n" #else\\\n\
"\\1\\2\\\n" \\1\\2\\\n\
"#endif/", #endif/",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -2700,7 +2652,7 @@ tSCC zSunos_Matherr_DeclName[] = ...@@ -2700,7 +2652,7 @@ tSCC zSunos_Matherr_DeclName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSunos_Matherr_DeclList[] = tSCC zSunos_Matherr_DeclList[] =
"|" "math.h" "|"; "|math.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2714,8 +2666,8 @@ tSCC zSunos_Matherr_DeclList[] = ...@@ -2714,8 +2666,8 @@ tSCC zSunos_Matherr_DeclList[] =
*/ */
const char* apzSunos_Matherr_DeclPatch[] = { "sed", const char* apzSunos_Matherr_DeclPatch[] = { "sed",
"-e", "/^struct exception/,$b", "-e", "/^struct exception/,$b",
"-e", "/matherr/i\\\n" "-e", "/matherr/i\\\n\
"struct exception;\n", struct exception;\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -2728,7 +2680,7 @@ tSCC zSunos_StrlenName[] = ...@@ -2728,7 +2680,7 @@ tSCC zSunos_StrlenName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSunos_StrlenList[] = tSCC zSunos_StrlenList[] =
"|" "strings.h" "|"; "|strings.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2754,12 +2706,7 @@ tSCC zSystypesName[] = ...@@ -2754,12 +2706,7 @@ tSCC zSystypesName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSystypesList[] = tSCC zSystypesList[] =
"|" "sys/types.h" "|sys/types.h|stdlib.h|sys/stdtypes.h|stddef.h|memory.h|unistd.h|";
"|" "stdlib.h"
"|" "sys/stdtypes.h"
"|" "stddef.h"
"|" "memory.h"
"|" "unistd.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2781,29 +2728,29 @@ tTestDesc aSystypesTests[] = { ...@@ -2781,29 +2728,29 @@ tTestDesc aSystypesTests[] = {
*/ */
const char* apzSystypesPatch[] = { "sed", const char* apzSystypesPatch[] = { "sed",
"-e", "/^[ \t]*\\*[ \t]*typedef unsigned int size_t;/N", "-e", "/^[ \t]*\\*[ \t]*typedef unsigned int size_t;/N",
"-e", "s/^\\([ \t]*\\*[ \t]*typedef unsigned int size_t;\\n[ \t]*\\*\\/\\)/\\1\\\n" "-e", "s/^\\([ \t]*\\*[ \t]*typedef unsigned int size_t;\\n[ \t]*\\*\\/\\)/\\1\\\n\
"#ifndef __SIZE_TYPE__\\\n" #ifndef __SIZE_TYPE__\\\n\
"#define __SIZE_TYPE__ long unsigned int\\\n" #define __SIZE_TYPE__ long unsigned int\\\n\
"#endif\\\n" #endif\\\n\
"typedef __SIZE_TYPE__ size_t;\\\n" typedef __SIZE_TYPE__ size_t;\\\n\
"/", /",
"-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/i\\\n" "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/i\\\n\
"#ifndef __SIZE_TYPE__\\\n" #ifndef __SIZE_TYPE__\\\n\
"#define __SIZE_TYPE__ long unsigned int\\\n" #define __SIZE_TYPE__ long unsigned int\\\n\
"#endif\n", #endif\n",
"-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/typedef __SIZE_TYPE__ size_t/", "-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/typedef __SIZE_TYPE__ size_t/",
"-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/i\\\n" "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/i\\\n\
"#ifndef __PTRDIFF_TYPE__\\\n" #ifndef __PTRDIFF_TYPE__\\\n\
"#define __PTRDIFF_TYPE__ long int\\\n" #define __PTRDIFF_TYPE__ long int\\\n\
"#endif\n", #endif\n",
"-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/typedef __PTRDIFF_TYPE__ ptrdiff_t/", "-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/typedef __PTRDIFF_TYPE__ ptrdiff_t/",
"-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/i\\\n" "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/i\\\n\
"#ifndef __WCHAR_TYPE__\\\n" #ifndef __WCHAR_TYPE__\\\n\
"#define __WCHAR_TYPE__ int\\\n" #define __WCHAR_TYPE__ int\\\n\
"#endif\\\n" #endif\\\n\
"#ifndef __cplusplus\n", #ifndef __cplusplus\n",
"-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/a\\\n" "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/a\\\n\
"#endif\n", #endif\n",
"-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/typedef __WCHAR_TYPE__ wchar_t/", "-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/typedef __WCHAR_TYPE__ wchar_t/",
(char*)NULL }; (char*)NULL };
...@@ -2817,7 +2764,7 @@ tSCC zSystypes_For_AixName[] = ...@@ -2817,7 +2764,7 @@ tSCC zSystypes_For_AixName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSystypes_For_AixList[] = tSCC zSystypes_For_AixList[] =
"|" "sys/types.h" "|"; "|sys/types.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2845,11 +2792,11 @@ tTestDesc aSystypes_For_AixTests[] = { ...@@ -2845,11 +2792,11 @@ tTestDesc aSystypes_For_AixTests[] = {
* Fix Command Arguments for Systypes_For_Aix * Fix Command Arguments for Systypes_For_Aix
*/ */
const char* apzSystypes_For_AixPatch[] = { "sed", const char* apzSystypes_For_AixPatch[] = { "sed",
"-e", "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/i\\\n" "-e", "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/i\\\n\
"#ifndef _GCC_SIZE_T\\\n" #ifndef _GCC_SIZE_T\\\n\
"#define _GCC_SIZE_T\n", #define _GCC_SIZE_T\n",
"-e", "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/a\\\n" "-e", "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/a\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -2862,7 +2809,7 @@ tSCC zSysv68_StringName[] = ...@@ -2862,7 +2809,7 @@ tSCC zSysv68_StringName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSysv68_StringList[] = tSCC zSysv68_StringList[] =
"|" "string.h" "|"; "|string.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2881,9 +2828,9 @@ const char* apzSysv68_StringPatch[] = { "sed", ...@@ -2881,9 +2828,9 @@ const char* apzSysv68_StringPatch[] = { "sed",
"-e", "/^extern char$/N", "-e", "/^extern char$/N",
"-e", "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/", "-e", "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/",
"-e", "/^\tstrncmp(),$/N", "-e", "/^\tstrncmp(),$/N",
"-e", "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n" "-e", "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n\
"extern unsigned int\\\n" extern unsigned int\\\n\
"\\2/", \\2/",
"-e", "/^extern int$/N", "-e", "/^extern int$/N",
"-e", "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/", "-e", "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/",
(char*)NULL }; (char*)NULL };
...@@ -2898,7 +2845,7 @@ tSCC zSysz_Stdlib_For_SunName[] = ...@@ -2898,7 +2845,7 @@ tSCC zSysz_Stdlib_For_SunName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSysz_Stdlib_For_SunList[] = tSCC zSysz_Stdlib_For_SunList[] =
"|" "stdlib.h" "|"; "|stdlib.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2917,11 +2864,11 @@ const char* apzSysz_Stdlib_For_SunPatch[] = { "sed", ...@@ -2917,11 +2864,11 @@ const char* apzSysz_Stdlib_For_SunPatch[] = { "sed",
"-e", "s/char[ \t]*\\*[ \t]*malloc/void \\*\tmalloc/g", "-e", "s/char[ \t]*\\*[ \t]*malloc/void \\*\tmalloc/g",
"-e", "s/char[ \t]*\\*[ \t]*realloc/void \\*\trealloc/g", "-e", "s/char[ \t]*\\*[ \t]*realloc/void \\*\trealloc/g",
"-e", "s/int[ \t][ \t]*exit/void\texit/g", "-e", "s/int[ \t][ \t]*exit/void\texit/g",
"-e", "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/i\\\n" "-e", "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/i\\\n\
"#ifndef _GCC_SIZE_T\\\n" #ifndef _GCC_SIZE_T\\\n\
"#define _GCC_SIZE_T\n", #define _GCC_SIZE_T\n",
"-e", "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/a\\\n" "-e", "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/a\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -2934,7 +2881,7 @@ tSCC zSysz_Stdtypes_For_SunName[] = ...@@ -2934,7 +2881,7 @@ tSCC zSysz_Stdtypes_For_SunName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zSysz_Stdtypes_For_SunList[] = tSCC zSysz_Stdtypes_For_SunList[] =
"|" "sys/stdtypes.h" "|"; "|sys/stdtypes.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -2947,21 +2894,21 @@ tSCC zSysz_Stdtypes_For_SunList[] = ...@@ -2947,21 +2894,21 @@ tSCC zSysz_Stdtypes_For_SunList[] =
* Fix Command Arguments for Sysz_Stdtypes_For_Sun * Fix Command Arguments for Sysz_Stdtypes_For_Sun
*/ */
const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed", const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed",
"-e", "/[\t ]size_t.*;/i\\\n" "-e", "/[\t ]size_t.*;/i\\\n\
"#ifndef _GCC_SIZE_T\\\n" #ifndef _GCC_SIZE_T\\\n\
"#define _GCC_SIZE_T\n", #define _GCC_SIZE_T\n",
"-e", "/[\t ]size_t.*;/a\\\n" "-e", "/[\t ]size_t.*;/a\\\n\
"#endif\n", #endif\n",
"-e", "/[\t ]ptrdiff_t.*;/i\\\n" "-e", "/[\t ]ptrdiff_t.*;/i\\\n\
"#ifndef _GCC_PTRDIFF_T\\\n" #ifndef _GCC_PTRDIFF_T\\\n\
"#define _GCC_PTRDIFF_T\n", #define _GCC_PTRDIFF_T\n",
"-e", "/[\t ]ptrdiff_t.*;/a\\\n" "-e", "/[\t ]ptrdiff_t.*;/a\\\n\
"#endif\n", #endif\n",
"-e", "/[\t ]wchar_t.*;/i\\\n" "-e", "/[\t ]wchar_t.*;/i\\\n\
"#ifndef _GCC_WCHAR_T\\\n" #ifndef _GCC_WCHAR_T\\\n\
"#define _GCC_WCHAR_T\n", #define _GCC_WCHAR_T\n",
"-e", "/[\t ]wchar_t.*;/a\\\n" "-e", "/[\t ]wchar_t.*;/a\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -2974,7 +2921,7 @@ tSCC zTinfo_CplusplusName[] = ...@@ -2974,7 +2921,7 @@ tSCC zTinfo_CplusplusName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zTinfo_CplusplusList[] = tSCC zTinfo_CplusplusList[] =
"|" "tinfo.h" "|"; "|tinfo.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3000,7 +2947,7 @@ tSCC zUltrix_Ansi_CompatName[] = ...@@ -3000,7 +2947,7 @@ tSCC zUltrix_Ansi_CompatName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zUltrix_Ansi_CompatList[] = tSCC zUltrix_Ansi_CompatList[] =
"|" "ansi_compat.h" "|"; "|ansi_compat.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3021,8 +2968,8 @@ tTestDesc aUltrix_Ansi_CompatTests[] = { ...@@ -3021,8 +2968,8 @@ tTestDesc aUltrix_Ansi_CompatTests[] = {
* Fix Command Arguments for Ultrix_Ansi_Compat * Fix Command Arguments for Ultrix_Ansi_Compat
*/ */
const char* apzUltrix_Ansi_CompatPatch[] = { "sed", const char* apzUltrix_Ansi_CompatPatch[] = { "sed",
"-e", "1i\\\n" "-e", "1i\\\n\
"/* This file intentionally left blank. */\n", /* This file intentionally left blank. */\n",
"-e", "1,$d", "-e", "1,$d",
(char*)NULL }; (char*)NULL };
...@@ -3036,7 +2983,7 @@ tSCC zUltrix_Fix_FixprotoName[] = ...@@ -3036,7 +2983,7 @@ tSCC zUltrix_Fix_FixprotoName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zUltrix_Fix_FixprotoList[] = tSCC zUltrix_Fix_FixprotoList[] =
"|" "sys/utsname.h" "|"; "|sys/utsname.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3057,8 +3004,8 @@ tTestDesc aUltrix_Fix_FixprotoTests[] = { ...@@ -3057,8 +3004,8 @@ tTestDesc aUltrix_Fix_FixprotoTests[] = {
* Fix Command Arguments for Ultrix_Fix_Fixproto * Fix Command Arguments for Ultrix_Fix_Fixproto
*/ */
const char* apzUltrix_Fix_FixprotoPatch[] = { "sed", const char* apzUltrix_Fix_FixprotoPatch[] = { "sed",
"-e", "/^[ \t]*extern[ \t]*int[ \t]*uname();$/i\\\n" "-e", "/^[ \t]*extern[ \t]*int[ \t]*uname();$/i\\\n\
"struct utsname;\n", struct utsname;\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -3071,7 +3018,7 @@ tSCC zUltrix_Atof_ParamName[] = ...@@ -3071,7 +3018,7 @@ tSCC zUltrix_Atof_ParamName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zUltrix_Atof_ParamList[] = tSCC zUltrix_Atof_ParamList[] =
"|" "math.h" "|"; "|math.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3101,7 +3048,7 @@ tSCC zUltrix_ConstName[] = ...@@ -3101,7 +3048,7 @@ tSCC zUltrix_ConstName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zUltrix_ConstList[] = tSCC zUltrix_ConstList[] =
"|" "stdio.h" "|"; "|stdio.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3135,7 +3082,7 @@ tSCC zUltrix_IfdefName[] = ...@@ -3135,7 +3082,7 @@ tSCC zUltrix_IfdefName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zUltrix_IfdefList[] = tSCC zUltrix_IfdefList[] =
"|" "sys/file.h" "|"; "|sys/file.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3169,7 +3116,7 @@ tSCC zUltrix_Nested_CmntName[] = ...@@ -3169,7 +3116,7 @@ tSCC zUltrix_Nested_CmntName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zUltrix_Nested_CmntList[] = tSCC zUltrix_Nested_CmntList[] =
"|" "rpc/svc.h" "|"; "|rpc/svc.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3195,7 +3142,7 @@ tSCC zUltrix_StaticName[] = ...@@ -3195,7 +3142,7 @@ tSCC zUltrix_StaticName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zUltrix_StaticList[] = tSCC zUltrix_StaticList[] =
"|" "machine/cpu.h" "|"; "|machine/cpu.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3258,8 +3205,8 @@ tTestDesc aUndefine_NullTests[] = { ...@@ -3258,8 +3205,8 @@ tTestDesc aUndefine_NullTests[] = {
* Fix Command Arguments for Undefine_Null * Fix Command Arguments for Undefine_Null
*/ */
const char* apzUndefine_NullPatch[] = { "sed", const char* apzUndefine_NullPatch[] = { "sed",
"-e", "/^#[ \t]*define[ \t][ \t]*NULL[ \t]/i\\\n" "-e", "/^#[ \t]*define[ \t][ \t]*NULL[ \t]/i\\\n\
"#undef NULL\n", #undef NULL\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -3272,7 +3219,7 @@ tSCC zVa_I960_MacroName[] = ...@@ -3272,7 +3219,7 @@ tSCC zVa_I960_MacroName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zVa_I960_MacroList[] = tSCC zVa_I960_MacroList[] =
"|" "arch/i960/archI960.h" "|"; "|arch/i960/archI960.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3309,17 +3256,7 @@ tSCC zVoid_NullName[] = ...@@ -3309,17 +3256,7 @@ tSCC zVoid_NullName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zVoid_NullList[] = tSCC zVoid_NullList[] =
"|" "curses.h" "|curses.h|dbm.h|locale.h|stdio.h|stdlib.h|string.h|time.h|unistd.h|sys/dir.h|sys/param.h|sys/types.h|";
"|" "dbm.h"
"|" "locale.h"
"|" "stdio.h"
"|" "stdlib.h"
"|" "string.h"
"|" "time.h"
"|" "unistd.h"
"|" "sys/dir.h"
"|" "sys/param.h"
"|" "sys/types.h" "|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3353,7 +3290,7 @@ tSCC zVxworks_Gcc_ProblemName[] = ...@@ -3353,7 +3290,7 @@ tSCC zVxworks_Gcc_ProblemName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zVxworks_Gcc_ProblemList[] = tSCC zVxworks_Gcc_ProblemList[] =
"|" "types/vxTypesBase.h" "|"; "|types/vxTypesBase.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3375,21 +3312,21 @@ tTestDesc aVxworks_Gcc_ProblemTests[] = { ...@@ -3375,21 +3312,21 @@ tTestDesc aVxworks_Gcc_ProblemTests[] = {
*/ */
const char* apzVxworks_Gcc_ProblemPatch[] = { "sed", const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
"-e", "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/", "-e", "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/",
"-e", "/[ \t]size_t/i\\\n" "-e", "/[ \t]size_t/i\\\n\
"#ifndef _GCC_SIZE_T\\\n" #ifndef _GCC_SIZE_T\\\n\
"#define _GCC_SIZE_T\n", #define _GCC_SIZE_T\n",
"-e", "/[ \t]size_t/a\\\n" "-e", "/[ \t]size_t/a\\\n\
"#endif\n", #endif\n",
"-e", "/[ \t]ptrdiff_t/i\\\n" "-e", "/[ \t]ptrdiff_t/i\\\n\
"#ifndef _GCC_PTRDIFF_T\\\n" #ifndef _GCC_PTRDIFF_T\\\n\
"#define _GCC_PTRDIFF_T\n", #define _GCC_PTRDIFF_T\n",
"-e", "/[ \t]ptrdiff_t/a\\\n" "-e", "/[ \t]ptrdiff_t/a\\\n\
"#endif\n", #endif\n",
"-e", "/[ \t]wchar_t/i\\\n" "-e", "/[ \t]wchar_t/i\\\n\
"#ifndef _GCC_WCHAR_T\\\n" #ifndef _GCC_WCHAR_T\\\n\
"#define _GCC_WCHAR_T\n", #define _GCC_WCHAR_T\n",
"-e", "/[ \t]wchar_t/a\\\n" "-e", "/[ \t]wchar_t/a\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -3402,7 +3339,7 @@ tSCC zVxworks_Needs_VxtypesName[] = ...@@ -3402,7 +3339,7 @@ tSCC zVxworks_Needs_VxtypesName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zVxworks_Needs_VxtypesList[] = tSCC zVxworks_Needs_VxtypesList[] =
"|" "time.h" "|"; "|time.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3436,7 +3373,7 @@ tSCC zVxworks_Needs_VxworksName[] = ...@@ -3436,7 +3373,7 @@ tSCC zVxworks_Needs_VxworksName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zVxworks_Needs_VxworksList[] = tSCC zVxworks_Needs_VxworksList[] =
"|" "sys/stat.h" "|"; "|sys/stat.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3470,8 +3407,8 @@ tTestDesc aVxworks_Needs_VxworksTests[] = { ...@@ -3470,8 +3407,8 @@ tTestDesc aVxworks_Needs_VxworksTests[] = {
* Fix Command Arguments for Vxworks_Needs_Vxworks * Fix Command Arguments for Vxworks_Needs_Vxworks
*/ */
const char* apzVxworks_Needs_VxworksPatch[] = { "sed", const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
"-e", "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n" "-e", "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n\
"#include <types/vxTypesOld.h>\n", #include <types/vxTypesOld.h>\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -3484,7 +3421,7 @@ tSCC zVxworks_TimeName[] = ...@@ -3484,7 +3421,7 @@ tSCC zVxworks_TimeName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zVxworks_TimeList[] = tSCC zVxworks_TimeList[] =
"|" "time.h" "|"; "|time.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3512,15 +3449,15 @@ tTestDesc aVxworks_TimeTests[] = { ...@@ -3512,15 +3449,15 @@ tTestDesc aVxworks_TimeTests[] = {
* Fix Command Arguments for Vxworks_Time * Fix Command Arguments for Vxworks_Time
*/ */
const char* apzVxworks_TimePatch[] = { "sed", const char* apzVxworks_TimePatch[] = { "sed",
"-e", "/VOIDFUNCPTR/i\\\n" "-e", "/VOIDFUNCPTR/i\\\n\
"#ifndef __gcc_VOIDFUNCPTR_defined\\\n" #ifndef __gcc_VOIDFUNCPTR_defined\\\n\
"#ifdef __cplusplus\\\n" #ifdef __cplusplus\\\n\
"typedef void (*__gcc_VOIDFUNCPTR) (...);\\\n" typedef void (*__gcc_VOIDFUNCPTR) (...);\\\n\
"#else\\\n" #else\\\n\
"typedef void (*__gcc_VOIDFUNCPTR) ();\\\n" typedef void (*__gcc_VOIDFUNCPTR) ();\\\n\
"#endif\\\n" #endif\\\n\
"#define __gcc_VOIDFUNCPTR_defined\\\n" #define __gcc_VOIDFUNCPTR_defined\\\n\
"#endif\n", #endif\n",
"-e", "s/VOIDFUNCPTR/__gcc_VOIDFUNCPTR/g", "-e", "s/VOIDFUNCPTR/__gcc_VOIDFUNCPTR/g",
(char*)NULL }; (char*)NULL };
...@@ -3534,7 +3471,7 @@ tSCC zX11_ClassName[] = ...@@ -3534,7 +3471,7 @@ tSCC zX11_ClassName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zX11_ClassList[] = tSCC zX11_ClassList[] =
"|" "X11/ShellP.h" "|"; "|X11/ShellP.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3555,12 +3492,12 @@ tTestDesc aX11_ClassTests[] = { ...@@ -3555,12 +3492,12 @@ tTestDesc aX11_ClassTests[] = {
* Fix Command Arguments for X11_Class * Fix Command Arguments for X11_Class
*/ */
const char* apzX11_ClassPatch[] = { "sed", const char* apzX11_ClassPatch[] = { "sed",
"-e", "/char \\*class;/i\\\n" "-e", "/char \\*class;/i\\\n\
"#ifdef __cplusplus\\\n" #ifdef __cplusplus\\\n\
"\tchar *c_class;\\\n" \tchar *c_class;\\\n\
"#else\n", #else\n",
"-e", "/char \\*class;/a\\\n" "-e", "/char \\*class;/a\\\n\
"#endif\n", #endif\n",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -3573,7 +3510,7 @@ tSCC zX11_Class_UsageName[] = ...@@ -3573,7 +3510,7 @@ tSCC zX11_Class_UsageName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zX11_Class_UsageList[] = tSCC zX11_Class_UsageList[] =
"|" "Xm/BaseClassI.h" "|"; "|Xm/BaseClassI.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3607,7 +3544,7 @@ tSCC zX11_NewName[] = ...@@ -3607,7 +3544,7 @@ tSCC zX11_NewName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zX11_NewList[] = tSCC zX11_NewList[] =
"|" "Xm/Traversal.h" "|"; "|Xm/Traversal.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3628,12 +3565,12 @@ tTestDesc aX11_NewTests[] = { ...@@ -3628,12 +3565,12 @@ tTestDesc aX11_NewTests[] = {
* Fix Command Arguments for X11_New * Fix Command Arguments for X11_New
*/ */
const char* apzX11_NewPatch[] = { "sed", const char* apzX11_NewPatch[] = { "sed",
"-e", "/Widget\told, new;/i\\\n" "-e", "/Widget\told, new;/i\\\n\
"#ifdef __cplusplus\\\n" #ifdef __cplusplus\\\n\
"\tWidget\told, c_new;\\\n" \tWidget\told, c_new;\\\n\
"#else\n", #else\n",
"-e", "/Widget\told, new;/a\\\n" "-e", "/Widget\told, new;/a\\\n\
"#endif\n", #endif\n",
"-e", "s/Widget new,/Widget c_new,/g", "-e", "s/Widget new,/Widget c_new,/g",
(char*)NULL }; (char*)NULL };
...@@ -3647,7 +3584,7 @@ tSCC zX11_SprintfName[] = ...@@ -3647,7 +3584,7 @@ tSCC zX11_SprintfName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zX11_SprintfList[] = tSCC zX11_SprintfList[] =
"|" "X11*/Xmu.h" "|"; "|X11*/Xmu.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3660,9 +3597,9 @@ tSCC zX11_SprintfList[] = ...@@ -3660,9 +3597,9 @@ tSCC zX11_SprintfList[] =
* Fix Command Arguments for X11_Sprintf * Fix Command Arguments for X11_Sprintf
*/ */
const char* apzX11_SprintfPatch[] = { "sed", const char* apzX11_SprintfPatch[] = { "sed",
"-e", "s,^extern char \\*\tsprintf();$,#ifndef __STDC__\\\n" "-e", "s,^extern char \\*\tsprintf();$,#ifndef __STDC__\\\n\
"extern char *\tsprintf();\\\n" extern char *\tsprintf();\\\n\
"#endif /* !defined __STDC__ */,", #endif /* !defined __STDC__ */,",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -3675,7 +3612,7 @@ tSCC zZzz_Ki_IfaceName[] = ...@@ -3675,7 +3612,7 @@ tSCC zZzz_Ki_IfaceName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zZzz_Ki_IfaceList[] = tSCC zZzz_Ki_IfaceList[] =
"|" "sys/ki_iface.h" "|"; "|sys/ki_iface.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3696,9 +3633,9 @@ tTestDesc aZzz_Ki_IfaceTests[] = { ...@@ -3696,9 +3633,9 @@ tTestDesc aZzz_Ki_IfaceTests[] = {
* Fix Command Arguments for Zzz_Ki_Iface * Fix Command Arguments for Zzz_Ki_Iface
*/ */
const char* apzZzz_Ki_IfacePatch[] = { "sh", "-c", const char* apzZzz_Ki_IfacePatch[] = { "sh", "-c",
"echo \"Removing incorrect fix to <$file>\" >&2\n" "echo \"Removing incorrect fix to <$file>\" >&2\n\
"rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n" rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n\
"cat > /dev/null", cat > /dev/null",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -3711,7 +3648,7 @@ tSCC zZzz_KiName[] = ...@@ -3711,7 +3648,7 @@ tSCC zZzz_KiName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zZzz_KiList[] = tSCC zZzz_KiList[] =
"|" "sys/ki.h" "|"; "|sys/ki.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3732,9 +3669,9 @@ tTestDesc aZzz_KiTests[] = { ...@@ -3732,9 +3669,9 @@ tTestDesc aZzz_KiTests[] = {
* Fix Command Arguments for Zzz_Ki * Fix Command Arguments for Zzz_Ki
*/ */
const char* apzZzz_KiPatch[] = { "sh", "-c", const char* apzZzz_KiPatch[] = { "sh", "-c",
"echo \"Removing incorrect fix to <$file>\" >&2\n" "echo \"Removing incorrect fix to <$file>\" >&2\n\
"rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n" rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n\
"cat > /dev/null", cat > /dev/null",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -3747,7 +3684,7 @@ tSCC zZzz_Ki_CallsName[] = ...@@ -3747,7 +3684,7 @@ tSCC zZzz_Ki_CallsName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zZzz_Ki_CallsList[] = tSCC zZzz_Ki_CallsList[] =
"|" "sys/ki_calls.h" "|"; "|sys/ki_calls.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3768,9 +3705,9 @@ tTestDesc aZzz_Ki_CallsTests[] = { ...@@ -3768,9 +3705,9 @@ tTestDesc aZzz_Ki_CallsTests[] = {
* Fix Command Arguments for Zzz_Ki_Calls * Fix Command Arguments for Zzz_Ki_Calls
*/ */
const char* apzZzz_Ki_CallsPatch[] = { "sh", "-c", const char* apzZzz_Ki_CallsPatch[] = { "sh", "-c",
"echo \"Removing incorrect fix to <$file>\" >&2\n" "echo \"Removing incorrect fix to <$file>\" >&2\n\
"rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n" rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n\
"cat > /dev/null", cat > /dev/null",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -3783,7 +3720,7 @@ tSCC zZzz_Ki_DefsName[] = ...@@ -3783,7 +3720,7 @@ tSCC zZzz_Ki_DefsName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zZzz_Ki_DefsList[] = tSCC zZzz_Ki_DefsList[] =
"|" "sys/ki_defs.h" "|"; "|sys/ki_defs.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3804,9 +3741,9 @@ tTestDesc aZzz_Ki_DefsTests[] = { ...@@ -3804,9 +3741,9 @@ tTestDesc aZzz_Ki_DefsTests[] = {
* Fix Command Arguments for Zzz_Ki_Defs * Fix Command Arguments for Zzz_Ki_Defs
*/ */
const char* apzZzz_Ki_DefsPatch[] = { "sh", "-c", const char* apzZzz_Ki_DefsPatch[] = { "sh", "-c",
"echo \"Removing incorrect fix to <$file>\" >&2\n" "echo \"Removing incorrect fix to <$file>\" >&2\n\
"rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n" rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n\
"cat > /dev/null", cat > /dev/null",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -3819,7 +3756,7 @@ tSCC zZzz_Bad_FixesName[] = ...@@ -3819,7 +3756,7 @@ tSCC zZzz_Bad_FixesName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zZzz_Bad_FixesList[] = tSCC zZzz_Bad_FixesList[] =
"|" "sundev/ipi_error.h" "|"; "|sundev/ipi_error.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3832,9 +3769,9 @@ tSCC zZzz_Bad_FixesList[] = ...@@ -3832,9 +3769,9 @@ tSCC zZzz_Bad_FixesList[] =
* Fix Command Arguments for Zzz_Bad_Fixes * Fix Command Arguments for Zzz_Bad_Fixes
*/ */
const char* apzZzz_Bad_FixesPatch[] = { "sh", "-c", const char* apzZzz_Bad_FixesPatch[] = { "sh", "-c",
"echo \"Removing incorrect fix to <$file>\" >&2\n" "echo \"Removing incorrect fix to <$file>\" >&2\n\
"rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n" rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n\
"cat > /dev/null", cat > /dev/null",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
...@@ -3847,7 +3784,7 @@ tSCC zZzz_TimeName[] = ...@@ -3847,7 +3784,7 @@ tSCC zZzz_TimeName[] =
* File name selection pattern * File name selection pattern
*/ */
tSCC zZzz_TimeList[] = tSCC zZzz_TimeList[] =
"|" "sys/time.h" "|"; "|sys/time.h|";
/* /*
* Machine/OS name selection pattern * Machine/OS name selection pattern
*/ */
...@@ -3868,9 +3805,9 @@ tTestDesc aZzz_TimeTests[] = { ...@@ -3868,9 +3805,9 @@ tTestDesc aZzz_TimeTests[] = {
* Fix Command Arguments for Zzz_Time * Fix Command Arguments for Zzz_Time
*/ */
const char* apzZzz_TimePatch[] = { "sh", "-c", const char* apzZzz_TimePatch[] = { "sh", "-c",
"echo \"Removing incorrect fix to <$file>\" >&2\n" "echo \"Removing incorrect fix to <$file>\" >&2\n\
"rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n" rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n\
"cat > /dev/null", cat > /dev/null",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment