head 1.1; access; symbols; locks; strict; comment @# @; 1.1 date 2026.07.19.11.17.42; author adam; state Exp; branches; next ; commitid FhXjPkGd9j9WSfOG; desc @@ 1.1 log @gcc15: updated to 15.3 15.3 This release is a bug-fix release, containing fixes for regressions in GCC 15.2 relative to previous releases of GCC. PkgSrc: Allow building on Darwin/aarch64. @ text @$NetBSD$ Support Darwin/aarch64. https://github.com/Homebrew/homebrew-core/blob/main/Patches/gcc/gcc-15.3.0.diff --- fixincludes/fixincl.x.orig 2026-06-12 06:09:05.643510851 +0000 +++ fixincludes/fixincl.x @@@@ -2,11 +2,11 @@@@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed August 28, 2025 at 05:57:29 PM by AutoGen 5.18.16 + * It has been AutoGen-ed June 13, 2026 at 07:59:45 AM by AutoGen 5.18.16 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT MERGE THIS FILE, EITHER Thu Aug 28 17:57:29 BST 2025 +/* DO NOT MERGE THIS FILE, EITHER Sat Jun 13 07:59:45 BST 2026 * * You must regenerate it. Use the ./genfixes script. * @@@@ -15,7 +15,7 @@@@ * certain ANSI-incompatible system header files which are fixed to work * correctly with ANSI C and placed in a directory that GNU C will search. * - * This file contains 274 fixup descriptions. + * This file contains 272 fixup descriptions. * * See README for more information. * @@@@ -269,56 +269,6 @@@@ static const char* apzAab_Darwin7_9_Long /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Darwin_Api_Availability fix - */ -tSCC zDarwin_Api_AvailabilityName[] = - "darwin_api_availability"; - -/* - * File name selection pattern - */ -tSCC zDarwin_Api_AvailabilityList[] = - "os/availability.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzDarwin_Api_AvailabilityMachs[] = { - "*-*-darwin*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zDarwin_Api_AvailabilitySelect0[] = - " *#define __API_AVAILABLE.*\n\ - *#define __API_DEPRECATED.*\n\ - *#define __API_DEPRECATED_WITH_REPLACEMENT.*\n\ - *#define __API_UNAVAILABLE.*\n"; - -/* - * content bypass pattern - skip fix if pattern found - */ -tSCC zDarwin_Api_AvailabilityBypass0[] = - "__IPHONE_OS_VERSION_MIN_REQUIRED"; - -#define DARWIN_API_AVAILABILITY_TEST_CT 2 -static tTestDesc aDarwin_Api_AvailabilityTests[] = { - { TT_NEGREP, zDarwin_Api_AvailabilityBypass0, (regex_t*)NULL }, - { TT_EGREP, zDarwin_Api_AvailabilitySelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Darwin_Api_Availability - */ -static const char* apzDarwin_Api_AvailabilityPatch[] = { - "format", - " #define API_AVAILABLE(...)\n\ - #define API_DEPRECATED(...)\n\ - #define API_DEPRECATED_WITH_REPLACEMENT(...)\n\ - #define API_UNAVAILABLE(...)\n", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Aab_Fd_Zero_Asm_Posix_Types_H fix */ tSCC zAab_Fd_Zero_Asm_Posix_Types_HName[] = @@@@ -2765,51 +2715,6 @@@@ extern \"C\" {\n\ /* * * * * * * * * * * * * * * * * * * * * * * * * * * - * Description of Darwin_Availabilityinternal fix - */ -tSCC zDarwin_AvailabilityinternalName[] = - "darwin_availabilityinternal"; - -/* - * File name selection pattern - */ -tSCC zDarwin_AvailabilityinternalList[] = - "AvailabilityInternal.h\0"; -/* - * Machine/OS name selection pattern - */ -tSCC* apzDarwin_AvailabilityinternalMachs[] = { - "*-*-darwin*", - (const char*)NULL }; - -/* - * content selection pattern - do fix if pattern found - */ -tSCC zDarwin_AvailabilityinternalSelect0[] = - "#define[ \t]+(__API_[ADU]\\([^)]*\\)).*"; - -#define DARWIN_AVAILABILITYINTERNAL_TEST_CT 1 -static tTestDesc aDarwin_AvailabilityinternalTests[] = { - { TT_EGREP, zDarwin_AvailabilityinternalSelect0, (regex_t*)NULL }, }; - -/* - * Fix Command Arguments for Darwin_Availabilityinternal - */ -static const char* apzDarwin_AvailabilityinternalPatch[] = { - "format", - "#if defined(__has_attribute)\n\ - #if __has_attribute(availability)\n\ -%0\n\ - #else\n\ - #define %1\n\ - #endif\n\ -#else\n\ - #define %1\n\ -#endif", - (char*)NULL }; - -/* * * * * * * * * * * * * * * * * * * * * * * * * * - * * Description of Darwin_9_Long_Double_Funcs_2 fix */ tSCC zDarwin_9_Long_Double_Funcs_2Name[] = @@@@ -8988,7 +8893,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[] = { @@@@ -9026,7 +8931,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[] = { @@@@ -11209,9 +11114,9 @@@@ static const char* apzX11_SprintfPatch[] * * List of all fixes */ -#define REGEX_COUNT 319 +#define REGEX_COUNT 316 #define MACH_LIST_SIZE_LIMIT 187 -#define FIX_COUNT 274 +#define FIX_COUNT 272 /* * Enumerate the fixes @@@@ -11220,7 +11125,6 @@@@ typedef enum { AAB_AIX_STDIO_FIXIDX, AAB_AIX_FCNTL_FIXIDX, AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_FIXIDX, - DARWIN_API_AVAILABILITY_FIXIDX, AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX, AAB_FD_ZERO_GNU_TYPES_H_FIXIDX, AAB_FD_ZERO_SELECTBITS_H_FIXIDX, @@@@ -11282,7 +11186,6 @@@@ typedef enum { CTRL_QUOTES_DEF_FIXIDX, CTRL_QUOTES_USE_FIXIDX, CXX_UNREADY_FIXIDX, - DARWIN_AVAILABILITYINTERNAL_FIXIDX, DARWIN_9_LONG_DOUBLE_FUNCS_2_FIXIDX, DARWIN_EXTERNC_FIXIDX, DARWIN_GCC4_BREAKAGE_FIXIDX, @@@@ -11509,11 +11412,6 @@@@ tFixDesc fixDescList[ FIX_COUNT ] = { AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, aAab_Darwin7_9_Long_Double_FuncsTests, apzAab_Darwin7_9_Long_Double_FuncsPatch, 0 }, - { zDarwin_Api_AvailabilityName, zDarwin_Api_AvailabilityList, - apzDarwin_Api_AvailabilityMachs, - DARWIN_API_AVAILABILITY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aDarwin_Api_AvailabilityTests, apzDarwin_Api_AvailabilityPatch, 0 }, - { zAab_Fd_Zero_Asm_Posix_Types_HName, zAab_Fd_Zero_Asm_Posix_Types_HList, apzAab_Fd_Zero_Asm_Posix_Types_HMachs, AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT, @@@@ -11819,11 +11717,6 @@@@ tFixDesc fixDescList[ FIX_COUNT ] = { CXX_UNREADY_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aCxx_UnreadyTests, apzCxx_UnreadyPatch, 0 }, - { zDarwin_AvailabilityinternalName, zDarwin_AvailabilityinternalList, - apzDarwin_AvailabilityinternalMachs, - DARWIN_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, - aDarwin_AvailabilityinternalTests, apzDarwin_AvailabilityinternalPatch, 0 }, - { zDarwin_9_Long_Double_Funcs_2Name, zDarwin_9_Long_Double_Funcs_2List, apzDarwin_9_Long_Double_Funcs_2Machs, DARWIN_9_LONG_DOUBLE_FUNCS_2_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, @