inclhack.def (hpux_longjmp): Adjust select regular expression.

	* inclhack.def (hpux_longjmp): Adjust select regular expression.
	* fixincl.x: Regenerate.

From-SVN: r239976

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 01488f767561d7d1b91b7fa38b099d5013d62fe6..6b4aa4210509e957eccbaa2462219f16fb8dd93f 100644 (file)
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-04  John David Anglin  <danglin@gcc.gnu.org>
+
+       * inclhack.def (hpux_longjmp): Adjust select regular expression.
+       * fixincl.x: Regenerate.
+
 2016-08-13  John David Anglin  <danglin@gcc.gnu.org>
 
        * inclhack.def (hpux_longjmp): New fix.

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 5304141032f717077c68456edda4e8b09c009c96..cc5209e6205c4d0e3042e9d76b64e6555e0242f6 100644 (file)
--- 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 690c5671c2ed21ae2caa24d7b788933c85666639..1183b590f4496f55bcd21f52232354c228c52c05 100644 (file)
--- 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__))";