    {  zDec_Intern_AsmName,    zDec_Intern_AsmList,
       apzDec_Intern_AsmMachs,
       DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
-diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
-index 7f0fb9dc911..49ba499ecde 100644
---- a/fixincludes/inclhack.def
-+++ b/fixincludes/inclhack.def
-@@ -1635,6 +1635,25 @@ fix = {
+diff -r -u gcc-8.3.0/fixincludes/inclhack.def gcc-8.3.0-patch/fixincludes/inclhack.def
+--- gcc-8.3.0/fixincludes/inclhack.def	2018-02-23 01:12:26.000000000 +0900
++++ gcc-8.3.0-patch/fixincludes/inclhack.def	2019-04-11 12:37:59.000000000 +0900
+@@ -1592,6 +1592,19 @@
  		"#define UINTMAX_C(v) (v ## ULL)";
  };
  
-+/*  The SDK included with XCode 10.2 has the file <sys/ucred.h> that uses the
-+    C11 _Atomic keyword (exposing it to C++ code).  The work-around here follows
-+    the header in declaring the entity volatile when _Atomic is not available.
++/*  XCode 10.2 <sys/ucred.h> uses the C _Atomic keyword in C++ code.
 +*/
 +fix = {
 +    hackname  = darwin_ucred__Atomic;
-+    mach      = "*-*-darwin*";
++    mach      = "*-*-darwin18*";
 +    files     = sys/ucred.h;
 +    select    = "_Atomic";
 +    c_fix     = wrap;
-+    c_fix_arg = "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n"
-+		"# define _Atomic volatile\n"
-+		"#endif\n";
-+    c_fix_arg = "#if (__STDC_VERSION__ < 201112L) || defined(__cplusplus)\n"
-+		"# undef _Atomic\n"
-+		"#endif\n";
++    c_fix_arg = "# define _Atomic volatile\n";
++    c_fix_arg = "# undef _Atomic\n";
 +    test_text = "_Atomic";
 +};
 +

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

+ */
+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,
