From abb62d32a1f472ba3b1f9ae07bcdcc1d7f014699 Mon Sep 17 00:00:00 2001 From: John David Anglin Date: Sun, 4 Sep 2016 16:17:10 +0000 Subject: inclhack.def (hpux_longjmp): Adjust select regular expression. * inclhack.def (hpux_longjmp): Adjust select regular expression. * fixincl.x: Regenerate. From-SVN: r239976 --- fixincludes/ChangeLog | 5 +++++ fixincludes/fixincl.x | 6 +++--- fixincludes/inclhack.def | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'fixincludes') diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 01488f76756..6b4aa421050 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,8 @@ +2016-09-04 John David Anglin + + * inclhack.def (hpux_longjmp): Adjust select regular expression. + * fixincl.x: Regenerate. + 2016-08-13 John David Anglin * inclhack.def (hpux_longjmp): New fix. diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 5304141032f..cc5209e6205 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Saturday August 13, 2016 at 02:05:44 PM EDT + * It has been AutoGen-ed Sunday September 4, 2016 at 12:15:33 PM EDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Sat 13 Aug 2016 14:05:44 EDT +/* DO NOT SVN-MERGE THIS FILE, EITHER Sun 4 Sep 2016 12:15:33 EDT * * You must regenerate it. Use the ./genfixes script. * @@ -5106,7 +5106,7 @@ tSCC* apzHpux_LongjmpMachs[] = { * content selection pattern - do fix if pattern found */ tSCC zHpux_LongjmpSelect0[] = - "^[ \t]*extern[ \t]+void.*longjmp[ \t]+__\\(\\(.*int\\)\\)"; + "^[ \t]*extern[ \t]+void[ \t]+.*longjmp[ \t]*(__\\(\\(.*int\\)\\)|\\(.*int\\)|\\(\\))"; #define HPUX_LONGJMP_TEST_CT 1 static tTestDesc aHpux_LongjmpTests[] = { diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 690c5671c2e..1183b590f44 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -2648,7 +2648,7 @@ fix = { hackname = hpux_longjmp; mach = "*-hp-hpux*"; files = setjmp.h; - select = "^[ \t]*extern[ \t]+void.*longjmp[ \t]+__\\(\\(.*int\\)\\)"; + select = "^[ \t]*extern[ \t]+void[ \t]+.*longjmp[ \t]*\(__\\(\\(.*int\\)\\)|\\(.*int\\)|\\(\\)\)"; c_fix = format; c_fix_arg = "%0 __attribute__ ((__noreturn__))"; -- cgit v1.2.3