git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

inclhack.def (aix_unistd): New. 

* inclhack.def (aix_unistd): New.
* fixincl.x: Regenerate.
* tests/base/unistd.h [AIX_UNISTD_CHECK]: New test.

From-SVN: r262936
This commit is contained in:
David Edelsohn 2018-07-23 20:51:50 +00:00 committed by David Edelsohn
parent 2d6c8eea1d
commit 5b3d96f24f
4 changed files with 73 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fixincludes/ChangeLog
View File

@ -1,3 +1,9 @@
2018-07-23 David Edelsohn <dje.gcc@gmail.com>
* inclhack.def (aix_unistd): New.
* fixincl.x: Regenerate.
* tests/base/unistd.h [AIX_UNISTD_CHECK]: New test.
2018-06-27 Rasmus Villemoes <rv@rasmusvillemoes.dk> 2018-06-27 Rasmus Villemoes <rv@rasmusvillemoes.dk>
* tests/base/ioLib.h [VXWORKS_IOLIB_INCLUDE_UNISTD_CHECK]: Add * tests/base/ioLib.h [VXWORKS_IOLIB_INCLUDE_UNISTD_CHECK]: Add

53
fixincludes/fixincl.x
View File

@ -2,11 +2,11 @@
* *
* DO NOT EDIT THIS FILE (fixincl.x) * DO NOT EDIT THIS FILE (fixincl.x)
* *
* It has been AutoGen-ed June 12, 2018 at 08:56:43 AM by AutoGen 5.18.12 * It has been AutoGen-ed July 23, 2018 at 07:27:34 PM by AutoGen 5.18
* From the definitions inclhack.def * From the definitions inclhack.def
* and the template file fixincl * and the template file fixincl
*/ */
/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Jun 12 08:56:43 MDT 2018 /* DO NOT SVN-MERGE THIS FILE, EITHER Mon Jul 23 19:27:34 UTC 2018
* *
* You must regenerate it. Use the ./genfixes script. * You must regenerate it. Use the ./genfixes script.
* *
@ -15,7 +15,7 @@
* certain ANSI-incompatible system header files which are fixed to work * 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. * correctly with ANSI C and placed in a directory that GNU C will search.
* *
* This file contains 250 fixup descriptions. * This file contains 251 fixup descriptions.
* *
* See README for more information. * See README for more information.
* *
@ -1806,6 +1806,43 @@ static const char* apzAix_VolatilePatch[] = {
"typedef int sig_atomic_t", "typedef int sig_atomic_t",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Aix_Unistd fix
*/
tSCC zAix_UnistdName[] =
"aix_unistd";
/*
* File name selection pattern
*/
tSCC zAix_UnistdList[] =
"unistd.h\0";
/*
* Machine/OS name selection pattern
*/
tSCC* apzAix_UnistdMachs[] = {
"*-*-aix*",
(const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zAix_UnistdSelect0[] =
"[ \t]+static[ \t]+int[ \t]+getdtablesize\\(\\)";
#define AIX_UNISTD_TEST_CT 1
static tTestDesc aAix_UnistdTests[] = {
{ TT_EGREP, zAix_UnistdSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Aix_Unistd
*/
static const char* apzAix_UnistdPatch[] = {
"format",
"\tstatic int\t\tgetdtablesize(void)",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Description of Alpha___Assert fix * Description of Alpha___Assert fix
@ -10141,9 +10178,9 @@ static const char* apzX11_SprintfPatch[] = {
* *
* List of all fixes * List of all fixes
*/ */
#define REGEX_COUNT 288 #define REGEX_COUNT 289
#define MACH_LIST_SIZE_LIMIT 187 #define MACH_LIST_SIZE_LIMIT 187
#define FIX_COUNT 250 #define FIX_COUNT 251
/* /*
* Enumerate the fixes * Enumerate the fixes
@ -10190,6 +10227,7 @@ typedef enum {
AIX_SYSMACHINE_FIXIDX, AIX_SYSMACHINE_FIXIDX,
AIX_SYSWAIT_2_FIXIDX, AIX_SYSWAIT_2_FIXIDX,
AIX_VOLATILE_FIXIDX, AIX_VOLATILE_FIXIDX,
AIX_UNISTD_FIXIDX,
ALPHA___ASSERT_FIXIDX, ALPHA___ASSERT_FIXIDX,
ALPHA_ASSERT_FIXIDX, ALPHA_ASSERT_FIXIDX,
ALPHA_GETOPT_FIXIDX, ALPHA_GETOPT_FIXIDX,
@ -10607,6 +10645,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
AIX_VOLATILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, AIX_VOLATILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAix_VolatileTests, apzAix_VolatilePatch, 0 }, aAix_VolatileTests, apzAix_VolatilePatch, 0 },
{ zAix_UnistdName, zAix_UnistdList,
apzAix_UnistdMachs,
AIX_UNISTD_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aAix_UnistdTests, apzAix_UnistdPatch, 0 },
{ zAlpha___AssertName, zAlpha___AssertList, { zAlpha___AssertName, zAlpha___AssertList,
apzAlpha___AssertMachs, apzAlpha___AssertMachs,
ALPHA___ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, ALPHA___ASSERT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,

14
fixincludes/inclhack.def
View File

@ -923,6 +923,20 @@ fix = {
test_text = "typedef volatile int sig_atomic_t;"; test_text = "typedef volatile int sig_atomic_t;";
}; };
/*
* AIX unistd.h defines a static function with an empty parameter list.
*/
fix = {
hackname = aix_unistd;
mach = "*-*-aix*";
files = unistd.h;
select = "[ \t]+static[ \t]+int[ \t]+getdtablesize\\(\\)";
c_fix = format;
c_fix_arg = "\tstatic int\t\tgetdtablesize(void)";
test_text = " static int getdtablesize()";
};
/* /*
* Fix __assert declaration in assert.h on Alpha OSF/1. * Fix __assert declaration in assert.h on Alpha OSF/1.
*/ */

5
fixincludes/tests/base/unistd.h
View File

@ -9,6 +9,11 @@
#if defined( AIX_UNISTD_CHECK )
static int getdtablesize(void)
#endif /* AIX_UNISTD_CHECK */
#if defined( ALPHA_SBRK_CHECK ) #if defined( ALPHA_SBRK_CHECK )
extern void *sbrk(ptrdiff_t increment); extern void *sbrk(ptrdiff_t increment);
#endif /* ALPHA_SBRK_CHECK */ #endif /* ALPHA_SBRK_CHECK */