mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-27 05:44:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix missing SCNuMAX defines in inttypes.h on hpux11.[01]*

Browse Source 
2020-01-25  John David Anglin  <danglin@gcc.gnu.org>

	* inclhack.def (hpux_c99_inttypes4): New, add missing SCNuMAX defines.
	* fixincl.x: Regenerate.
	* tests/base/inttypes.h: Update for above fix.
This commit is contained in:
John David Anglin 2020-01-25 12:20:24 -05:00
parent 98dd8c97e4
commit 10be08aa27
4 changed files with 71 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fixincludes/ChangeLog
View File

@ -1,3 +1,9 @@
2020-01-25 John David Anglin <danglin@gcc.gnu.org>
* inclhack.def (hpux_c99_inttypes4): New, add missing SCNuMAX defines.
* fixincl.x: Regenerate.
* tests/base/inttypes.h: Update for above fix.
2019-12-30 John David Anglin <danglin@gcc.gnu.org>
PR libgomp/93066

45
fixincludes/fixincl.x
View File

@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
* It has been AutoGen-ed December 30, 2019 at 03:30:20 PM by AutoGen 5.18.16
* It has been AutoGen-ed January 25, 2020 at 12:15:43 PM by AutoGen 5.18.16
* From the definitions inclhack.def
* and the template file fixincl
*/
/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Dec 30 15:30:20 EST 2019
/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Jan 25 12:15:43 EST 2020
*
* 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 257 fixup descriptions.
* This file contains 258 fixup descriptions.
*
* See README for more information.
*
@ -5196,6 +5196,37 @@ static const char* apzHpux_C99_Inttypes3Patch[] = {
#endif\n",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Hpux_C99_Inttypes4 fix
*/
tSCC zHpux_C99_Inttypes4Name[] =
"hpux_c99_inttypes4";
/*
* File name selection pattern
*/
tSCC zHpux_C99_Inttypes4List[] =
"inttypes.h\0";
/*
* Machine/OS name selection pattern
*/
tSCC* apzHpux_C99_Inttypes4Machs[] = {
"hppa*-hp-hpux11.[01]*",
(const char*)NULL };
#define HPUX_C99_INTTYPES4_TEST_CT 0
#define aHpux_C99_Inttypes4Tests (tTestDesc*)NULL
/*
* Fix Command Arguments for Hpux_C99_Inttypes4
*/
static const char* apzHpux_C99_Inttypes4Patch[] = { sed_cmd_z,
"-e", "/^[ \t]*#[ \t]*define[ \t]*SCNxMAX[ \t]*SCNx64/a\\\n\
#define SCNuMAX \t SCNu64\n",
"-e", "/^[ \t]*#[ \t]*define[ \t]*SCNxMAX[ \t]*SCNx32/a\\\n\
#define SCNuMAX \t SCNu32\n",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Hpux_Ctype_Macros fix
@ -10447,7 +10478,7 @@ static const char* apzX11_SprintfPatch[] = {
*/
#define REGEX_COUNT 296
#define MACH_LIST_SIZE_LIMIT 187
#define FIX_COUNT 257
#define FIX_COUNT 258
/*
* Enumerate the fixes
@ -10577,6 +10608,7 @@ typedef enum {
HPUX_C99_INTTYPES_FIXIDX,
HPUX_C99_INTTYPES2_FIXIDX,
HPUX_C99_INTTYPES3_FIXIDX,
HPUX_C99_INTTYPES4_FIXIDX,
HPUX_CTYPE_MACROS_FIXIDX,
HPUX_EXTERN_ERRNO_FIXIDX,
HPUX_HTONL_FIXIDX,
@ -11333,6 +11365,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
HPUX_C99_INTTYPES3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux_C99_Inttypes3Tests, apzHpux_C99_Inttypes3Patch, 0 },
{ zHpux_C99_Inttypes4Name, zHpux_C99_Inttypes4List,
apzHpux_C99_Inttypes4Machs,
HPUX_C99_INTTYPES4_TEST_CT, FD_MACH_ONLY,
aHpux_C99_Inttypes4Tests, apzHpux_C99_Inttypes4Patch, 0 },
{ zHpux_Ctype_MacrosName, zHpux_Ctype_MacrosList,
apzHpux_Ctype_MacrosMachs,
HPUX_CTYPE_MACROS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,

15
fixincludes/inclhack.def
View File

@ -2613,6 +2613,21 @@ fix = {
"#define UINTPTR_MAX\n";
};
/*
* Fix missing SCNuMAX defines in inttypes.h
*/
fix = {
hackname = hpux_c99_inttypes4;
mach = "hppa*-hp-hpux11.[01]*";
files = inttypes.h;
sed = "/^[ \t]*#[ \t]*define[ \t]*SCNxMAX[ \t]*SCNx64/a\\\n"
"#define SCNuMAX \t SCNu64\n";
sed = "/^[ \t]*#[ \t]*define[ \t]*SCNxMAX[ \t]*SCNx32/a\\\n"
"#define SCNuMAX \t SCNu32\n";
test_text = "#define SCNxMAX SCNx64\n"
"#define SCNxMAX SCNx32\n";
};
/*
* Fix hpux broken ctype macros
*/

9
fixincludes/tests/base/inttypes.h
View File

@ -33,3 +33,12 @@
#endif
#endif /* HPUX_C99_INTTYPES3_CHECK */
#if defined( HPUX_C99_INTTYPES4_CHECK )
#define SCNxMAX SCNx64
#define SCNuMAX SCNu64
#define SCNxMAX SCNx32
#define SCNuMAX SCNu32
#endif /* HPUX_C99_INTTYPES4_CHECK */