From 8326956159053b215b5cfe6cd41bfceff413491e Mon Sep 17 00:00:00 2001
From: Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
Date: Wed, 10 Jul 2024 14:50:38 +0200
Subject: [PATCH] fixincludes: add bypass to darwin_objc_runtime_1

Headers are now fixed in the macOS 15 SDK, and the fix should be
bypassed there.

fixincludes/ChangeLog:

	* fixincl.x: Regenerate.
	* inclhack.def (darwin_objc_runtime_1): Add bypass.
---
 fixincludes/fixincl.x    | 15 +++++++++++----
 fixincludes/inclhack.def |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index fb9950d9b21..9dc05ea17f1 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  June 27, 2024 at 06:52:39 PM by AutoGen 5.18.16
+ * It has been AutoGen-ed  July 10, 2024 at 02:49:05 PM by AutoGen 5.18.16
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Jun 27 18:52:39 CEST 2024
+/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Jul 10 14:49:05 CEST 2024
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -3124,8 +3124,15 @@ objc_enumerateClasses.*\n\
 .*\n\
 .*OBJC_REFINED_FOR_SWIFT.*";
 
-#define    DARWIN_OBJC_RUNTIME_1_TEST_CT  1
+/*
+ *  content bypass pattern - skip fix if pattern found
+ */
+tSCC zDarwin_Objc_Runtime_1Bypass0[] =
+       "#ifdef __BLOCKS__";
+
+#define    DARWIN_OBJC_RUNTIME_1_TEST_CT  2
 static tTestDesc aDarwin_Objc_Runtime_1Tests[] = {
+  { TT_NEGREP,   zDarwin_Objc_Runtime_1Bypass0, (regex_t*)NULL },
   { TT_EGREP,    zDarwin_Objc_Runtime_1Select0, (regex_t*)NULL }, };
 
 /*
@@ -11195,7 +11202,7 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          317
+#define REGEX_COUNT          318
 #define MACH_LIST_SIZE_LIMIT 187
 #define FIX_COUNT            274
 
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 9f4a41199a1..1ac8e335419 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -1512,6 +1512,7 @@ fix = {
 	.*
 	.*OBJC_REFINED_FOR_SWIFT.*
 	_EOSelect_;
+  bypass    = "#ifdef __BLOCKS__";
   c_fix     = format;
   c_fix_arg = "#if __BLOCKS__\n%0\n#endif";
   test_text = <<- _OBJC_RUNTIME_1