[PATCH] fixincludes: adjust stdio fix for macOS 15 headers

[PATCH] fixincludes: adjust stdio fix for macOS 15 headers

[FX Coudert]

[-- Attachment #1: Type: text/plain, Size: 391 bytes --]

macOS 15 headers move the bulk of the content of <stdio.h> to an included header <_stdio.h> so we apply the “apple_local_stdio_fn_deprecation” fixinclude to this file also.

Restores bootstrap on darwin24.
OK to push?

FX


fixincludes/ChangeLog:

        * fixincl.x: Regenerate.
        * inclhack.def (apple_local_stdio_fn_deprecation): Also apply to
        _stdio.h.


[-- Attachment #2: 0001-fixincludes-adjust-stdio-fix-for-macOS-15-headers.patch --]
[-- Type: application/octet-stream, Size: 1933 bytes --]

From 1dc143181550573c9c902fb7a3b495e9b409d0b0 Mon Sep 17 00:00:00 2001
From: Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
Date: Thu, 27 Jun 2024 18:55:22 +0200
Subject: [PATCH] fixincludes: adjust stdio fix for macOS 15 headers

fixincludes/ChangeLog:

	* fixincl.x: Regenerate.
	* inclhack.def (apple_local_stdio_fn_deprecation): Also apply to
	_stdio.h.
---
 fixincludes/fixincl.x    | 6 +++---
 fixincludes/inclhack.def | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 54a530b50ca..fb9950d9b21 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  7, 2024 at 11:03:58 AM by AutoGen 5.18.16
+ * It has been AutoGen-ed  June 27, 2024 at 06:52:39 PM by AutoGen 5.18.16
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Jun  7 11:03:58 CEST 2024
+/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Jun 27 18:52:39 CEST 2024
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -2619,7 +2619,7 @@ tSCC zApple_Local_Stdio_Fn_DeprecationName[] =
  *  File name selection pattern
  */
 tSCC zApple_Local_Stdio_Fn_DeprecationList[] =
-  "stdio.h\0";
+  "stdio.h\0_stdio.h\0";
 /*
  *  Machine/OS name selection pattern
  */
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index f7fc5cdbabd..9f4a41199a1 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -1273,6 +1273,7 @@ fix = {
     hackname  = apple_local_stdio_fn_deprecation;
     mach      = "*-*-*darwin2*";
     files     = stdio.h;
+    files     = _stdio.h;
     select    = "__deprecated_msg([^\n]*)$";
     c_fix     = format;
     c_fix_arg = "#if defined(__APPLE_LOCAL_DEPRECATIONS)\n"
-- 
2.39.3 (Apple Git-146)

Re: [PATCH] fixincludes: adjust stdio fix for macOS 15 headers

[Iain Sandoe]

> On 27 Jun 2024, at 17:59, FX Coudert <fxcoudert@gmail.com> wrote:
> 
> macOS 15 headers move the bulk of the content of <stdio.h> to an included header <_stdio.h> so we apply the “apple_local_stdio_fn_deprecation” fixinclude to this file also.
> 
> Restores bootstrap on darwin24.
> OK to push?

OK. thanks for the fix
I guess we have also to backport if we want earlier branches to bootstrap there too?

Iain

> 
> FX
> 
> 
> fixincludes/ChangeLog:
> 
>        * fixincl.x: Regenerate.
>        * inclhack.def (apple_local_stdio_fn_deprecation): Also apply to
>        _stdio.h.
> 
> <0001-fixincludes-adjust-stdio-fix-for-macOS-15-headers.patch>

Re: [PATCH] fixincludes: adjust stdio fix for macOS 15 headers

[FX Coudert]

> OK. thanks for the fix
> I guess we have also to backport if we want earlier branches to bootstrap there too?

Thanks. I’ll backport after some time.

FX