https://gcc.gnu.org/g:e905d7ee2bd428a9a31a993053a8da926733fb61

commit r16-3219-ge905d7ee2bd428a9a31a993053a8da926733fb61
Author: Francois-Xavier Coudert <fxcoud...@gcc.gnu.org>
Date:   Fri Aug 15 17:31:07 2025 +0200

    fixincludes: skip stdio_va_list on modern darwin
    
    Complement to the previous commit in fixincludes
    (b1f9ab40cbcc6ecd53a2be3e01052cee096e1a00), for the MacOSX12.3 SDK, it
    is necessary to also bypass the stdio_va_list fix. The same bypass is
    used, namely, the inclusion of <_stdio.h>.
    
    fixincludes/ChangeLog:
    
            * fixincl.x: Regenerate.
            * inclhack.def (stdio_va_list): Skip on recent darwin.

Diff:
---
 fixincludes/fixincl.x    | 6 +++---
 fixincludes/inclhack.def | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 22997215ad2a..819c02c483c7 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 13, 2025 at 01:47:24 PM by AutoGen 5.18.16
+ * It has been AutoGen-ed  August 15, 2025 at 05:30:32 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 13 13:47:24 CEST 2025
+/* DO NOT SVN-MERGE THIS FILE, EITHER Fri Aug 15 17:30:32 CEST 2025
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -9019,7 +9019,7 @@ tSCC* apzStdio_Va_ListMachs[] = {
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zStdio_Va_ListBypass0[] =
-       "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list";
+       "__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list|_stdio.h";
 
 #define    STDIO_VA_LIST_TEST_CT  1
 static tTestDesc aStdio_Va_ListTests[] = {
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index d9f1521c7272..35ccaf03c4fa 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -4473,7 +4473,7 @@ fix = {
 /*
  *  Arrange for stdio.h to use stdarg.h to define __gnuc_va_list.
  *  On 4BSD-derived systems, stdio.h defers to machine/ansi.h, that's
- *  OK too. modern macOS includes _stdio.h, and does not need the fix.
+ *  OK too. Modern macOS includes _stdio.h, and does not need the fix.
  */
 fix = {
     hackname = stdio_stdarg_h;
@@ -4499,12 +4499,12 @@ fix = {
  *  of __gnuc_va_list, __DJ_va_list, or _G_va_list is taken to
  *  indicate that the header knows what it's doing -- under SUSv2,
  *  stdio.h is required to define va_list, and we shouldn't break
- *  that.
+ *  that. Modern macOS includes _stdio.h, and does not need the fix.
  */
 fix = {
     hackname = stdio_va_list;
     files    = stdio.h;
-    bypass   = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list';
+    bypass   = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list|_stdio.h';
     /* 
      * On Solaris 10, the definition in 
      * <stdio.h> is guarded appropriately by the _XPG4 feature macro;

Reply via email to