Skip to content

R
riscv-gcc-1
Commit 180b3d50 by Bruce Korb Committed by Bruce Korb
Options

ISCTRL fix and dgux patch 

From-SVN: r27577
parent 2c8ec431
Showing with 437 additions and 219 deletions
gcc/ChangeLog
Thu Jun 17 15:07 1999 Bruce Korb <ddsinc09@ix.netcom.com>
* fixincludes: ISCNTL patch
* fixinc/inclhack.def (ioctl_fix_ctrl): Fix the definition of [_]*ISCTRL().
(dgux_int_varargs): new for DG/UX
* fixinc/{fixincl.x,inclhack.sh}: Regenerated.
Thu Jun 17 21:34:24 1999 J"orn Rennecke <amylaar@cygnus.co.uk>
* loop.c (strength_reduce): When doing biv->giv conversion, update
......
gcc/fixinc/fixincl.x
......@@ -5,7 +5,7 @@
* files which are fixed to work correctly with ANSI C and placed in a
* directory that GNU C will search.
*
* This file contains 104 fixup descriptions.
* This file contains 105 fixup descriptions.
*
* See README-fixinc for more information.
*
......@@ -583,7 +583,97 @@ const char* apzDec_Intern_AsmPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 17 - No_Double_Slash fix
* Description 17 - Dgux_Int_Varargs fix
*/
tSCC zDgux_Int_VarargsName[] =
"Dgux_Int_Varargs";
/*
* File name selection pattern
*/
tSCC zDgux_Int_VarargsList[] =
"|_int_varargs.h|";
/*
* Machine/OS name selection pattern
*/
#define apzDgux_Int_VarargsMachs (const char**)NULL
#define DGUX_INT_VARARGS_TEST_CT 0
#define DGUX_INT_VARARGS_RE_CT 0
#define aDgux_Int_VarargsTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Dgux_Int_Varargs
*/
const char* apzDgux_Int_VarargsPatch[] = { "sh", "-c",
"cat > /dev/null\n\
cat << '_EOF_'\n\
#ifndef __INT_VARARGS_H\n\
#define __INT_VARARGS_H\n\
\n\
/************************************************************************/\n\
/* _INT_VARARGS.H - Define the common stuff for varargs/stdarg/stdio. */\n\
/************************************************************************/\n\
\n\
/*\n\
** This file is a DG internal header. Never include this\n\
** file directly.\n\
*/\n\
\n\
#ifndef ___int_features_h\n\
#include &lt;sys/_int_features.h&gt;\n\
#endif\n\
\n\
#if !(defined(_VA_LIST) || defined(_VA_LIST_))\n\
#define _VA_LIST\n\
#define _VA_LIST_\n\
\n\
#ifdef __LINT__\n\
\n\
#ifdef __STDC__\n\
typedef void * va_list;\n\
#else\n\
typedef char * va_list;\n\
#endif\n\
\n\
#else\n\
#if _M88K_ANY\n\
\n\
#if defined(__DCC__)\n\
\n\
typedef struct {\n\
int next_arg;\n\
int *mem_ptr;\n\
int *reg_ptr;\n\
} va_list;\n\
\n\
#else /* ! defined(__DCC__) */\n\
\n\
typedef struct {\n\
int __va_arg; /* argument number */\n\
int *__va_stk; /* start of args passed on stack */\n\
int *__va_reg; /* start of args passed in regs */\n\
} va_list;\n\
\n\
#endif /* ! defined(__DCC__) */\n\
\n\
#elif _IX86_ANY\n\
\n\
#if defined(__GNUC__) || defined(__STDC__)\n\
typedef void * va_list;\n\
#else\n\
typedef char * va_list;\n\
#endif\n\
\n\
#endif /* _IX86_ANY */\n\
\n\
#endif /* __LINT__ */\n\
#endif /* !(defined(_VA_LIST) || defined(_VA_LIST_)) */\n\
#endif /* #ifndef __INT_VARARGS_H */\n\
_EOF_",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 18 - No_Double_Slash fix
*/
tSCC zNo_Double_SlashName[] =
"No_Double_Slash";
......@@ -624,7 +714,7 @@ const char* apzNo_Double_SlashPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 18 - Ecd_Cursor fix
* Description 19 - Ecd_Cursor fix
*/
tSCC zEcd_CursorName[] =
"Ecd_Cursor";
......@@ -650,7 +740,7 @@ const char* apzEcd_CursorPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 19 - Sco5_Stat_Wrappers fix
* Description 20 - Sco5_Stat_Wrappers fix
*/
tSCC zSco5_Stat_WrappersName[] =
"Sco5_Stat_Wrappers";
......@@ -686,7 +776,7 @@ extern \"C\"\\\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 20 - Else_Label fix
* Description 21 - Else_Label fix
*/
tSCC zElse_LabelName[] =
"Else_Label";
......@@ -725,7 +815,7 @@ s%^\\([ \t]*#[ \t]*else\\)[ \t]*[^/ \t].*%\\1%",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 21 - Endif_Label fix
* Description 22 - Endif_Label fix
*/
tSCC zEndif_LabelName[] =
"Endif_Label";
......@@ -765,7 +855,7 @@ s%^\\([ \t]*#[ \t]*endif\\)[ \t]*[^/* \t].*%\\1%",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 22 - Hp_Inline fix
* Description 23 - Hp_Inline fix
*/
tSCC zHp_InlineName[] =
"Hp_Inline";
......@@ -800,7 +890,7 @@ const char* apzHp_InlinePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 23 - Hp_Sysfile fix
* Description 24 - Hp_Sysfile fix
*/
tSCC zHp_SysfileName[] =
"Hp_Sysfile";
......@@ -834,7 +924,7 @@ const char* apzHp_SysfilePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 24 - Cxx_Unready fix
* Description 25 - Cxx_Unready fix
*/
tSCC zCxx_UnreadyName[] =
"Cxx_Unready";
......@@ -876,7 +966,7 @@ extern \"C\" {\\\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 25 - Hpux_Maxint fix
* Description 26 - Hpux_Maxint fix
*/
tSCC zHpux_MaxintName[] =
"Hpux_Maxint";
......@@ -905,7 +995,7 @@ const char* apzHpux_MaxintPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 26 - Hpux_Systime fix
* Description 27 - Hpux_Systime fix
*/
tSCC zHpux_SystimeName[] =
"Hpux_Systime";
......@@ -939,7 +1029,7 @@ const char* apzHpux_SystimePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 27 - Interactv_Add1 fix
* Description 28 - Interactv_Add1 fix
*/
tSCC zInteractv_Add1Name[] =
"Interactv_Add1";
......@@ -976,7 +1066,7 @@ const char* apzInteractv_Add1Patch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 28 - Interactv_Add2 fix
* Description 29 - Interactv_Add2 fix
*/
tSCC zInteractv_Add2Name[] =
"Interactv_Add2";
......@@ -1013,7 +1103,7 @@ const char* apzInteractv_Add2Patch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 29 - Interactv_Add3 fix
* Description 30 - Interactv_Add3 fix
*/
tSCC zInteractv_Add3Name[] =
"Interactv_Add3";
......@@ -1051,7 +1141,7 @@ const char* apzInteractv_Add3Patch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 30 - Io_Def_Quotes fix
* Description 31 - Io_Def_Quotes fix
*/
tSCC zIo_Def_QuotesName[] =
"Io_Def_Quotes";
......@@ -1087,7 +1177,7 @@ const char* apzIo_Def_QuotesPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 31 - Ioctl_Fix_Ctrl fix
* Description 32 - Ioctl_Fix_Ctrl fix
*/
tSCC zIoctl_Fix_CtrlName[] =
"Ioctl_Fix_Ctrl";
......@@ -1120,11 +1210,12 @@ const char* apzIoctl_Fix_CtrlPatch[] = { "sed",
"-e", "/#[ \t]*define[ \t]*[ \t]CTRL/s/'\\([cgx]\\)'/\\1/g",
"-e", "/#[ \t]*define[ \t]*[ \t]_CTRL/s/'\\([cgx]\\)'/\\1/g",
"-e", "/#[ \t]*define[ \t]*[ \t]BSD43_CTRL/s/'\\([cgx]\\)'/\\1/g",
"-e", "/#[ \t]*define[ \t]*[ \t][_]*ISCTRL/s/'\\([cgx]\\)'/\\1/g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 32 - Ip_Missing_Semi fix
* Description 33 - Ip_Missing_Semi fix
*/
tSCC zIp_Missing_SemiName[] =
"Ip_Missing_Semi";
......@@ -1150,7 +1241,7 @@ const char* apzIp_Missing_SemiPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 33 - Irix_Multiline_Cmnt fix
* Description 34 - Irix_Multiline_Cmnt fix
*/
tSCC zIrix_Multiline_CmntName[] =
"Irix_Multiline_Cmnt";
......@@ -1177,7 +1268,7 @@ const char* apzIrix_Multiline_CmntPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 34 - Irix_Sockaddr fix
* Description 35 - Irix_Sockaddr fix
*/
tSCC zIrix_SockaddrName[] =
"Irix_Sockaddr";
......@@ -1212,7 +1303,7 @@ struct sockaddr;\n",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 35 - Irix_Struct__File fix
* Description 36 - Irix_Struct__File fix
*/
tSCC zIrix_Struct__FileName[] =
"Irix_Struct__File";
......@@ -1239,7 +1330,7 @@ struct __file_s;\n",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 36 - Isc_Fmod fix
* Description 37 - Isc_Fmod fix
*/
tSCC zIsc_FmodName[] =
"Isc_Fmod";
......@@ -1273,7 +1364,7 @@ const char* apzIsc_FmodPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 37 - Motorola_Nested fix
* Description 38 - Motorola_Nested fix
*/
tSCC zMotorola_NestedName[] =
"Motorola_Nested";
......@@ -1302,7 +1393,7 @@ const char* apzMotorola_NestedPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 38 - Isc_Sys_Limits fix
* Description 39 - Isc_Sys_Limits fix
*/
tSCC zIsc_Sys_LimitsName[] =
"Isc_Sys_Limits";
......@@ -1337,7 +1428,7 @@ const char* apzIsc_Sys_LimitsPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 39 - Kandr_Concat fix
* Description 40 - Kandr_Concat fix
*/
tSCC zKandr_ConcatName[] =
"Kandr_Concat";
......@@ -1371,7 +1462,7 @@ const char* apzKandr_ConcatPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 40 - Limits_Ifndefs fix
* Description 41 - Limits_Ifndefs fix
*/
tSCC zLimits_IfndefsName[] =
"Limits_Ifndefs";
......@@ -1429,7 +1520,7 @@ const char* apzLimits_IfndefsPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 41 - Lynx_Void_Int fix
* Description 42 - Lynx_Void_Int fix
*/
tSCC zLynx_Void_IntName[] =
"Lynx_Void_Int";
......@@ -1463,7 +1554,7 @@ const char* apzLynx_Void_IntPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 42 - Lynxos_Fcntl_Proto fix
* Description 43 - Lynxos_Fcntl_Proto fix
*/
tSCC zLynxos_Fcntl_ProtoName[] =
"Lynxos_Fcntl_Proto";
......@@ -1497,7 +1588,7 @@ const char* apzLynxos_Fcntl_ProtoPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 43 - M88k_Bad_Hypot_Opt fix
* Description 44 - M88k_Bad_Hypot_Opt fix
*/
tSCC zM88k_Bad_Hypot_OptName[] =
"M88k_Bad_Hypot_Opt";
......@@ -1538,7 +1629,7 @@ static __inline__ double fake_hypot (x, y)\\\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 44 - M88k_Bad_S_If fix
* Description 45 - M88k_Bad_S_If fix
*/
tSCC zM88k_Bad_S_IfName[] =
"M88k_Bad_S_If";
......@@ -1575,7 +1666,7 @@ const char* apzM88k_Bad_S_IfPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 45 - M88k_Multi_Incl fix
* Description 46 - M88k_Multi_Incl fix
*/
tSCC zM88k_Multi_InclName[] =
"M88k_Multi_Incl";
......@@ -1616,7 +1707,7 @@ const char* apzM88k_Multi_InclPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 46 - Machine_Name fix
* Description 47 - Machine_Name fix
*/
tSCC zMachine_NameName[] =
"Machine_Name";
......@@ -1685,7 +1776,7 @@ s/\\\\+++fixinc_eol+++/\\\\/g\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 47 - Math_Exception fix
* Description 48 - Math_Exception fix
*/
tSCC zMath_ExceptionName[] =
"Math_Exception";
......@@ -1734,7 +1825,7 @@ const char* apzMath_ExceptionPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 48 - Math_Gcc_Ifndefs fix
* Description 49 - Math_Gcc_Ifndefs fix
*/
tSCC zMath_Gcc_IfndefsName[] =
"Math_Gcc_Ifndefs";
......@@ -1772,7 +1863,7 @@ const char* apzMath_Gcc_IfndefsPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 49 - Nested_Comment fix
* Description 50 - Nested_Comment fix
*/
tSCC zNested_CommentName[] =
"Nested_Comment";
......@@ -1798,7 +1889,7 @@ const char* apzNested_CommentPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 50 - News_Os_Recursion fix
* Description 51 - News_Os_Recursion fix
*/
tSCC zNews_Os_RecursionName[] =
"News_Os_Recursion";
......@@ -1835,7 +1926,7 @@ const char* apzNews_Os_RecursionPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 51 - Next_Math_Prefix fix
* Description 52 - Next_Math_Prefix fix
*/
tSCC zNext_Math_PrefixName[] =
"Next_Math_Prefix";
......@@ -1873,7 +1964,7 @@ const char* apzNext_Math_PrefixPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 52 - Next_Template fix
* Description 53 - Next_Template fix
*/
tSCC zNext_TemplateName[] =
"Next_Template";
......@@ -1908,7 +1999,7 @@ const char* apzNext_TemplatePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 53 - Next_Volitile fix
* Description 54 - Next_Volitile fix
*/
tSCC zNext_VolitileName[] =
"Next_Volitile";
......@@ -1943,7 +2034,7 @@ const char* apzNext_VolitilePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 54 - Next_Wait_Union fix
* Description 55 - Next_Wait_Union fix
*/
tSCC zNext_Wait_UnionName[] =
"Next_Wait_Union";
......@@ -1977,7 +2068,7 @@ const char* apzNext_Wait_UnionPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 55 - Nodeent_Syntax fix
* Description 56 - Nodeent_Syntax fix
*/
tSCC zNodeent_SyntaxName[] =
"Nodeent_Syntax";
......@@ -2003,7 +2094,7 @@ const char* apzNodeent_SyntaxPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 56 - Osf_Namespace_A fix
* Description 57 - Osf_Namespace_A fix
*/
tSCC zOsf_Namespace_AName[] =
"Osf_Namespace_A";
......@@ -2048,7 +2139,7 @@ const char* apzOsf_Namespace_APatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 57 - Osf_Namespace_B fix
* Description 58 - Osf_Namespace_B fix
*/
tSCC zOsf_Namespace_BName[] =
"Osf_Namespace_B";
......@@ -2094,7 +2185,7 @@ typedef __regmatch_t\tregmatch_t;\n",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 58 - Pthread_Page_Size fix
* Description 59 - Pthread_Page_Size fix
*/
tSCC zPthread_Page_SizeName[] =
"Pthread_Page_Size";
......@@ -2128,7 +2219,7 @@ const char* apzPthread_Page_SizePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 59 - Rs6000_Double fix
* Description 60 - Rs6000_Double fix
*/
tSCC zRs6000_DoubleName[] =
"Rs6000_Double";
......@@ -2165,7 +2256,7 @@ const char* apzRs6000_DoublePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 60 - Rs6000_Fchmod fix
* Description 61 - Rs6000_Fchmod fix
*/
tSCC zRs6000_FchmodName[] =
"Rs6000_Fchmod";
......@@ -2199,7 +2290,7 @@ const char* apzRs6000_FchmodPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 61 - Rs6000_Param fix
* Description 62 - Rs6000_Param fix
*/
tSCC zRs6000_ParamName[] =
"Rs6000_Param";
......@@ -2225,7 +2316,7 @@ const char* apzRs6000_ParamPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 62 - Sony_Include fix
* Description 63 - Sony_Include fix
*/
tSCC zSony_IncludeName[] =
"Sony_Include";
......@@ -2259,7 +2350,7 @@ const char* apzSony_IncludePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 63 - Statsswtch fix
* Description 64 - Statsswtch fix
*/
tSCC zStatsswtchName[] =
"Statsswtch";
......@@ -2293,7 +2384,7 @@ const char* apzStatsswtchPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 64 - Stdio_Va_List fix
* Description 65 - Stdio_Va_List fix
*/
tSCC zStdio_Va_ListName[] =
"Stdio_Va_List";
......@@ -2336,7 +2427,7 @@ const char* apzStdio_Va_ListPatch[] = { "sh", "-c",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 65 - Sun_Bogus_Ifdef fix
* Description 66 - Sun_Bogus_Ifdef fix
*/
tSCC zSun_Bogus_IfdefName[] =
"Sun_Bogus_Ifdef";
......@@ -2370,7 +2461,7 @@ const char* apzSun_Bogus_IfdefPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 66 - Sun_Bogus_Ifdef_Sun4c fix
* Description 67 - Sun_Bogus_Ifdef_Sun4c fix
*/
tSCC zSun_Bogus_Ifdef_Sun4cName[] =
"Sun_Bogus_Ifdef_Sun4c";
......@@ -2404,7 +2495,7 @@ const char* apzSun_Bogus_Ifdef_Sun4cPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 67 - Sun_Catmacro fix
* Description 68 - Sun_Catmacro fix
*/
tSCC zSun_CatmacroName[] =
"Sun_Catmacro";
......@@ -2443,7 +2534,7 @@ const char* apzSun_CatmacroPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 68 - Sun_Malloc fix
* Description 69 - Sun_Malloc fix
*/
tSCC zSun_MallocName[] =
"Sun_Malloc";
......@@ -2472,7 +2563,7 @@ const char* apzSun_MallocPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 69 - Sun_Memcpy fix
* Description 70 - Sun_Memcpy fix
*/
tSCC zSun_MemcpyName[] =
"Sun_Memcpy";
......@@ -2526,7 +2617,7 @@ extern int memcmp();\\\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 70 - Sun_Rusers_Semi fix
* Description 71 - Sun_Rusers_Semi fix
*/
tSCC zSun_Rusers_SemiName[] =
"Sun_Rusers_Semi";
......@@ -2560,7 +2651,7 @@ const char* apzSun_Rusers_SemiPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 71 - Sun_Signal fix
* Description 72 - Sun_Signal fix
*/
tSCC zSun_SignalName[] =
"Sun_Signal";
......@@ -2599,7 +2690,7 @@ void\t(*signal(...))(...);\\\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 72 - Sun_Auth_Proto fix
* Description 73 - Sun_Auth_Proto fix
*/
tSCC zSun_Auth_ProtoName[] =
"Sun_Auth_Proto";
......@@ -2638,7 +2729,7 @@ const char* apzSun_Auth_ProtoPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 73 - Sunos_Matherr_Decl fix
* Description 74 - Sunos_Matherr_Decl fix
*/
tSCC zSunos_Matherr_DeclName[] =
"Sunos_Matherr_Decl";
......@@ -2666,7 +2757,7 @@ struct exception;\n",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 74 - Sunos_Strlen fix
* Description 75 - Sunos_Strlen fix
*/
tSCC zSunos_StrlenName[] =
"Sunos_Strlen";
......@@ -2692,7 +2783,7 @@ const char* apzSunos_StrlenPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 75 - Systypes fix
* Description 76 - Systypes fix
*/
tSCC zSystypesName[] =
"Systypes";
......@@ -2750,7 +2841,7 @@ typedef __SIZE_TYPE__ size_t;\\\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 76 - Systypes_For_Aix fix
* Description 77 - Systypes_For_Aix fix
*/
tSCC zSystypes_For_AixName[] =
"Systypes_For_Aix";
......@@ -2795,7 +2886,7 @@ const char* apzSystypes_For_AixPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 77 - Sysv68_String fix
* Description 78 - Sysv68_String fix
*/
tSCC zSysv68_StringName[] =
"Sysv68_String";
......@@ -2831,7 +2922,7 @@ extern unsigned int\\\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 78 - Sysz_Stdlib_For_Sun fix
* Description 79 - Sysz_Stdlib_For_Sun fix
*/
tSCC zSysz_Stdlib_For_SunName[] =
"Sysz_Stdlib_For_Sun";
......@@ -2867,7 +2958,7 @@ const char* apzSysz_Stdlib_For_SunPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 79 - Sysz_Stdtypes_For_Sun fix
* Description 80 - Sysz_Stdtypes_For_Sun fix
*/
tSCC zSysz_Stdtypes_For_SunName[] =
"Sysz_Stdtypes_For_Sun";
......@@ -2907,7 +2998,7 @@ const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 80 - Tinfo_Cplusplus fix
* Description 81 - Tinfo_Cplusplus fix
*/
tSCC zTinfo_CplusplusName[] =
"Tinfo_Cplusplus";
......@@ -2933,7 +3024,7 @@ const char* apzTinfo_CplusplusPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 81 - Ultrix_Ansi_Compat fix
* Description 82 - Ultrix_Ansi_Compat fix
*/
tSCC zUltrix_Ansi_CompatName[] =
"Ultrix_Ansi_Compat";
......@@ -2969,7 +3060,7 @@ const char* apzUltrix_Ansi_CompatPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 82 - Ultrix_Fix_Fixproto fix
* Description 83 - Ultrix_Fix_Fixproto fix
*/
tSCC zUltrix_Fix_FixprotoName[] =
"Ultrix_Fix_Fixproto";
......@@ -3004,7 +3095,7 @@ struct utsname;\n",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 83 - Ultrix_Atof_Param fix
* Description 84 - Ultrix_Atof_Param fix
*/
tSCC zUltrix_Atof_ParamName[] =
"Ultrix_Atof_Param";
......@@ -3034,7 +3125,7 @@ const char* apzUltrix_Atof_ParamPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 84 - Ultrix_Const fix
* Description 85 - Ultrix_Const fix
*/
tSCC zUltrix_ConstName[] =
"Ultrix_Const";
......@@ -3068,7 +3159,7 @@ const char* apzUltrix_ConstPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 85 - Ultrix_Ifdef fix
* Description 86 - Ultrix_Ifdef fix
*/
tSCC zUltrix_IfdefName[] =
"Ultrix_Ifdef";
......@@ -3102,7 +3193,7 @@ const char* apzUltrix_IfdefPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 86 - Ultrix_Nested_Cmnt fix
* Description 87 - Ultrix_Nested_Cmnt fix
*/
tSCC zUltrix_Nested_CmntName[] =
"Ultrix_Nested_Cmnt";
......@@ -3128,7 +3219,7 @@ const char* apzUltrix_Nested_CmntPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 87 - Ultrix_Static fix
* Description 88 - Ultrix_Static fix
*/
tSCC zUltrix_StaticName[] =
"Ultrix_Static";
......@@ -3164,7 +3255,7 @@ const char* apzUltrix_StaticPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 88 - Undefine_Null fix
* Description 89 - Undefine_Null fix
*/
tSCC zUndefine_NullName[] =
"Undefine_Null";
......@@ -3205,7 +3296,7 @@ const char* apzUndefine_NullPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 89 - Va_I960_Macro fix
* Description 90 - Va_I960_Macro fix
*/
tSCC zVa_I960_MacroName[] =
"Va_I960_Macro";
......@@ -3242,7 +3333,7 @@ const char* apzVa_I960_MacroPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 90 - Void_Null fix
* Description 91 - Void_Null fix
*/
tSCC zVoid_NullName[] =
"Void_Null";
......@@ -3276,7 +3367,7 @@ const char* apzVoid_NullPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 91 - Vxworks_Gcc_Problem fix
* Description 92 - Vxworks_Gcc_Problem fix
*/
tSCC zVxworks_Gcc_ProblemName[] =
"Vxworks_Gcc_Problem";
......@@ -3325,7 +3416,7 @@ const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 92 - Vxworks_Needs_Vxtypes fix
* Description 93 - Vxworks_Needs_Vxtypes fix
*/
tSCC zVxworks_Needs_VxtypesName[] =
"Vxworks_Needs_Vxtypes";
......@@ -3359,7 +3450,7 @@ const char* apzVxworks_Needs_VxtypesPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 93 - Vxworks_Needs_Vxworks fix
* Description 94 - Vxworks_Needs_Vxworks fix
*/
tSCC zVxworks_Needs_VxworksName[] =
"Vxworks_Needs_Vxworks";
......@@ -3407,7 +3498,7 @@ const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 94 - Vxworks_Time fix
* Description 95 - Vxworks_Time fix
*/
tSCC zVxworks_TimeName[] =
"Vxworks_Time";
......@@ -3457,7 +3548,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\\\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 95 - X11_Class fix
* Description 96 - X11_Class fix
*/
tSCC zX11_ClassName[] =
"X11_Class";
......@@ -3496,7 +3587,7 @@ const char* apzX11_ClassPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 96 - X11_Class_Usage fix
* Description 97 - X11_Class_Usage fix
*/
tSCC zX11_Class_UsageName[] =
"X11_Class_Usage";
......@@ -3530,7 +3621,7 @@ const char* apzX11_Class_UsagePatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 97 - X11_New fix
* Description 98 - X11_New fix
*/
tSCC zX11_NewName[] =
"X11_New";
......@@ -3570,7 +3661,7 @@ const char* apzX11_NewPatch[] = { "sed",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 98 - X11_Sprintf fix
* Description 99 - X11_Sprintf fix
*/
tSCC zX11_SprintfName[] =
"X11_Sprintf";
......@@ -3598,7 +3689,7 @@ extern char *\tsprintf();\\\n\
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 99 - Zzz_Ki_Iface fix
* Description 100 - Zzz_Ki_Iface fix
*/
tSCC zZzz_Ki_IfaceName[] =
"Zzz_Ki_Iface";
......@@ -3634,7 +3725,7 @@ cat > /dev/null",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 100 - Zzz_Ki fix
* Description 101 - Zzz_Ki fix
*/
tSCC zZzz_KiName[] =
"Zzz_Ki";
......@@ -3670,7 +3761,7 @@ cat > /dev/null",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 101 - Zzz_Ki_Calls fix
* Description 102 - Zzz_Ki_Calls fix
*/
tSCC zZzz_Ki_CallsName[] =
"Zzz_Ki_Calls";
......@@ -3706,7 +3797,7 @@ cat > /dev/null",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 102 - Zzz_Ki_Defs fix
* Description 103 - Zzz_Ki_Defs fix
*/
tSCC zZzz_Ki_DefsName[] =
"Zzz_Ki_Defs";
......@@ -3742,7 +3833,7 @@ cat > /dev/null",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 103 - Zzz_Bad_Fixes fix
* Description 104 - Zzz_Bad_Fixes fix
*/
tSCC zZzz_Bad_FixesName[] =
"Zzz_Bad_Fixes";
......@@ -3770,7 +3861,7 @@ cat > /dev/null",
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 104 - Zzz_Time fix
* Description 105 - Zzz_Time fix
*/
tSCC zZzz_TimeName[] =
"Zzz_Time";
......@@ -3809,7 +3900,7 @@ cat > /dev/null",
* List of all fixes
*/
#define REGEX_COUNT 74
#define FIX_COUNT 104
#define FIX_COUNT 105
tFixDesc fixDescList[ FIX_COUNT ] = {
{ zAix_SyswaitName, zAix_SyswaitList,
apzAix_SyswaitMachs, (regex_t*)NULL,
......@@ -3891,6 +3982,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
aDec_Intern_AsmTests, apzDec_Intern_AsmPatch },
{ zDgux_Int_VarargsName, zDgux_Int_VarargsList,
apzDgux_Int_VarargsMachs, (regex_t*)NULL,
DGUX_INT_VARARGS_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
aDgux_Int_VarargsTests, apzDgux_Int_VarargsPatch },
{ zNo_Double_SlashName, zNo_Double_SlashList,
apzNo_Double_SlashMachs, (regex_t*)NULL,
NO_DOUBLE_SLASH_TEST_CT, FD_MACH_ONLY,
......
gcc/fixinc/inclhack.def
......@@ -262,54 +262,79 @@ fix = {
};
#ifdef no_more
/*
* And also with the HP-UX 10 and HP-UX 11 sys/pci.h file
* Completely replace &lt;_int_varargs.h&gt; with a file that includes gcc's
* stdarg.h or varargs.h files as appropriate on DG/UX
*/
fix = {
hackname = cxx_cmnt_hpux;
files = sys/pci.h;
select = "System Private Structures";
sed = "s|//.*$||g";
};
hackname = dgux_int_varargs;
files = _int_varargs.h;
shell = "cat > /dev/null\ncat << '_EOF_'
\#ifndef __INT_VARARGS_H
\#define __INT_VARARGS_H
/************************************************************************/
/* _INT_VARARGS.H - Define the common stuff for varargs/stdarg/stdio. */
/************************************************************************/
/*
* Turning // comments into normal comments trashes this IRIX 4.0.1
* header file, which embeds // comments inside multi-line
* comments. If this looks like the IRIX header file, we refix it by
* just throwing away the // comments.
*/
fix = {
hackname = cxx_cmnt_irix;
files = fam.h;
select = indigo.esd;
sed = "s|//.*$||g";
};
** This file is a DG internal header. Never include this
** file directly.
*/
\#ifndef ___int_features_h
\#include &lt;sys/_int_features.h&gt;
\#endif
/*
* Same problem with a file from SunOS 4.1.3 : a header file containing
* the string "//" embedded in "/ * * /"
*/
fix = {
hackname = cxx_cmnt_sunos;
files = sbusdev/audiovar.h;
files = sys/audiovar.h;
sed = "s|//.*$||g";
};
\#if !(defined(_VA_LIST) || defined(_VA_LIST_))
\#define _VA_LIST
\#define _VA_LIST_
\#ifdef __LINT__
/*
* There is a similar problem with the VxWorks drv/netif/if_med.h file.
*/
fix = {
hackname = cxx_cmnt_vxworks;
files = drv/netif/if_med.h;
select = "Wind River";
sed = "s|//.*$||g";
\#ifdef __STDC__
typedef void * va_list;
\#else
typedef char * va_list;
\#endif
\#else
\#if _M88K_ANY
\#if defined(__DCC__)
typedef struct {
int next_arg;
int *mem_ptr;
int *reg_ptr;
} va_list;
\#else /* ! defined(__DCC__) */
typedef struct {
int __va_arg; /* argument number */
int *__va_stk; /* start of args passed on stack */
int *__va_reg; /* start of args passed in regs */
} va_list;
\#endif /* ! defined(__DCC__) */
\#elif _IX86_ANY
\#if defined(__GNUC__) || defined(__STDC__)
typedef void * va_list;
\#else
typedef char * va_list;
\#endif
\#endif /* _IX86_ANY */
\#endif /* __LINT__ */
\#endif /* !(defined(_VA_LIST) || defined(_VA_LIST_)) */
\#endif /* #ifndef __INT_VARARGS_H */
_EOF_";
};
#endif
/*
* Remove the double-slash comments
......@@ -334,7 +359,7 @@ fix = {
* Now that we delete the // comments instead of converting them to / * * /,
* traditional hacks like irix_bogus_cxx_cmnt, no longer work (which
* strangely enough was also used on alpha-dec-osf4.0d). If we skip the
* hack whenever we see ``"//"'', then the need for the secondary hack
* hack whenever we see ``"//"' ', then the need for the secondary hack
* disappears. Note: it is painful to ensure that the first quote
* exists, so we just check for the trailing quote directly abutting
* the //. Note: We should never touch a line that has // completely
......@@ -600,7 +625,7 @@ fix = {
* ANSI macro substitution rules prohibit looking inside quoted strings
* for the substitution names. A side effect is that the quotes are
* inserted in the definitions of those macros as well. So, the last
* three sed expressions are supposed to clean up the definitions, as
* several sed expressions are supposed to clean up the definitions, as
* long as those definitions are using "c", "g" or "x" as the macro
* argument :). Yuck.
*/
......@@ -622,6 +647,9 @@ fix = {
sed = "/#[ \t]*define[ \t]*[ \t]BSD43_CTRL/"
"s/'\\([cgx]\\)'/\\1/g";
sed = "/#[ \t]*define[ \t]*[ \t][_]*ISCTRL/"
"s/'\\([cgx]\\)'/\\1/g";
};
......@@ -2450,5 +2478,4 @@ fix = {
"cat > /dev/null";
};
/*EOF*/
gcc/fixinc/inclhack.sh
......@@ -6,7 +6,7 @@
# files which are fixed to work correctly with ANSI C and placed in a
# directory that GNU C will search.
#
# This script contains 104 fixup scripts.
# This script contains 105 fixup scripts.
#
# See README-fixinc for more information.
#
......@@ -745,7 +745,93 @@ struct rusage;
#
# Fix 17: No_Double_Slash
# Fix 17: Dgux_Int_Varargs
#
case "${file}" in ./_int_varargs.h )
fixlist="${fixlist}
dgux_int_varargs"
if [ ! -r ${DESTFILE} ]
then infile=${file}
else infile=${DESTFILE} ; fi
( cat > /dev/null
cat << '_EOF_'
#ifndef __INT_VARARGS_H
#define __INT_VARARGS_H
/************************************************************************/
/* _INT_VARARGS.H - Define the common stuff for varargs/stdarg/stdio. */
/************************************************************************/
/*
** This file is a DG internal header. Never include this
** file directly.
*/
#ifndef ___int_features_h
#include &lt;sys/_int_features.h&gt;
#endif
#if !(defined(_VA_LIST) || defined(_VA_LIST_))
#define _VA_LIST
#define _VA_LIST_
#ifdef __LINT__
#ifdef __STDC__
typedef void * va_list;
#else
typedef char * va_list;
#endif
#else
#if _M88K_ANY
#if defined(__DCC__)
typedef struct {
int next_arg;
int *mem_ptr;
int *reg_ptr;
} va_list;
#else /* ! defined(__DCC__) */
typedef struct {
int __va_arg; /* argument number */
int *__va_stk; /* start of args passed on stack */
int *__va_reg; /* start of args passed in regs */
} va_list;
#endif /* ! defined(__DCC__) */
#elif _IX86_ANY
#if defined(__GNUC__) || defined(__STDC__)
typedef void * va_list;
#else
typedef char * va_list;
#endif
#endif /* _IX86_ANY */
#endif /* __LINT__ */
#endif /* !(defined(_VA_LIST) || defined(_VA_LIST_)) */
#endif /* #ifndef __INT_VARARGS_H */
_EOF_ ) < $infile > ${DESTDIR}/fixinc.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
#
if test ! -f ${DESTDIR}/fixinc.tmp
then continue ; fi
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
# Fix 18: No_Double_Slash
#
if ( test -n "`egrep '(^|[^:])//[^\"*]' ${file}`" -a \
'(' -z "`echo ${file} | egrep '(CC|cxx|\+\+)/'`" ')'
......@@ -765,7 +851,7 @@ struct rusage;
#
# Fix 18: Ecd_Cursor
# Fix 19: Ecd_Cursor
#
case "${file}" in ./sunwindow/win_lock.h | \
./sunwindow/win_cursor.h )
......@@ -784,7 +870,7 @@ struct rusage;
#
# Fix 19: Sco5_Stat_Wrappers
# Fix 20: Sco5_Stat_Wrappers
#
case "${file}" in ./sys/stat.h )
case "$target_canonical" in i*86-*-sco3.2v5* )
......@@ -815,7 +901,7 @@ extern "C"\
#
# Fix 20: Else_Label
# Fix 21: Else_Label
#
if ( test -n "`egrep '^[ ]*#[ ]*else[ ]+[!-.0-~]' ${file}`"
) > /dev/null 2>&1 ; then
......@@ -839,7 +925,7 @@ s%^\([ ]*#[ ]*else\)[ ]*[^/ ].*%\1%' \
#
# Fix 21: Endif_Label
# Fix 22: Endif_Label
#
if ( test -n "`egrep '^[ ]*#[ ]*endif[ ]+[!-.0-z{|}~]|^[ ]*#[ ]*endif[ ]+/[^*]' ${file}`"
) > /dev/null 2>&1 ; then
......@@ -864,7 +950,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
#
# Fix 22: Hp_Inline
# Fix 23: Hp_Inline
#
case "${file}" in ./sys/spinlock.h )
if ( test -n "`egrep 'include.*\"\\.\\./machine/' ${file}`"
......@@ -886,7 +972,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
#
# Fix 23: Hp_Sysfile
# Fix 24: Hp_Sysfile
#
case "${file}" in ./sys/file.h )
if ( test -n "`egrep 'HPUX_SOURCE' ${file}`"
......@@ -907,7 +993,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
#
# Fix 24: Cxx_Unready
# Fix 25: Cxx_Unready
#
case "${file}" in ./sys/mman.h | \
./rpc/types.h )
......@@ -939,7 +1025,7 @@ extern "C" {\
#
# Fix 25: Hpux_Maxint
# Fix 26: Hpux_Maxint
#
case "${file}" in ./sys/param.h )
fixlist="${fixlist}
......@@ -962,7 +1048,7 @@ extern "C" {\
#
# Fix 26: Hpux_Systime
# Fix 27: Hpux_Systime
#
case "${file}" in ./sys/time.h )
if ( test -n "`egrep '^extern struct sigevent;' ${file}`"
......@@ -983,7 +1069,7 @@ extern "C" {\
#
# Fix 27: Interactv_Add1
# Fix 28: Interactv_Add1
#
case "${file}" in ./stdio.h | \
./math.h | \
......@@ -1010,7 +1096,7 @@ extern "C" {\
#
# Fix 28: Interactv_Add2
# Fix 29: Interactv_Add2
#
case "${file}" in ./math.h )
if ( test '(' -d /etc/conf/kconfig.d ')' -a \
......@@ -1032,7 +1118,7 @@ extern "C" {\
#
# Fix 29: Interactv_Add3
# Fix 30: Interactv_Add3
#
case "${file}" in ./sys/limits.h )
if ( test '(' -d /etc/conf/kconfig.d ')' -a \
......@@ -1055,7 +1141,7 @@ extern "C" {\
#
# Fix 30: Io_Def_Quotes
# Fix 31: Io_Def_Quotes
#
if ( test -n "`egrep '[ ]*[ ](_|DES)IO[A-Z]*[ ]*\\( *[^,'\\'']' ${file}`"
) > /dev/null 2>&1 ; then
......@@ -1076,7 +1162,7 @@ extern "C" {\
#
# Fix 31: Ioctl_Fix_Ctrl
# Fix 32: Ioctl_Fix_Ctrl
#
if ( test -n "`egrep 'CTRL[ ]*\\(' ${file}`"
) > /dev/null 2>&1 ; then
......@@ -1091,6 +1177,7 @@ extern "C" {\
-e '/#[ ]*define[ ]*[ ]CTRL/s/'\''\([cgx]\)'\''/\1/g' \
-e '/#[ ]*define[ ]*[ ]_CTRL/s/'\''\([cgx]\)'\''/\1/g' \
-e '/#[ ]*define[ ]*[ ]BSD43_CTRL/s/'\''\([cgx]\)'\''/\1/g' \
-e '/#[ ]*define[ ]*[ ][_]*ISCTRL/s/'\''\([cgx]\)'\''/\1/g' \
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
......@@ -1098,7 +1185,7 @@ extern "C" {\
#
# Fix 32: Ip_Missing_Semi
# Fix 33: Ip_Missing_Semi
#
case "${file}" in ./netinet/ip.h )
fixlist="${fixlist}
......@@ -1116,7 +1203,7 @@ extern "C" {\
#
# Fix 33: Irix_Multiline_Cmnt
# Fix 34: Irix_Multiline_Cmnt
#
case "${file}" in ./sys/types.h )
fixlist="${fixlist}
......@@ -1135,7 +1222,7 @@ extern "C" {\
#
# Fix 34: Irix_Sockaddr
# Fix 35: Irix_Sockaddr
#
case "${file}" in ./rpc/auth.h )
if ( test -n "`egrep 'authdes_create.*struct sockaddr' ${file}`"
......@@ -1158,7 +1245,7 @@ struct sockaddr;
#
# Fix 35: Irix_Struct__File
# Fix 36: Irix_Struct__File
#
case "${file}" in ./rpc/xdr.h )
fixlist="${fixlist}
......@@ -1178,7 +1265,7 @@ struct __file_s;
#
# Fix 36: Isc_Fmod
# Fix 37: Isc_Fmod
#
case "${file}" in ./math.h )
if ( test -n "`egrep 'fmod\\(double\\)' ${file}`"
......@@ -1199,7 +1286,7 @@ struct __file_s;
#
# Fix 37: Motorola_Nested
# Fix 38: Motorola_Nested
#
case "${file}" in ./limits.h | \
./sys/limits.h )
......@@ -1222,7 +1309,7 @@ struct __file_s;
#
# Fix 38: Isc_Sys_Limits
# Fix 39: Isc_Sys_Limits
#
case "${file}" in ./sys/limits.h )
if ( test -n "`egrep 'CHILD_MAX' ${file}`"
......@@ -1244,7 +1331,7 @@ struct __file_s;
#
# Fix 39: Kandr_Concat
# Fix 40: Kandr_Concat
#
case "${file}" in ./sparc/asm_linkage.h | \
./sun3/asm_linkage.h | \
......@@ -1282,7 +1369,7 @@ struct __file_s;
#
# Fix 40: Limits_Ifndefs
# Fix 41: Limits_Ifndefs
#
case "${file}" in ./limits.h | \
./sys/limits.h )
......@@ -1340,7 +1427,7 @@ struct __file_s;
#
# Fix 41: Lynx_Void_Int
# Fix 42: Lynx_Void_Int
#
case "${file}" in ./curses.h )
if ( test -n "`egrep '#[ ]*define[ ]+void[ ]+int' ${file}`"
......@@ -1361,7 +1448,7 @@ struct __file_s;
#
# Fix 42: Lynxos_Fcntl_Proto
# Fix 43: Lynxos_Fcntl_Proto
#
case "${file}" in ./fcntl.h )
if ( test -n "`egrep 'fcntl.*\\(int, int, int\\)' ${file}`"
......@@ -1382,7 +1469,7 @@ struct __file_s;
#
# Fix 43: M88k_Bad_Hypot_Opt
# Fix 44: M88k_Bad_Hypot_Opt
#
case "${file}" in ./math.h )
case "$target_canonical" in m88k-motorola-sysv3* )
......@@ -1417,7 +1504,7 @@ static __inline__ double fake_hypot (x, y)\
#
# Fix 44: M88k_Bad_S_If
# Fix 45: M88k_Bad_S_If
#
case "${file}" in ./sys/stat.h )
case "$target_canonical" in m88k-*-sysv3* )
......@@ -1442,7 +1529,7 @@ static __inline__ double fake_hypot (x, y)\
#
# Fix 45: M88k_Multi_Incl
# Fix 46: M88k_Multi_Incl
#
case "${file}" in ./time.h )
case "$target_canonical" in m88k-tektronix-sysv3* )
......@@ -1475,7 +1562,7 @@ static __inline__ double fake_hypot (x, y)\
#
# Fix 46: Machine_Name
# Fix 47: Machine_Name
#
if ( test -n "`egrep '^#[ ]*(if|elif).*[^a-zA-Z0-9_](_*[MSRrhim]|[Mbimnpstuv])[a-zA-Z0-9_]' ${file}`"
) > /dev/null 2>&1 ; then
......@@ -1527,7 +1614,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 47: Math_Exception
# Fix 48: Math_Exception
#
case "${file}" in ./math.h )
if ( test -n "`egrep 'struct exception' ${file}`"
......@@ -1567,7 +1654,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 48: Math_Gcc_Ifndefs
# Fix 49: Math_Gcc_Ifndefs
#
case "${file}" in ./math.h )
fixlist="${fixlist}
......@@ -1601,7 +1688,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 49: Nested_Comment
# Fix 50: Nested_Comment
#
case "${file}" in ./rpc/rpc.h )
fixlist="${fixlist}
......@@ -1619,7 +1706,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 50: News_Os_Recursion
# Fix 51: News_Os_Recursion
#
case "${file}" in ./stdlib.h )
if ( test -n "`egrep '#include <stdlib.h>' ${file}`"
......@@ -1645,7 +1732,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 51: Next_Math_Prefix
# Fix 52: Next_Math_Prefix
#
case "${file}" in ./ansi/math.h )
if ( test -n "`egrep '^extern.*double.*__const__.*' ${file}`"
......@@ -1670,7 +1757,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 52: Next_Template
# Fix 53: Next_Template
#
case "${file}" in ./bsd/libc.h )
if ( test -n "`egrep 'template' ${file}`"
......@@ -1692,7 +1779,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 53: Next_Volitile
# Fix 54: Next_Volitile
#
case "${file}" in ./ansi/stdlib.h )
if ( test -n "`egrep 'volatile' ${file}`"
......@@ -1714,7 +1801,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 54: Next_Wait_Union
# Fix 55: Next_Wait_Union
#
case "${file}" in ./sys/wait.h )
if ( test -n "`egrep 'wait\\(union wait' ${file}`"
......@@ -1735,7 +1822,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 55: Nodeent_Syntax
# Fix 56: Nodeent_Syntax
#
case "${file}" in ./netdnet/dnetdb.h )
fixlist="${fixlist}
......@@ -1753,7 +1840,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 56: Osf_Namespace_A
# Fix 57: Osf_Namespace_A
#
case "${file}" in ./reg_types.h | \
./sys/lc_core.h )
......@@ -1780,7 +1867,7 @@ s/\\+++fixinc_eol+++/\\/g
#
# Fix 57: Osf_Namespace_B
# Fix 58: Osf_Namespace_B
#
case "${file}" in ./regex.h )
if ( test '(' -r reg_types.h ')' -a \
......@@ -1808,7 +1895,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 58: Pthread_Page_Size
# Fix 59: Pthread_Page_Size
#
case "${file}" in ./pthread.h )
if ( test -n "`egrep '^int __page_size' ${file}`"
......@@ -1829,7 +1916,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 59: Rs6000_Double
# Fix 60: Rs6000_Double
#
case "${file}" in ./math.h )
if ( test -n "`egrep '[^a-zA-Z_]class\\(' ${file}`"
......@@ -1855,7 +1942,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 60: Rs6000_Fchmod
# Fix 61: Rs6000_Fchmod
#
case "${file}" in ./sys/stat.h )
if ( test -n "`egrep 'fchmod\\(char' ${file}`"
......@@ -1876,7 +1963,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 61: Rs6000_Param
# Fix 62: Rs6000_Param
#
case "${file}" in ./stdio.h | \
./unistd.h )
......@@ -1895,7 +1982,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 62: Sony_Include
# Fix 63: Sony_Include
#
case "${file}" in ./machine/machparam.h )
if ( test -n "`egrep '\"\\.\\./machine/endian.h\"' ${file}`"
......@@ -1916,7 +2003,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 63: Statsswtch
# Fix 64: Statsswtch
#
case "${file}" in ./rpcsvc/rstat.h )
if ( test -n "`egrep 'boottime$' ${file}`"
......@@ -1937,7 +2024,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 64: Stdio_Va_List
# Fix 65: Stdio_Va_List
#
case "${file}" in ./stdio.h )
fixlist="${fixlist}
......@@ -1976,7 +2063,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 65: Sun_Bogus_Ifdef
# Fix 66: Sun_Bogus_Ifdef
#
case "${file}" in ./hsfs/hsfs_spec.h | \
./hsfs/iso_spec.h )
......@@ -1998,7 +2085,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 66: Sun_Bogus_Ifdef_Sun4c
# Fix 67: Sun_Bogus_Ifdef_Sun4c
#
case "${file}" in ./hsfs/hsnode.h )
if ( test -n "`egrep '#ifdef __i386__ || __sun4c__' ${file}`"
......@@ -2019,7 +2106,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 67: Sun_Catmacro
# Fix 68: Sun_Catmacro
#
case "${file}" in ./pixrect/memvar.h )
if ( test -n "`egrep '^#define[ ]+CAT\\(a,b\\)' ${file}`"
......@@ -2047,7 +2134,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 68: Sun_Malloc
# Fix 69: Sun_Malloc
#
case "${file}" in ./malloc.h )
fixlist="${fixlist}
......@@ -2068,7 +2155,7 @@ typedef __regmatch_t regmatch_t;
#
# Fix 69: Sun_Memcpy
# Fix 70: Sun_Memcpy
#
case "${file}" in ./memory.h )
if ( test -n "`egrep '/\\* @\\(#\\)(head/memory.h 50.1 |memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2 )\\*/' ${file}`"
......@@ -2110,7 +2197,7 @@ extern int memcmp();\
#
# Fix 70: Sun_Rusers_Semi
# Fix 71: Sun_Rusers_Semi
#
case "${file}" in ./rpcsvc/rusers.h )
if ( test -n "`egrep '_cnt$' ${file}`"
......@@ -2131,7 +2218,7 @@ extern int memcmp();\
#
# Fix 71: Sun_Signal
# Fix 72: Sun_Signal
#
case "${file}" in ./sys/signal.h | \
./signal.h )
......@@ -2160,7 +2247,7 @@ void (*signal(...))(...);\
#
# Fix 72: Sun_Auth_Proto
# Fix 73: Sun_Auth_Proto
#
case "${file}" in ./rpc/auth.h | \
./rpc/clnt.h | \
......@@ -2189,7 +2276,7 @@ void (*signal(...))(...);\
#
# Fix 73: Sunos_Matherr_Decl
# Fix 74: Sunos_Matherr_Decl
#
case "${file}" in ./math.h )
fixlist="${fixlist}
......@@ -2210,7 +2297,7 @@ struct exception;
#
# Fix 74: Sunos_Strlen
# Fix 75: Sunos_Strlen
#
case "${file}" in ./strings.h )
fixlist="${fixlist}
......@@ -2228,7 +2315,7 @@ struct exception;
#
# Fix 75: Systypes
# Fix 76: Systypes
#
case "${file}" in ./sys/types.h | \
./stdlib.h | \
......@@ -2282,7 +2369,7 @@ typedef __SIZE_TYPE__ size_t;\
#
# Fix 76: Systypes_For_Aix
# Fix 77: Systypes_For_Aix
#
case "${file}" in ./sys/types.h )
if ( test -n "`egrep 'typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t' ${file}`" -a \
......@@ -2310,7 +2397,7 @@ typedef __SIZE_TYPE__ size_t;\
#
# Fix 77: Sysv68_String
# Fix 78: Sysv68_String
#
case "${file}" in ./string.h )
fixlist="${fixlist}
......@@ -2338,7 +2425,7 @@ extern unsigned int\
#
# Fix 78: Sysz_Stdlib_For_Sun
# Fix 79: Sysz_Stdlib_For_Sun
#
case "${file}" in ./stdlib.h )
fixlist="${fixlist}
......@@ -2368,7 +2455,7 @@ extern unsigned int\
#
# Fix 79: Sysz_Stdtypes_For_Sun
# Fix 80: Sysz_Stdtypes_For_Sun
#
case "${file}" in ./sys/stdtypes.h )
fixlist="${fixlist}
......@@ -2406,7 +2493,7 @@ extern unsigned int\
#
# Fix 80: Tinfo_Cplusplus
# Fix 81: Tinfo_Cplusplus
#
case "${file}" in ./tinfo.h )
fixlist="${fixlist}
......@@ -2424,7 +2511,7 @@ extern unsigned int\
#
# Fix 81: Ultrix_Ansi_Compat
# Fix 82: Ultrix_Ansi_Compat
#
case "${file}" in ./ansi_compat.h )
if ( test -n "`egrep 'ULTRIX' ${file}`"
......@@ -2448,7 +2535,7 @@ extern unsigned int\
#
# Fix 82: Ultrix_Fix_Fixproto
# Fix 83: Ultrix_Fix_Fixproto
#
case "${file}" in ./sys/utsname.h )
if ( test -n "`egrep 'ULTRIX' ${file}`"
......@@ -2471,7 +2558,7 @@ struct utsname;
#
# Fix 83: Ultrix_Atof_Param
# Fix 84: Ultrix_Atof_Param
#
case "${file}" in ./math.h )
fixlist="${fixlist}
......@@ -2493,7 +2580,7 @@ struct utsname;
#
# Fix 84: Ultrix_Const
# Fix 85: Ultrix_Const
#
case "${file}" in ./stdio.h )
fixlist="${fixlist}
......@@ -2519,7 +2606,7 @@ struct utsname;
#
# Fix 85: Ultrix_Ifdef
# Fix 86: Ultrix_Ifdef
#
case "${file}" in ./sys/file.h )
if ( test -n "`egrep '#ifdef KERNEL' ${file}`"
......@@ -2540,7 +2627,7 @@ struct utsname;
#
# Fix 86: Ultrix_Nested_Cmnt
# Fix 87: Ultrix_Nested_Cmnt
#
case "${file}" in ./rpc/svc.h )
fixlist="${fixlist}
......@@ -2558,7 +2645,7 @@ struct utsname;
#
# Fix 87: Ultrix_Static
# Fix 88: Ultrix_Static
#
case "${file}" in ./machine/cpu.h )
if ( test -n "`egrep '#include \"r[34]_cpu' ${file}`"
......@@ -2581,7 +2668,7 @@ struct utsname;
#
# Fix 88: Undefine_Null
# Fix 89: Undefine_Null
#
if ( test -n "`egrep '^#[ ]*define[ ]*[ ]NULL[ ]' ${file}`" -a \
-z "`egrep '#[ ]*(ifn|un)def[ ]*[ ]NULL($|[ ])' ${file}`"
......@@ -2602,7 +2689,7 @@ struct utsname;
#
# Fix 89: Va_I960_Macro
# Fix 90: Va_I960_Macro
#
case "${file}" in ./arch/i960/archI960.h )
if ( test -n "`egrep '__(vsiz|vali|vpad|alignof__)' ${file}`"
......@@ -2626,7 +2713,7 @@ struct utsname;
#
# Fix 90: Void_Null
# Fix 91: Void_Null
#
case "${file}" in ./curses.h | \
./dbm.h | \
......@@ -2657,7 +2744,7 @@ struct utsname;
#
# Fix 91: Vxworks_Gcc_Problem
# Fix 92: Vxworks_Gcc_Problem
#
case "${file}" in ./types/vxTypesBase.h )
if ( test -n "`egrep '__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__' ${file}`"
......@@ -2699,7 +2786,7 @@ struct utsname;
#
# Fix 92: Vxworks_Needs_Vxtypes
# Fix 93: Vxworks_Needs_Vxtypes
#
case "${file}" in ./time.h )
if ( test -n "`egrep 'uint_t[ ][ ]*_clocks_per_sec' ${file}`"
......@@ -2720,7 +2807,7 @@ struct utsname;
#
# Fix 93: Vxworks_Needs_Vxworks
# Fix 94: Vxworks_Needs_Vxworks
#
case "${file}" in ./sys/stat.h )
if ( test -n "`egrep '#[ ]define[ ][ ]*__INCstath' ${file}`" -a \
......@@ -2746,7 +2833,7 @@ struct utsname;
#
# Fix 94: Vxworks_Time
# Fix 95: Vxworks_Time
#
case "${file}" in ./time.h )
if ( test -n "`egrep 'VOIDFUNCPTR' ${file}`" -a \
......@@ -2778,7 +2865,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
#
# Fix 95: X11_Class
# Fix 96: X11_Class
#
case "${file}" in ./X11/ShellP.h )
if ( test -z "`egrep '__cplusplus' ${file}`"
......@@ -2806,7 +2893,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
#
# Fix 96: X11_Class_Usage
# Fix 97: X11_Class_Usage
#
case "${file}" in ./Xm/BaseClassI.h )
if ( test -z "`egrep '__cplusplus' ${file}`"
......@@ -2827,7 +2914,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
#
# Fix 97: X11_New
# Fix 98: X11_New
#
case "${file}" in ./Xm/Traversal.h )
if ( test -z "`egrep '__cplusplus' ${file}`"
......@@ -2856,7 +2943,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
#
# Fix 98: X11_Sprintf
# Fix 99: X11_Sprintf
#
case "${file}" in ./X11*/Xmu.h )
fixlist="${fixlist}
......@@ -2876,7 +2963,7 @@ extern char * sprintf();\
#
# Fix 99: Zzz_Ki_Iface
# Fix 100: Zzz_Ki_Iface
#
case "${file}" in ./sys/ki_iface.h )
if ( test -n "`egrep 'These definitions are for HP Internal developers' ${file}`"
......@@ -2903,7 +2990,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
#
# Fix 100: Zzz_Ki
# Fix 101: Zzz_Ki
#
case "${file}" in ./sys/ki.h )
if ( test -n "`egrep '11.00 HP-UX LP64' ${file}`"
......@@ -2930,7 +3017,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
#
# Fix 101: Zzz_Ki_Calls
# Fix 102: Zzz_Ki_Calls
#
case "${file}" in ./sys/ki_calls.h )
if ( test -n "`egrep 'kthread_create_caller_t' ${file}`"
......@@ -2957,7 +3044,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
#
# Fix 102: Zzz_Ki_Defs
# Fix 103: Zzz_Ki_Defs
#
case "${file}" in ./sys/ki_defs.h )
if ( test -n "`egrep 'Kernel Instrumentation Definitions' ${file}`"
......@@ -2984,7 +3071,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
#
# Fix 103: Zzz_Bad_Fixes
# Fix 104: Zzz_Bad_Fixes
#
case "${file}" in ./sundev/ipi_error.h )
fixlist="${fixlist}
......@@ -3008,7 +3095,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
#
# Fix 104: Zzz_Time
# Fix 105: Zzz_Time
#
case "${file}" in ./sys/time.h )
if ( test -n "`egrep '11.0 and later representation of ki time' ${file}`"
......
gcc/fixincludes
......@@ -338,6 +338,7 @@ while [ $# != 0 ]; do
/#[ ]*define[ ]*[ ]CTRL/ s/'\''\([cgx]\)'\''/\1/g
/#[ ]*define[ ]*[ ]_CTRL/ s/'\''\([cgx]\)'\''/\1/g
/#[ ]*define.BSD43_CTRL/ s/'\''\([cgx]\)'\''/\1/g
/#[ ]*define[ ]*[ ][_]*ISCTRL/ s/'\''\([cgx]\)'\''/\1/g
/#[ ]*[el]*if/{
s/[a-zA-Z0-9_][a-zA-Z0-9_]*/ & /g
......
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