diff options
Diffstat (limited to 'gcc/fixinc/fixincl.x')
| -rw-r--r-- | gcc/fixinc/fixincl.x | 71 |
1 files changed, 59 insertions, 12 deletions
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index b8a2342d430..658e5a1af88 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Thursday August 12, 2004 at 05:42:28 PM MDT + * It has been AutoGen-ed Friday May 6, 2005 at 09:27:07 AM PDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT CVS-MERGE THIS FILE, EITHER Thu Aug 12 17:42:28 MDT 2004 +/* DO NOT CVS-MERGE THIS FILE, EITHER Fri May 6 09:27:07 PDT 2005 * * You must regenerate it. Use the ./genfixes script. * @@ -15,7 +15,7 @@ * certain ANSI-incompatible system header files which are fixed to work * correctly with ANSI C and placed in a directory that GNU C will search. * - * This file contains 177 fixup descriptions. + * This file contains 178 fixup descriptions. * * See README for more information. * @@ -124,13 +124,13 @@ static const char* apzAab_Fd_Zero_Gnu_Types_HPatch[] = { #include_next <gnu/types.h>\n\n\ #if defined(__FD_ZERO) && !defined(__GLIBC__)\n\ #undef __FD_ZERO\n\ -# define __FD_ZERO(fdsetp) \\\\\n\ - do { \\\\\n\ - int __d0, __d1; \\\\\n\ -__asm__ __volatile__(\"cld ; rep ; stosl\" \\\\\n\ - \t: \"=&c\" (__d0), \"=&D\" (__d1) \\\\\n\ - \t: \"a\" (0), \"0\" (__FDSET_LONGS), \\\\\n\ - \"1\" ((__fd_set *) (fdsetp)) :\"memory\"); \\\\\n\ +# define __FD_ZERO(fdsetp) \\\n\ + do { \\\n\ + int __d0, __d1; \\\n\ + __asm__ __volatile__(\"cld ; rep ; stosl\" \\\n\ + : \"=&c\" (__d0), \"=&D\" (__d1) \\\n\ + : \"a\" (0), \"0\" (__FDSET_LONGS), \\\n\ + \"1\" ((__fd_set *) (fdsetp)) :\"memory\"); \\\n\ } while (0)\n\ #endif\n\n\ #define _TYPES_H_WRAPPER\n\ @@ -1085,6 +1085,47 @@ static const char* apzAlpha_Pthread_GccPatch[] = { /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Alpha_Pthread_Init fix + */ +tSCC zAlpha_Pthread_InitName[] = + "alpha_pthread_init"; + +/* + * File name selection pattern + */ +tSCC zAlpha_Pthread_InitList[] = + "|pthread.h|"; +/* + * Machine/OS name selection pattern + */ +tSCC* apzAlpha_Pthread_InitMachs[] = { + "alpha*-dec-osf*", + (const char*)NULL }; + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zAlpha_Pthread_InitSelect0[] = + " \\* @\\(#\\).RCSfile: pthread\\.h,v \\$ .Revision: 1\\.1\\.33\\.21 \\$ \\(DEC\\) .Date: 2000/08/15 15:30:13 \\$"; + +#define ALPHA_PTHREAD_INIT_TEST_CT 1 +static tTestDesc aAlpha_Pthread_InitTests[] = { + { TT_EGREP, zAlpha_Pthread_InitSelect0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Alpha_Pthread_Init + */ +static const char* apzAlpha_Pthread_InitPatch[] = { "sed", + "-e", "s@MVALID\\(.*\\)A}@MVALID\\1A, 0, 0, 0, 0, 0, 0 }@\n\ +s@MVALID\\(.*\\)_}@MVALID\\1_, 0, 0, 0, 0 }@\n\ +s@CVALID\\(.*\\)A}@CVALID\\1A, 0, 0, 0, 0 }@\n\ +s@CVALID\\(.*\\)_}@CVALID\\1_, 0, 0 }@\n\ +s@WVALID\\(.*\\)A}@WVALID\\1A, 0, 0, 0, 0, 0, 0, 0, 0, 0 }@\n\ +s@WVALID\\(.*\\)_}@WVALID\\1_, 0, 0, 0, 0, 0, 0, 0 }@\n", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Alpha_Sbrk fix */ tSCC zAlpha_SbrkName[] = @@ -7018,9 +7059,9 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 199 +#define REGEX_COUNT 200 #define MACH_LIST_SIZE_LIMIT 261 -#define FIX_COUNT 177 +#define FIX_COUNT 178 /* * Enumerate the fixes @@ -7050,6 +7091,7 @@ typedef enum { ALPHA_PARENS_FIXIDX, ALPHA_PTHREAD_FIXIDX, ALPHA_PTHREAD_GCC_FIXIDX, + ALPHA_PTHREAD_INIT_FIXIDX, ALPHA_SBRK_FIXIDX, ALPHA_WCHAR_FIXIDX, AVOID_BOOL_DEFINE_FIXIDX, @@ -7326,6 +7368,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { ALPHA_PTHREAD_GCC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aAlpha_Pthread_GccTests, apzAlpha_Pthread_GccPatch, 0 }, + { zAlpha_Pthread_InitName, zAlpha_Pthread_InitList, + apzAlpha_Pthread_InitMachs, + ALPHA_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY, + aAlpha_Pthread_InitTests, apzAlpha_Pthread_InitPatch, 0 }, + { zAlpha_SbrkName, zAlpha_SbrkList, apzAlpha_SbrkMachs, ALPHA_SBRK_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, |