diff options
| author | David Edelsohn <dje.gcc@gmail.com> | 2015-02-07 02:55:03 +0000 |
|---|---|---|
| committer | David Edelsohn <dje@gcc.gnu.org> | 2015-02-06 21:55:03 -0500 |
| commit | a15b4c98a3b8f057bb658bc938527b5ffcd06620 (patch) | |
| tree | 5185f582fa37f698a4fcb0fc965f9b8d1c48b343 /fixincludes | |
| parent | 0f32bcbd90220154e598087dddfb96025b863bce (diff) | |
re PR bootstrap/53348 (Conflicting fast-integer types on AIX: <sys/inttypes.h> vs. gcc/config/rs6000/aix-stdint.h)
PR bootstrap/53348
* inclhack.def (aix_pthread): Accept tab after define.
* fixincl.x: Regenerate.
From-SVN: r220502
Diffstat (limited to 'fixincludes')
| -rw-r--r-- | fixincludes/ChangeLog | 6 | ||||
| -rw-r--r-- | fixincludes/fixincl.x | 2 | ||||
| -rw-r--r-- | fixincludes/inclhack.def | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index afed2f8fd22..c6ae152f7bf 100644 --- 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 ea868369e98..42009e99072 100644 --- 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 b27f1636bc3..fa9287e50fd 100644 --- 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" |