diff options
Diffstat (limited to 'fixincludes')
| -rw-r--r-- | fixincludes/ChangeLog | 18 | ||||
| -rw-r--r-- | fixincludes/fixincl.tpl | 2 | ||||
| -rw-r--r-- | fixincludes/fixincl.x | 19 | ||||
| -rw-r--r-- | fixincludes/inclhack.def | 11 |
4 files changed, 38 insertions, 12 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index a5fdb31..12fbd9a 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,21 @@ +2025-08-28 Jonathan Wakely <jwakely@redhat.com> + + PR bootstrap/118009 + PR bootstrap/119089 + * inclhack.def (pthread_incomplete_struct_argument): Add bypass. + * fixincl.tpl: Remove reference to svn in comment. + * fixincl.x: Regenerate. + +2025-08-15 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> + + * fixincl.x: Regenerate. + * inclhack.def (stdio_va_list): Skip on recent darwin. + +2025-08-15 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> + + * fixincl.x: Regenerate. + * inclhack.def (stdio_stdarg_h): Skip on darwin. + 2024-07-11 Iain Sandoe <iain@sandoe.co.uk> Revert: diff --git a/fixincludes/fixincl.tpl b/fixincludes/fixincl.tpl index 3d70cab..3227b38 100644 --- a/fixincludes/fixincl.tpl +++ b/fixincludes/fixincl.tpl @@ -5,7 +5,7 @@ x=fixincl.x =] (dne "-D" " * " "/* ") (dne " * " "/* ") ) =] */ -/* DO NOT SVN-MERGE THIS FILE, EITHER [= +/* DO NOT MERGE THIS FILE, EITHER [= (define re-ct 0) (define max-mach 0) (define ct 0) (define HACK "") (define Hack "") (define tmp "") (shell "date") =] diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 9dc05ea..e684b211 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 July 10, 2024 at 02:49:05 PM by AutoGen 5.18.16 + * It has been AutoGen-ed August 28, 2025 at 04:10:25 PM by AutoGen 5.18.16 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Jul 10 14:49:05 CEST 2024 +/* DO NOT MERGE THIS FILE, EITHER Thu Aug 28 16:10:25 BST 2025 * * You must regenerate it. Use the ./genfixes script. * @@ -7547,8 +7547,15 @@ tSCC zPthread_Incomplete_Struct_ArgumentList[] = tSCC zPthread_Incomplete_Struct_ArgumentSelect0[] = "struct __jmp_buf_tag"; -#define PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT 1 +/* + * content bypass pattern - skip fix if pattern found + */ +tSCC zPthread_Incomplete_Struct_ArgumentBypass0[] = + "bits/types/struct___jmp_buf_tag.h"; + +#define PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_TEST_CT 2 static tTestDesc aPthread_Incomplete_Struct_ArgumentTests[] = { + { TT_NEGREP, zPthread_Incomplete_Struct_ArgumentBypass0, (regex_t*)NULL }, { TT_EGREP, zPthread_Incomplete_Struct_ArgumentSelect0, (regex_t*)NULL }, }; /* @@ -8981,7 +8988,7 @@ tSCC* apzStdio_Stdarg_HMachs[] = { * content bypass pattern - skip fix if pattern found */ tSCC zStdio_Stdarg_HBypass0[] = - "include.*(stdarg.h|machine/ansi.h)"; + "include.*(stdarg.h|machine/ansi.h|_stdio.h)"; #define STDIO_STDARG_H_TEST_CT 1 static tTestDesc aStdio_Stdarg_HTests[] = { @@ -9019,7 +9026,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[] = { @@ -11202,7 +11209,7 @@ static const char* apzX11_SprintfPatch[] = { * * List of all fixes */ -#define REGEX_COUNT 318 +#define REGEX_COUNT 319 #define MACH_LIST_SIZE_LIMIT 187 #define FIX_COUNT 274 diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 1ac8e33..71777cb 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -3803,6 +3803,7 @@ fix = { hackname = pthread_incomplete_struct_argument; files = pthread.h; select = "struct __jmp_buf_tag"; + bypass = "bits/types/struct___jmp_buf_tag.h"; c_fix = format; c_fix_arg = "%1 *%2%3"; c_fix_arg = "^(extern int __sigsetjmp \\(struct __jmp_buf_tag) " @@ -4472,13 +4473,13 @@ 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. + * 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. */ fix = { hackname = stdio_stdarg_h; files = stdio.h; - bypass = "include.*(stdarg\.h|machine/ansi\.h)"; + bypass = "include.*(stdarg\.h|machine/ansi\.h|_stdio\.h)"; /* * On Solaris 10, this fix is unncessary; <stdio.h> includes * <iso/stdio_iso.h>, which includes <sys/va_list.h>. @@ -4499,12 +4500,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; |