Skip to content

R
riscv-gcc-1
Commit afc41460 by Bruce Korb
Options

reordered fixes 

From-SVN: r63085
parent 9f3a9a08
Showing with 182 additions and 182 deletions
gcc/fixinc/fixincl.x
......@@ -1660,81 +1660,155 @@ static const char* apzHpux11_Cpp_Pow_InlinePatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Hpux11_Abs fix
* Description of Hpux10_Ctype_Declarations1 fix
*/
tSCC zHpux11_AbsName[] =
"hpux11_abs";
tSCC zHpux10_Ctype_Declarations1Name[] =
"hpux10_ctype_declarations1";
/*
* File name selection pattern
*/
tSCC zHpux11_AbsList[] =
"|stdlib.h|";
tSCC zHpux10_Ctype_Declarations1List[] =
"|ctype.h|";
/*
* Machine/OS name selection pattern
*/
tSCC* apzHpux11_AbsMachs[] = {
"ia64-hp-hpux11*",
(const char*)NULL };
#define apzHpux10_Ctype_Declarations1Machs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
*/
tSCC zHpux11_AbsSelect0[] =
"ifndef _MATH_INCLUDED";
tSCC zHpux10_Ctype_Declarations1Select0[] =
"^#[ \t]*define _toupper\\(__c\\)[ \t]*__toupper\\(__c\\)";
#define HPUX11_ABS_TEST_CT 1
static tTestDesc aHpux11_AbsTests[] = {
{ TT_EGREP, zHpux11_AbsSelect0, (regex_t*)NULL }, };
/*
* content bypass pattern - skip fix if pattern found
*/
tSCC zHpux10_Ctype_Declarations1Bypass0[] =
"^[ \t]*extern[ \t]*int[ \t]*__tolower[ \t]*\\(";
#define HPUX10_CTYPE_DECLARATIONS1_TEST_CT 2
static tTestDesc aHpux10_Ctype_Declarations1Tests[] = {
{ TT_NEGREP, zHpux10_Ctype_Declarations1Bypass0, (regex_t*)NULL },
{ TT_EGREP, zHpux10_Ctype_Declarations1Select0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Hpux11_Abs
* Fix Command Arguments for Hpux10_Ctype_Declarations1
*/
static const char* apzHpux11_AbsPatch[] = {
static const char* apzHpux10_Ctype_Declarations1Patch[] = {
"format",
"if !defined(_MATH_INCLUDED) || defined(__GNUG__)",
"#ifdef _PROTOTYPES\n\
extern int __tolower(int);\n\
extern int __toupper(int);\n\
#else /* NOT _PROTOTYPES */\n\
extern int __tolower();\n\
extern int __toupper();\n\
#endif /* _PROTOTYPES */\n\n\
%0\n",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Hpux_Long_Double fix
* Description of Hpux10_Ctype_Declarations2 fix
*/
tSCC zHpux_Long_DoubleName[] =
"hpux_long_double";
tSCC zHpux10_Ctype_Declarations2Name[] =
"hpux10_ctype_declarations2";
/*
* File name selection pattern
*/
tSCC zHpux_Long_DoubleList[] =
"|stdlib.h|";
tSCC zHpux10_Ctype_Declarations2List[] =
"|ctype.h|";
/*
* Machine/OS name selection pattern
*/
#define apzHpux_Long_DoubleMachs (const char**)NULL
#define apzHpux10_Ctype_Declarations2Machs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
*/
tSCC zHpux_Long_DoubleSelect0[] =
"extern[ \t]long_double[ \t]strtold";
tSCC zHpux10_Ctype_Declarations2Select0[] =
"^# if defined\\(_SB_CTYPE_MACROS\\) && \\!defined\\(__lint\\)";
/*
* content bypass pattern - skip fix if pattern found
*/
tSCC zHpux_Long_DoubleBypass0[] =
"long_double_t";
tSCC zHpux10_Ctype_Declarations2Bypass0[] =
"^[ \t]*extern[ \t]*int[ \t]*_isalnum[ \t]*\\(";
#define HPUX_LONG_DOUBLE_TEST_CT 2
static tTestDesc aHpux_Long_DoubleTests[] = {
{ TT_NEGREP, zHpux_Long_DoubleBypass0, (regex_t*)NULL },
{ TT_EGREP, zHpux_Long_DoubleSelect0, (regex_t*)NULL }, };
#define HPUX10_CTYPE_DECLARATIONS2_TEST_CT 2
static tTestDesc aHpux10_Ctype_Declarations2Tests[] = {
{ TT_NEGREP, zHpux10_Ctype_Declarations2Bypass0, (regex_t*)NULL },
{ TT_EGREP, zHpux10_Ctype_Declarations2Select0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Hpux_Long_Double
* Fix Command Arguments for Hpux10_Ctype_Declarations2
*/
static const char* apzHpux_Long_DoublePatch[] = { "sed",
"-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D",
"-e", "s/long_double/long double/g",
static const char* apzHpux10_Ctype_Declarations2Patch[] = {
"format",
"%0\n\n\
#ifdef _PROTOTYPES\n\
extern int _isalnum(int);\n\
extern int _isalpha(int);\n\
extern int _iscntrl(int);\n\
extern int _isdigit(int);\n\
extern int _isgraph(int);\n\
extern int _islower(int);\n\
extern int _isprint(int);\n\
extern int _ispunct(int);\n\
extern int _isspace(int);\n\
extern int _isupper(int);\n\
extern int _isxdigit(int);\n\
# else /* not _PROTOTYPES */\n\
extern int _isalnum();\n\
extern int _isalpha();\n\
extern int _iscntrl();\n\
extern int _isdigit();\n\
extern int _isgraph();\n\
extern int _islower();\n\
extern int _isprint();\n\
extern int _ispunct();\n\
extern int _isspace();\n\
extern int _isupper();\n\
extern int _isxdigit();\n\
#endif /* _PROTOTYPES */\n",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Hpux11_Abs fix
*/
tSCC zHpux11_AbsName[] =
"hpux11_abs";
/*
* File name selection pattern
*/
tSCC zHpux11_AbsList[] =
"|stdlib.h|";
/*
* Machine/OS name selection pattern
*/
tSCC* apzHpux11_AbsMachs[] = {
"ia64-hp-hpux11*",
(const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zHpux11_AbsSelect0[] =
"ifndef _MATH_INCLUDED";
#define HPUX11_ABS_TEST_CT 1
static tTestDesc aHpux11_AbsTests[] = {
{ TT_EGREP, zHpux11_AbsSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Hpux11_Abs
*/
static const char* apzHpux11_AbsPatch[] = {
"format",
"if !defined(_MATH_INCLUDED) || defined(__GNUG__)",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
......@@ -1854,118 +1928,74 @@ static const char* apzHpux11_Uint32_CPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Hpux10_Ctype_Declarations1 fix
* Description of Hpux11_Vsnprintf fix
*/
tSCC zHpux10_Ctype_Declarations1Name[] =
"hpux10_ctype_declarations1";
tSCC zHpux11_VsnprintfName[] =
"hpux11_vsnprintf";
/*
* File name selection pattern
*/
tSCC zHpux10_Ctype_Declarations1List[] =
"|ctype.h|";
tSCC zHpux11_VsnprintfList[] =
"|stdio.h|";
/*
* Machine/OS name selection pattern
*/
#define apzHpux10_Ctype_Declarations1Machs (const char**)NULL
#define apzHpux11_VsnprintfMachs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
*/
tSCC zHpux10_Ctype_Declarations1Select0[] =
"^#[ \t]*define _toupper\\(__c\\)[ \t]*__toupper\\(__c\\)";
/*
* content bypass pattern - skip fix if pattern found
*/
tSCC zHpux10_Ctype_Declarations1Bypass0[] =
"^[ \t]*extern[ \t]*int[ \t]*__tolower[ \t]*\\(";
tSCC zHpux11_VsnprintfSelect0[] =
"(extern int vsnprintf\\(char \\*, _[hpux]*_size_t, const char \\*,) __va__list\\);";
#define HPUX10_CTYPE_DECLARATIONS1_TEST_CT 2
static tTestDesc aHpux10_Ctype_Declarations1Tests[] = {
{ TT_NEGREP, zHpux10_Ctype_Declarations1Bypass0, (regex_t*)NULL },
{ TT_EGREP, zHpux10_Ctype_Declarations1Select0, (regex_t*)NULL }, };
#define HPUX11_VSNPRINTF_TEST_CT 1
static tTestDesc aHpux11_VsnprintfTests[] = {
{ TT_EGREP, zHpux11_VsnprintfSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Hpux10_Ctype_Declarations1
* Fix Command Arguments for Hpux11_Vsnprintf
*/
static const char* apzHpux10_Ctype_Declarations1Patch[] = {
static const char* apzHpux11_VsnprintfPatch[] = {
"format",
"#ifdef _PROTOTYPES\n\
extern int __tolower(int);\n\
extern int __toupper(int);\n\
#else /* NOT _PROTOTYPES */\n\
extern int __tolower();\n\
extern int __toupper();\n\
#endif /* _PROTOTYPES */\n\n\
%0\n",
"%1 __va_list);",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Hpux10_Ctype_Declarations2 fix
* Description of Hpux8_Bogus_Inlines fix
*/
tSCC zHpux10_Ctype_Declarations2Name[] =
"hpux10_ctype_declarations2";
tSCC zHpux8_Bogus_InlinesName[] =
"hpux8_bogus_inlines";
/*
* File name selection pattern
*/
tSCC zHpux10_Ctype_Declarations2List[] =
"|ctype.h|";
tSCC zHpux8_Bogus_InlinesList[] =
"|math.h|";
/*
* Machine/OS name selection pattern
*/
#define apzHpux10_Ctype_Declarations2Machs (const char**)NULL
#define apzHpux8_Bogus_InlinesMachs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
*/
tSCC zHpux10_Ctype_Declarations2Select0[] =
"^# if defined\\(_SB_CTYPE_MACROS\\) && \\!defined\\(__lint\\)";
/*
* content bypass pattern - skip fix if pattern found
*/
tSCC zHpux10_Ctype_Declarations2Bypass0[] =
"^[ \t]*extern[ \t]*int[ \t]*_isalnum[ \t]*\\(";
tSCC zHpux8_Bogus_InlinesSelect0[] =
"inline";
#define HPUX10_CTYPE_DECLARATIONS2_TEST_CT 2
static tTestDesc aHpux10_Ctype_Declarations2Tests[] = {
{ TT_NEGREP, zHpux10_Ctype_Declarations2Bypass0, (regex_t*)NULL },
{ TT_EGREP, zHpux10_Ctype_Declarations2Select0, (regex_t*)NULL }, };
#define HPUX8_BOGUS_INLINES_TEST_CT 1
static tTestDesc aHpux8_Bogus_InlinesTests[] = {
{ TT_EGREP, zHpux8_Bogus_InlinesSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Hpux10_Ctype_Declarations2
* Fix Command Arguments for Hpux8_Bogus_Inlines
*/
static const char* apzHpux10_Ctype_Declarations2Patch[] = {
"format",
"%0\n\n\
#ifdef _PROTOTYPES\n\
extern int _isalnum(int);\n\
extern int _isalpha(int);\n\
extern int _iscntrl(int);\n\
extern int _isdigit(int);\n\
extern int _isgraph(int);\n\
extern int _islower(int);\n\
extern int _isprint(int);\n\
extern int _ispunct(int);\n\
extern int _isspace(int);\n\
extern int _isupper(int);\n\
extern int _isxdigit(int);\n\
# else /* not _PROTOTYPES */\n\
extern int _isalnum();\n\
extern int _isalpha();\n\
extern int _iscntrl();\n\
extern int _isdigit();\n\
extern int _isgraph();\n\
extern int _islower();\n\
extern int _isprint();\n\
extern int _ispunct();\n\
extern int _isspace();\n\
extern int _isupper();\n\
extern int _isxdigit();\n\
#endif /* _PROTOTYPES */\n",
static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
"-e", "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@",
"-e", "s@inline double abs(double [a-z][a-z]*) {.*}@@",
"-e", "s@inline int sqr(int [a-z][a-z]*) {.*}@@",
"-e", "s@inline double sqr(double [a-z][a-z]*) {.*}@@",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
......@@ -2005,74 +2035,44 @@ static const char* apzHpux_Ctype_MacrosPatch[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Hpux11_Vsnprintf fix
* Description of Hpux_Long_Double fix
*/
tSCC zHpux11_VsnprintfName[] =
"hpux11_vsnprintf";
tSCC zHpux_Long_DoubleName[] =
"hpux_long_double";
/*
* File name selection pattern
*/
tSCC zHpux11_VsnprintfList[] =
"|stdio.h|";
tSCC zHpux_Long_DoubleList[] =
"|stdlib.h|";
/*
* Machine/OS name selection pattern
*/
#define apzHpux11_VsnprintfMachs (const char**)NULL
#define apzHpux_Long_DoubleMachs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
*/
tSCC zHpux11_VsnprintfSelect0[] =
"(extern int vsnprintf\\(char \\*, _[hpux]*_size_t, const char \\*,) __va__list\\);";
#define HPUX11_VSNPRINTF_TEST_CT 1
static tTestDesc aHpux11_VsnprintfTests[] = {
{ TT_EGREP, zHpux11_VsnprintfSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Hpux11_Vsnprintf
*/
static const char* apzHpux11_VsnprintfPatch[] = {
"format",
"%1 __va_list);",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Hpux8_Bogus_Inlines fix
*/
tSCC zHpux8_Bogus_InlinesName[] =
"hpux8_bogus_inlines";
/*
* File name selection pattern
*/
tSCC zHpux8_Bogus_InlinesList[] =
"|math.h|";
/*
* Machine/OS name selection pattern
*/
#define apzHpux8_Bogus_InlinesMachs (const char**)NULL
tSCC zHpux_Long_DoubleSelect0[] =
"extern[ \t]long_double[ \t]strtold";
/*
* content selection pattern - do fix if pattern found
* content bypass pattern - skip fix if pattern found
*/
tSCC zHpux8_Bogus_InlinesSelect0[] =
"inline";
tSCC zHpux_Long_DoubleBypass0[] =
"long_double_t";
#define HPUX8_BOGUS_INLINES_TEST_CT 1
static tTestDesc aHpux8_Bogus_InlinesTests[] = {
{ TT_EGREP, zHpux8_Bogus_InlinesSelect0, (regex_t*)NULL }, };
#define HPUX_LONG_DOUBLE_TEST_CT 2
static tTestDesc aHpux_Long_DoubleTests[] = {
{ TT_NEGREP, zHpux_Long_DoubleBypass0, (regex_t*)NULL },
{ TT_EGREP, zHpux_Long_DoubleSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Hpux8_Bogus_Inlines
* Fix Command Arguments for Hpux_Long_Double
*/
static const char* apzHpux8_Bogus_InlinesPatch[] = { "sed",
"-e", "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@",
"-e", "s@inline double abs(double [a-z][a-z]*) {.*}@@",
"-e", "s@inline int sqr(int [a-z][a-z]*) {.*}@@",
"-e", "s@inline double sqr(double [a-z][a-z]*) {.*}@@",
static const char* apzHpux_Long_DoublePatch[] = { "sed",
"-e", "/^#[ \t]*ifndef _LONG_DOUBLE/,/\\/\\* _LONG_DOUBLE \\*\\//D",
"-e", "s/long_double/long double/g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
......@@ -5692,16 +5692,16 @@ typedef enum {
HP_SYSFILE_FIXIDX,
HPUX10_CPP_POW_INLINE_FIXIDX,
HPUX11_CPP_POW_INLINE_FIXIDX,
HPUX10_CTYPE_DECLARATIONS1_FIXIDX,
HPUX10_CTYPE_DECLARATIONS2_FIXIDX,
HPUX11_ABS_FIXIDX,
HPUX_LONG_DOUBLE_FIXIDX,
HPUX11_FABSF_FIXIDX,
HPUX11_SIZE_T_FIXIDX,
HPUX11_UINT32_C_FIXIDX,
HPUX10_CTYPE_DECLARATIONS1_FIXIDX,
HPUX10_CTYPE_DECLARATIONS2_FIXIDX,
HPUX_CTYPE_MACROS_FIXIDX,
HPUX11_VSNPRINTF_FIXIDX,
HPUX8_BOGUS_INLINES_FIXIDX,
HPUX_CTYPE_MACROS_FIXIDX,
HPUX_LONG_DOUBLE_FIXIDX,
HPUX_MAXINT_FIXIDX,
HPUX_SYSTIME_FIXIDX,
INT_ABORT_FREE_AND_EXIT_FIXIDX,
......@@ -5994,16 +5994,21 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
HPUX11_CPP_POW_INLINE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux11_Cpp_Pow_InlineTests, apzHpux11_Cpp_Pow_InlinePatch, 0 },
{ zHpux10_Ctype_Declarations1Name, zHpux10_Ctype_Declarations1List,
apzHpux10_Ctype_Declarations1Machs,
HPUX10_CTYPE_DECLARATIONS1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux10_Ctype_Declarations1Tests, apzHpux10_Ctype_Declarations1Patch, 0 },
{ zHpux10_Ctype_Declarations2Name, zHpux10_Ctype_Declarations2List,
apzHpux10_Ctype_Declarations2Machs,
HPUX10_CTYPE_DECLARATIONS2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux10_Ctype_Declarations2Tests, apzHpux10_Ctype_Declarations2Patch, 0 },
{ zHpux11_AbsName, zHpux11_AbsList,
apzHpux11_AbsMachs,
HPUX11_ABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux11_AbsTests, apzHpux11_AbsPatch, 0 },
{ zHpux_Long_DoubleName, zHpux_Long_DoubleList,
apzHpux_Long_DoubleMachs,
HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY,
aHpux_Long_DoubleTests, apzHpux_Long_DoublePatch, 0 },
{ zHpux11_FabsfName, zHpux11_FabsfList,
apzHpux11_FabsfMachs,
HPUX11_FABSF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
......@@ -6019,21 +6024,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
HPUX11_UINT32_C_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux11_Uint32_CTests, apzHpux11_Uint32_CPatch, 0 },
{ zHpux10_Ctype_Declarations1Name, zHpux10_Ctype_Declarations1List,
apzHpux10_Ctype_Declarations1Machs,
HPUX10_CTYPE_DECLARATIONS1_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux10_Ctype_Declarations1Tests, apzHpux10_Ctype_Declarations1Patch, 0 },
{ zHpux10_Ctype_Declarations2Name, zHpux10_Ctype_Declarations2List,
apzHpux10_Ctype_Declarations2Machs,
HPUX10_CTYPE_DECLARATIONS2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux10_Ctype_Declarations2Tests, apzHpux10_Ctype_Declarations2Patch, 0 },
{ zHpux_Ctype_MacrosName, zHpux_Ctype_MacrosList,
apzHpux_Ctype_MacrosMachs,
HPUX_CTYPE_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux_Ctype_MacrosTests, apzHpux_Ctype_MacrosPatch, 0 },
{ zHpux11_VsnprintfName, zHpux11_VsnprintfList,
apzHpux11_VsnprintfMachs,
HPUX11_VSNPRINTF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
......@@ -6044,6 +6034,16 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
HPUX8_BOGUS_INLINES_TEST_CT, FD_MACH_ONLY,
aHpux8_Bogus_InlinesTests, apzHpux8_Bogus_InlinesPatch, 0 },
{ zHpux_Ctype_MacrosName, zHpux_Ctype_MacrosList,
apzHpux_Ctype_MacrosMachs,
HPUX_CTYPE_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux_Ctype_MacrosTests, apzHpux_Ctype_MacrosPatch, 0 },
{ zHpux_Long_DoubleName, zHpux_Long_DoubleList,
apzHpux_Long_DoubleMachs,
HPUX_LONG_DOUBLE_TEST_CT, FD_MACH_ONLY,
aHpux_Long_DoubleTests, apzHpux_Long_DoublePatch, 0 },
{ zHpux_MaxintName, zHpux_MaxintList,
apzHpux_MaxintMachs,
HPUX_MAXINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
......
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