From 7121b43fd5df4d15fb9c3e51d4ffe0c1df2a56d9 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Sat, 11 May 2019 20:19:31 +0000 Subject: [PATCH] fixincludes - fix PR90379 One should not provide test_text for wrap style fixes this was causing the test to fail. No change to the actual fix. 2019-05-11 Iain Sandoe PR target/90379 PR bootstrap/89864 * inclhack.def (darwin_ucred__Atomic): Do not supply test_text for wrap fixes. * fixincl.x: Regenerated. From-SVN: r271098 --- fixincludes/ChangeLog | 7 +++++++ fixincludes/fixincl.x | 4 ++-- fixincludes/inclhack.def | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index ad37281c3fb..9d59d18fc6a 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,10 @@ +2019-05-11 Iain Sandoe + PR target/90379 + PR bootstrap/89864 + * inclhack.def (darwin_ucred__Atomic): Do not supply test_text + for wrap fixes. + * fixincl.x: Regenerated. + 2019-04-18 Erik Schnetter Jakub Jelinek Iain Sandoe diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index e150d70fa37..48fc25807a2 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 April 16, 2019 at 09:32:25 AM by AutoGen 5.17.4 + * It has been AutoGen-ed May 11, 2019 at 03:09:50 PM by AutoGen 5.17.4 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Apr 16 09:32:25 IST 2019 +/* DO NOT SVN-MERGE THIS FILE, EITHER Sat May 11 15:09:50 BST 2019 * * You must regenerate it. Use the ./genfixes script. * diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index d8ce89ac8c4..3900d159273 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -1638,7 +1638,7 @@ fix = { c_fix_arg = "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n" "# undef _Atomic\n" "#endif\n"; - test_text = "_Atomic"; + test_text = ""; /* Don't provide this for wrap fixes. */ }; /*