procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

inclhack.def (hpux_longjmp): New fix.

Browse source 
* inclhack.def (hpux_longjmp): New fix.
	* fixincl.x: Regenerate.
	* tests/base/setjmp.h: New test file.

From-SVN: r239446
This commit is contained in:
John David Anglin 2016-08-13 18:08:15 +00:00
parent 30c8821b37
commit dffe3cc511
4 changed files with 85 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fixincludes/ChangeLog
View file

@ -1,3 +1,9 @@
2016-08-13 John David Anglin <danglin@gcc.gnu.org>
* inclhack.def (hpux_longjmp): New fix.
* fixincl.x: Regenerate.
* tests/base/setjmp.h: New test file.
2016-08-09 Bernd Edlinger <bernd.edlinger@hotmail.de>
PR bootstrap/72833

57
fixincludes/fixincl.x
View file

@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
*
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
* It has been AutoGen-ed August 8, 2016 at 08:46:37 PM by AutoGen 5.18
*
* It has been AutoGen-ed Saturday August 13, 2016 at 02:05:44 PM EDT
* From the definitions inclhack.def
* and the template file fixincl
*/
/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Aug 8 20:46:37 CEST 2016
/* DO NOT SVN-MERGE THIS FILE, EITHER Sat 13 Aug 2016 14:05:44 EDT
*
* 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 236 fixup descriptions.
* This file contains 237 fixup descriptions.
*
* See README for more information.
*
@ -5083,6 +5083,43 @@ static const char* apzHpux_Stdint_Least_FastPatch[] = {
"# define\tUINT_%164_MAX\t__UINT64_MAX__",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Hpux_Longjmp fix
*/
tSCC zHpux_LongjmpName[] =
"hpux_longjmp";
/*
* File name selection pattern
*/
tSCC zHpux_LongjmpList[] =
"setjmp.h\0";
/*
* Machine/OS name selection pattern
*/
tSCC* apzHpux_LongjmpMachs[] = {
"*-hp-hpux*",
(const char*)NULL };
/*
* content selection pattern - do fix if pattern found
*/
tSCC zHpux_LongjmpSelect0[] =
"^[ \t]*extern[ \t]+void.*longjmp[ \t]+__\\(\\(.*int\\)\\)";
#define HPUX_LONGJMP_TEST_CT 1
static tTestDesc aHpux_LongjmpTests[] = {
{ TT_EGREP, zHpux_LongjmpSelect0, (regex_t*)NULL }, };
/*
* Fix Command Arguments for Hpux_Longjmp
*/
static const char* apzHpux_LongjmpPatch[] = {
"format",
"%0 __attribute__ ((__noreturn__))",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description of Hpux_Systime fix
@ -9677,9 +9714,9 @@ static const char* apzX11_SprintfPatch[] = {
*
* List of all fixes
*/
#define REGEX_COUNT 274
#define REGEX_COUNT 275
#define MACH_LIST_SIZE_LIMIT 187
#define FIX_COUNT 236
#define FIX_COUNT 237
/*
* Enumerate the fixes
@ -9805,6 +9842,7 @@ typedef enum {
HPUX_PTHREAD_INITIALIZERS_FIXIDX,
HPUX_SPU_INFO_FIXIDX,
HPUX_STDINT_LEAST_FAST_FIXIDX,
HPUX_LONGJMP_FIXIDX,
HPUX_SYSTIME_FIXIDX,
HUGE_VAL_HEX_FIXIDX,
HUGE_VALF_HEX_FIXIDX,
@ -10524,6 +10562,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
HPUX_STDINT_LEAST_FAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux_Stdint_Least_FastTests, apzHpux_Stdint_Least_FastPatch, 0 },
{ zHpux_LongjmpName, zHpux_LongjmpList,
apzHpux_LongjmpMachs,
HPUX_LONGJMP_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
aHpux_LongjmpTests, apzHpux_LongjmpPatch, 0 },
{ zHpux_SystimeName, zHpux_SystimeList,
apzHpux_SystimeMachs,
HPUX_SYSTIME_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,

15
fixincludes/inclhack.def
View file

@ -2641,6 +2641,21 @@ fix = {
_EOFix_;
};
/*
* Add noreturn attribute to longjmp declarations in hpux <setjmp.h>
*/
fix = {
hackname = hpux_longjmp;
mach = "*-hp-hpux*";
files = setjmp.h;
select = "^[ \t]*extern[ \t]+void.*longjmp[ \t]+__\\(\\(.*int\\)\\)";
c_fix = format;
c_fix_arg = "%0 __attribute__ ((__noreturn__))";
test_text = 'extern void longjmp __((jmp_buf, int));';
};
/*
* Fix hpux10.20 <sys/time.h> to avoid invalid forward decl
*/

14
fixincludes/tests/base/setjmp.h Normal file
View file

@ -0,0 +1,14 @@
/* DO NOT EDIT THIS FILE.
It has been auto-edited by fixincludes from:
"fixinc/tests/inc/setjmp.h"
This had to be done to correct non-standard usages in the
original, manufacturer supplied header file. */
#if defined( HPUX_LONGJMP_CHECK )
extern void longjmp __((jmp_buf, int)) __attribute__ ((__noreturn__));
#endif /* HPUX_LONGJMP_CHECK */