OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

inclhack.def (glibc_stdint): New fix. 

* inclhack.def (glibc_stdint): New fix.
	* fixincl.x: Regenerate.
	* tests/base/stdint.h: Update.

From-SVN: r146883
This commit is contained in:
Joseph Myers 2009-04-28 11:21:24 +01:00 committed by Joseph Myers
parent f2c45f0866
commit e255690469
4 changed files with 76 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 @@
2009-04-28 Joseph Myers <joseph@codesourcery.com>
* inclhack.def (glibc_stdint): New fix.
* fixincl.x: Regenerate.
* tests/base/stdint.h: Update.
2009-04-09 Jakub Jelinek <jakub@redhat.com>
* Makefile.in: Change copyright header to refer to version

54
fixincludes/fixincl.x
View File

@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
* It has been AutoGen-ed Tuesday March 31, 2009 at 05:01:22 PM UTC
* It has been AutoGen-ed Tuesday April 28, 2009 at 10:20:23 AM UTC
* From the definitions inclhack.def
* and the template file fixincl
*/
/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Mar 31 17:01:22 UTC 2009
/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Apr 28 10:20:23 UTC 2009
*
* 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 180 fixup descriptions.
* This file contains 181 fixup descriptions.
*
* See README for more information.
*
@ -2217,6 +2217,44 @@ s/{ { 0, } }/{ { 0, 0, 0, 0, 0, 0 } }/\n\
"-e", "/define[ \t]\\+PTHREAD_COND_INITIALIZER/s/{ { 0, } }/{ { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }/",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Glibc_Stdint fix
*/
tSCC zGlibc_StdintName[] =
"glibc_stdint";
/*
* File name selection pattern
*/
tSCC zGlibc_StdintList[] =
"stdint.h\0";
/*
* Machine/OS name selection pattern
*/
#define apzGlibc_StdintMachs (const char**)NULL
/*
* content selection pattern - do fix if pattern found
*/
tSCC zGlibc_StdintSelect0[] =
"GNU C Library";
#define GLIBC_STDINT_TEST_CT 1
static tTestDesc aGlibc_StdintTests[] = {
{ TT_EGREP, zGlibc_StdintSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Glibc_Stdint
*/
static const char* apzGlibc_StdintPatch[] = {
"format",
"# define UINT8_C(c)\tc\n\
# define UINT16_C(c)\tc",
"# define UINT8_C\\(c\\)\tc ## U\n\
# define UINT16_C\\(c\\)\tc ## U",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Glibc_Tgmath fix
@ -7325,9 +7363,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
#define REGEX_COUNT 225
#define REGEX_COUNT 226
#define MACH_LIST_SIZE_LIMIT 181
#define FIX_COUNT 180
#define FIX_COUNT 181
/*
* Enumerate the fixes
@ -7386,6 +7424,7 @@ typedef enum {
GLIBC_C99_INLINE_3_FIXIDX,
GLIBC_C99_INLINE_4_FIXIDX,
GLIBC_MUTEX_INIT_FIXIDX,
GLIBC_STDINT_FIXIDX,
GLIBC_TGMATH_FIXIDX,
GNU_TYPES_FIXIDX,
HP_INLINE_FIXIDX,
@ -7781,6 +7820,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
GLIBC_MUTEX_INIT_TEST_CT, FD_MACH_ONLY,
aGlibc_Mutex_InitTests, apzGlibc_Mutex_InitPatch, 0 },
{ zGlibc_StdintName, zGlibc_StdintList,
apzGlibc_StdintMachs,
GLIBC_STDINT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aGlibc_StdintTests, apzGlibc_StdintPatch, 0 },
{ zGlibc_TgmathName, zGlibc_TgmathList,
apzGlibc_TgmathMachs,
GLIBC_TGMATH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,

14
fixincludes/inclhack.def
View File

@ -1265,6 +1265,20 @@ fix = {
};
/* glibc versions before 2.5 have a version of stdint.h that defines
UINT8_C and UINT16_C to produce unsigned constants, as do uClibc
versions with stdint.h based on those glibc versions. */
fix = {
hackname = glibc_stdint;
files = stdint.h;
select = "GNU C Library";
c_fix = format;
c_fix_arg = "# define UINT8_C(c)\tc\n# define UINT16_C(c)\tc";
c_fix_arg = "# define UINT8_C\\(c\\)\tc ## U\n# define UINT16_C\\(c\\)\tc ## U";
test_text = "/* This file is part of the GNU C Library. */\n# define UINT8_C(c)\tc ## U\n# define UINT16_C(c)\tc ## U";
};
/* glibc's tgmath.h relies on an expression that is not an integer
constant expression being treated as it was by GCC 4.4 and
earlier. */

7
fixincludes/tests/base/stdint.h
View File

@ -9,6 +9,13 @@
#if defined( GLIBC_STDINT_CHECK )
/* This file is part of the GNU C Library. */
# define UINT8_C(c) c
# define UINT16_C(c) c
#endif /* GLIBC_STDINT_CHECK */
#if defined( IRIX_STDINT_C99_CHECK )
#if 0
#error This header file is to be used only for c99 mode compilations