re PR bootstrap/53348 (Conflicting fast-integer types on AIX: <sys/inttypes.h> vs...

        PR bootstrap/53348
        * inclhack.def (aix_pthread): Accept tab after define.
        * fixincl.x: Regenerate.

From-SVN: r220502

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index afed2f8fd2289383031f367254c554f79284f9a6..c6ae152f7bffe5bfb8ae4ae419cabd042840f6a7 100644 (file)
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-06  David Edelsohn  <dje.gcc@gmail.com>
+
+       PR bootstrap/53348
+       * inclhack.def (aix_pthread): Accept tab after define.
+       * fixincl.x: Regenerate.
+
 2015-01-24  Bruce Korb  <bkorb@gnu.org>
 
        * README: add some clarification on use of test_text

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index ea868369e98c236c6b272afc66a0d048f2402d36..42009e990727e6f8b5ffe523a3725c5dacb04cad 100644 (file)
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -1154,7 +1154,7 @@ tSCC zAix_PthreadList[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zAix_PthreadSelect0[] =
-       "(#define [A-Za-z_0-9]+)(\\\\\n\
+       "(#define[\t ][A-Za-z_0-9]+)(\\\\\n\
 [^A-Za-z_0-9 \t\n\
 (])";
 

diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index b27f1636bc3eac9de86c6a891b629f6d6e6b199b..fa9287e50fd7d85d80e4ae788416f9e4b5dfbd01 100644 (file)
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -727,7 +727,7 @@ fix = {
 fix = {
     hackname  = aix_pthread;
     files     = "pthread.h";
-    select    = "(#define [A-Za-z_0-9]+)(\\\\\n[^A-Za-z_0-9 \t\n(])";
+    select    = "(#define[\t ][A-Za-z_0-9]+)(\\\\\n[^A-Za-z_0-9 \t\n(])";
     c_fix     = format;
     c_fix_arg = "%1 %2";
     test_text = "#define PTHREAD_MUTEX_INITIALIZER\\\\\n"