 + *  Machine/OS name selection pattern
 + */
 +tSCC* apzDarwin_Ucred__AtomicMachs[] = {
-+        "*-*-darwin*",
++        "*-*-darwin18*",
 +        (const char*)NULL };
 +
 +/*

From 235ccac0aeb941c860c1e469a645ab9a90c9eca2 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain@sandoe.co.uk>
Date: Thu, 18 Apr 2019 21:20:09 +0530
Subject: [PATCH] backport r270435 - fix PR89864

	Backport from mainline
	2019-04-18  Erik Schnetter  <schnetter@gmail.com>
          Jakub Jelinek  <jakub@redhat.com>
          Iain Sandoe  <iain@sandoe.co.uk>

        PR bootstrap/89864
        * inclhack.def (darwin_ucred__Atomic): New, work around _Atomic keyword
        use in headers included by C++.
        * fixincl.x: Regenerated.
---
 fixincludes/fixincl.x    | 58 ++++++++++++++++++++++++++++++++++++----
 fixincludes/inclhack.def | 19 +++++++++++++
 2 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 1a1f46c0518..1fff079f60d 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 13, 2019 at 09:58:23 AM by AutoGen 5.17.4
+ * It has been AutoGen-ed  April 18, 2019 at 10:07:54 AM by AutoGen 5.17.4
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Sat Apr 13 09:58:23 IST 2019
+/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Apr 18 10:07:54 IST 2019
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -15,7 +15,7 @@
  * certain ANSI-incompatible system header files which are fixed to work
  * correctly with ANSI C and placed in a directory that GNU C will search.
  *
- * This file contains 251 fixup descriptions.
+ * This file contains 252 fixup descriptions.
  *
  * See README for more information.
  *
@@ -3300,6 +3300,48 @@ static const char* apzDarwin_Stdint_7Patch[] = {
 #endif",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Darwin_Ucred__Atomic fix
+ */
+tSCC zDarwin_Ucred__AtomicName[] =

+ */
+static const char* apzDarwin_Ucred__AtomicPatch[] = {
+    "wrap",
+    "# define _Atomic volatile\n",
+    "# undef _Atomic\n",
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
  *  Description of Dec_Intern_Asm fix
  */
 tSCC zDec_Intern_AsmName[] =
@@ -10099,9 +10137,9 @@
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          287
+#define REGEX_COUNT          288
 #define MACH_LIST_SIZE_LIMIT 187
-#define FIX_COUNT            249
+#define FIX_COUNT            250
 
 /*
  *  Enumerate the fixes
@@ -10183,6 +10221,7 @@
     DARWIN_STDINT_5_FIXIDX,
     DARWIN_STDINT_6_FIXIDX,
     DARWIN_STDINT_7_FIXIDX,
