backport fix for PR90379

2019-05-13  Iain Sandoe  <iain@sandoe.co.uk>

	Backport from mainline.
	2019-05-11  Iain Sandoe  <iain@sandoe.co.uk>

	PR target/90379
	PR bootstrap/89864
	* inclhack.def (darwin_ucred__Atomic): Do not supply test_text
	for wrap fixes.
	* fixincl.x: Regenerated.

From-SVN: r271136

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index d774f7105a08bc829a68e1336724123dd1fb2c8a..0b2abfbadc567706db2291550814f3614e2c149b 100644 (file)
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,14 @@
+2019-05-13  Iain Sandoe  <iain@sandoe.co.uk>
+
+       Backport from mainline.
+       2019-05-11  Iain Sandoe  <iain@sandoe.co.uk>
+
+       PR target/90379
+       PR bootstrap/89864
+       * inclhack.def (darwin_ucred__Atomic): Do not supply test_text
+       for wrap fixes.
+       * fixincl.x: Regenerated.
+
 2019-05-03  Release Manager
 
        * GCC 9.1.0 released.

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index e150d70fa37ddeca83d6d6a7bd11d55d226d85e7..7faa40b01f8ea982d15e234225d181256de62627 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  April 16, 2019 at 09:32:25 AM by AutoGen 5.17.4
+ * It has been AutoGen-ed  May 12, 2019 at 01:45:50 AM 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 Sun May 12 01:45:50 BST 2019
  *
  * You must regenerate it.  Use the ./genfixes script.
  *

diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index d8ce89ac8c4475fdfc2bfd855e182d3cbabe51a1..3900d15927306761ff9f48a0db0f26925869b658 100644 (file)
--- 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.  */
 };
 
 /*