mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-11 23:55:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

force merge conflicts in fixincl.x + placement fix

Browse Source 
From-SVN: r66439
This commit is contained in:
Bruce Korb 2003-05-03 22:48:59 +00:00 committed by Bruce Korb
parent bd879e9a00
commit 8882ac3a64
4 changed files with 96 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2003-05-03 Bruce Korb <bkorb@gnu.org>
* gcc/fixinc/fixincl.tpl(dne): restore this to force merge conflicts
in fixincl.x
* gcc/fixinc/inclhack.def(bsd_stdio_attrs_conflict): fix placement
2003-05-03 Aldy Hernandez <aldyh@redhat.com>
* config/rs6000/spe.h: Remove unecessary casts. Misc cleanups.

14
gcc/fixinc/fixincl.tpl
View File

@ -1,11 +1,15 @@
[= AutoGen5 Template -*- Mode: C -*-
x=fixincl.x =]
/*
* DO NOT EDIT THIS FILE - it has been generated
[= (dne " * " "/* ")=]
*/
/* DO NOT CVS-MERGE THIS FILE, EITHER [=`date`=]
*
* Install modified versions of 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.
* You must regenerate it. Use the ./genfixes script.
*
*
* This is part of the fixincl program used to install modified versions of
* 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 [=(count "fix")=] fixup descriptions.
*

112
gcc/fixinc/fixincl.x
View File

@ -1,9 +1,19 @@
/*
* DO NOT EDIT THIS FILE - it has been generated
/* -*- buffer-read-only: t -*- vi: set ro:
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
* It has been AutoGen-ed Saturday May 3, 2003 at 03:55:13 PM PDT
* From the definitions inclhack.def
* and the template file fixincl
*/
/* DO NOT CVS-MERGE THIS FILE, EITHER Sat May 3 15:55:13 PDT 2003
*
* Install modified versions of 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.
* You must regenerate it. Use the ./genfixes script.
*
*
* This is part of the fixincl program used to install modified versions of
* 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 152 fixup descriptions.
*
@ -1113,46 +1123,6 @@ static const char* apzBadquotePatch[] = {
"does not",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Bsd_Stdio_Attrs_Conflict fix
*/
tSCC zBsd_Stdio_Attrs_ConflictName[] =
"bsd_stdio_attrs_conflict";
/*
* File name selection pattern
*/
tSCC zBsd_Stdio_Attrs_ConflictList[] =
"|stdio.h|";
/*
* Machine/OS name selection pattern
*/
tSCC* apzBsd_Stdio_Attrs_ConflictMachs[] = {
"*-*-*bsd*",
"*-*-*darwin*",
(const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zBsd_Stdio_Attrs_ConflictSelect0[] =
"^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$";
#define BSD_STDIO_ATTRS_CONFLICT_TEST_CT 1
static tTestDesc aBsd_Stdio_Attrs_ConflictTests[] = {
{ TT_EGREP, zBsd_Stdio_Attrs_ConflictSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Bsd_Stdio_Attrs_Conflict
*/
static const char* apzBsd_Stdio_Attrs_ConflictPatch[] = {
"format",
"#define _BSD_STRING(_BSD_X) _BSD_STRINGX(_BSD_X)\n\
#define _BSD_STRINGX(_BSD_X) #_BSD_X\n\
int vfscanf(FILE *, const char *, __builtin_va_list) __asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) \"__svfscanf\");",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Broken_Assert_Stdio fix
@ -1275,6 +1245,46 @@ static const char* apzBroken_CabsPatch[] = {
"^extern[ \t]+double[ \t]+cabs\\((struct dbl_hypot|)\\);",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Bsd_Stdio_Attrs_Conflict fix
*/
tSCC zBsd_Stdio_Attrs_ConflictName[] =
"bsd_stdio_attrs_conflict";
/*
* File name selection pattern
*/
tSCC zBsd_Stdio_Attrs_ConflictList[] =
"|stdio.h|";
/*
* Machine/OS name selection pattern
*/
tSCC* apzBsd_Stdio_Attrs_ConflictMachs[] = {
"*-*-*bsd*",
"*-*-*darwin*",
(const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zBsd_Stdio_Attrs_ConflictSelect0[] =
"^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$";
#define BSD_STDIO_ATTRS_CONFLICT_TEST_CT 1
static tTestDesc aBsd_Stdio_Attrs_ConflictTests[] = {
{ TT_EGREP, zBsd_Stdio_Attrs_ConflictSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Bsd_Stdio_Attrs_Conflict
*/
static const char* apzBsd_Stdio_Attrs_ConflictPatch[] = {
"format",
"#define _BSD_STRING(_BSD_X) _BSD_STRINGX(_BSD_X)\n\
#define _BSD_STRINGX(_BSD_X) #_BSD_X\n\
int vfscanf(FILE *, const char *, __builtin_va_list) __asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) \"__svfscanf\");",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Ctrl_Quotes_Def fix
@ -6027,10 +6037,10 @@ typedef enum {
BAD_LVAL_FIXIDX,
BAD_STRUCT_TERM_FIXIDX,
BADQUOTE_FIXIDX,
BSD_STDIO_ATTRS_CONFLICT_FIXIDX,
BROKEN_ASSERT_STDIO_FIXIDX,
BROKEN_ASSERT_STDLIB_FIXIDX,
BROKEN_CABS_FIXIDX,
BSD_STDIO_ATTRS_CONFLICT_FIXIDX,
CTRL_QUOTES_DEF_FIXIDX,
CTRL_QUOTES_USE_FIXIDX,
CXX_UNREADY_FIXIDX,
@ -6282,11 +6292,6 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
BADQUOTE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aBadquoteTests, apzBadquotePatch, 0 },
{ zBsd_Stdio_Attrs_ConflictName, zBsd_Stdio_Attrs_ConflictList,
apzBsd_Stdio_Attrs_ConflictMachs,
BSD_STDIO_ATTRS_CONFLICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aBsd_Stdio_Attrs_ConflictTests, apzBsd_Stdio_Attrs_ConflictPatch, 0 },
{ zBroken_Assert_StdioName, zBroken_Assert_StdioList,
apzBroken_Assert_StdioMachs,
BROKEN_ASSERT_STDIO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@ -6302,6 +6307,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
BROKEN_CABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aBroken_CabsTests, apzBroken_CabsPatch, 0 },
{ zBsd_Stdio_Attrs_ConflictName, zBsd_Stdio_Attrs_ConflictList,
apzBsd_Stdio_Attrs_ConflictMachs,
BSD_STDIO_ATTRS_CONFLICT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aBsd_Stdio_Attrs_ConflictTests, apzBsd_Stdio_Attrs_ConflictPatch, 0 },
{ zCtrl_Quotes_DefName, zCtrl_Quotes_DefList,
apzCtrl_Quotes_DefMachs,
CTRL_QUOTES_DEF_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,

40
gcc/fixinc/inclhack.def
View File

@ -720,26 +720,6 @@ fix = {
};
/*
* Various systems derived from BSD4.4 contain a macro definition
* for vfscanf that interacts badly with requirements of builtin-attrs.def.
* Known to be fixed in FreeBSD 5 system headers.
*/
fix = {
hackname = bsd_stdio_attrs_conflict;
mach = *-*-*bsd*;
mach = *-*-*darwin*;
files = stdio.h;
select = "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$";
c_fix = format;
c_fix_arg = '#define _BSD_STRING(_BSD_X) _BSD_STRINGX(_BSD_X)' "\n"
'#define _BSD_STRINGX(_BSD_X) #_BSD_X' "\n"
'int vfscanf(FILE *, const char *, __builtin_va_list) '
'__asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) "__svfscanf");';
test_text = '#define vfscanf __svfscanf';
};
/*
* check for broken assert.h that needs stdio.h
*/
@ -795,6 +775,26 @@ fix = {
};
/*
* Various systems derived from BSD4.4 contain a macro definition
* for vfscanf that interacts badly with requirements of builtin-attrs.def.
* Known to be fixed in FreeBSD 5 system headers.
*/
fix = {
hackname = bsd_stdio_attrs_conflict;
mach = *-*-*bsd*;
mach = *-*-*darwin*;
files = stdio.h;
select = "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$";
c_fix = format;
c_fix_arg = '#define _BSD_STRING(_BSD_X) _BSD_STRINGX(_BSD_X)' "\n"
'#define _BSD_STRINGX(_BSD_X) #_BSD_X' "\n"
'int vfscanf(FILE *, const char *, __builtin_va_list) '
'__asm__ (_BSD_STRING(__USER_LABEL_PREFIX__) "__svfscanf");';
test_text = '#define vfscanf __svfscanf';
};
/*
* Fix various macros used to define ioctl numbers.
* The traditional syntax was: