https://gcc.gnu.org/g:19ddfa147ea4bcb16d4af2d1ee8ce4ea273a2392
commit r13-9720-g19ddfa147ea4bcb16d4af2d1ee8ce4ea273a2392 Author: Francois-Xavier Coudert <fxcoud...@gcc.gnu.org> Date: Thu Jun 27 18:55:22 2024 +0200 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. (cherry picked from commit 1dc143181550573c9c902fb7a3b495e9b409d0b0) Diff: --- 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 5e955a288d25..ab86aa383dbe 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 December 11, 2023 at 02:50:24 PM by AutoGen 5.18.16 + * It has been AutoGen-ed May 27, 2025 at 10:40:20 AM by AutoGen 5.18.16 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Dec 11 14:50:24 CET 2023 +/* DO NOT SVN-MERGE THIS FILE, EITHER Tue May 27 10:40:20 BST 2025 * * 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 a2970fcc0a93..f916a3bebd44 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"