pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lang/gcc12: Fix build on Darwin for macOS 26.2



Module Name:	pkgsrc-wip
Committed By:	Frédéric Fauberteau <frederic%fauberteau.org@localhost>
Pushed By:	frederic
Date:		Wed Feb 18 16:38:26 2026 +0100
Changeset:	b9d6e3be5053ce90f2954ef4524af411c097b18a

Modified Files:
	gcc12/Makefile
	gcc12/Makefile.common
	gcc12/distinfo
	gcc12/patches/patch-gcc_Makefile.in
	gcc12/version.mk
Added Files:
	gcc12/COMMIT_MSG
	gcc12/patches/patch-fixincludes_fixincl.x
	gcc12/patches/patch-fixincludes_inclhack.def
	gcc12/patches/patch-fixincludes_tests_base_math.h
	gcc12/patches/patch-libgcc_config.host
	gcc12/patches/patch-zlib_zutil.h

Log Message:
lang/gcc12: Fix build on Darwin for macOS 26.2

Update prepared in wip by Frédéric Fauberteau

It adds patches that fix build on Darwin aarch64 with last macOS SDK (26.2).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b9d6e3be5053ce90f2954ef4524af411c097b18a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gcc12/COMMIT_MSG                                  |  5 ++
 gcc12/Makefile                                    |  4 +-
 gcc12/Makefile.common                             | 22 ++----
 gcc12/distinfo                                    | 25 +++---
 gcc12/patches/patch-fixincludes_fixincl.x         | 92 +++++++++++++++++++++++
 gcc12/patches/patch-fixincludes_inclhack.def      | 36 +++++++++
 gcc12/patches/patch-fixincludes_tests_base_math.h | 27 +++++++
 gcc12/patches/patch-gcc_Makefile.in               |  2 +-
 gcc12/patches/patch-libgcc_config.host            | 25 ++++++
 gcc12/patches/patch-zlib_zutil.h                  | 52 +++++++++++++
 gcc12/version.mk                                  |  4 +-
 11 files changed, 259 insertions(+), 35 deletions(-)

diffs:
diff --git a/gcc12/COMMIT_MSG b/gcc12/COMMIT_MSG
new file mode 100644
index 0000000000..b44cd46b03
--- /dev/null
+++ b/gcc12/COMMIT_MSG
@@ -0,0 +1,5 @@
+lang/gcc12: Fix build on Darwin for macOS 26.2
+
+Update prepared in wip by Frédéric Fauberteau
+
+It adds patches that fix build on Darwin aarch64 with last macOS SDK (26.2).
diff --git a/gcc12/Makefile b/gcc12/Makefile
index 37868d3d96..67c7b97e88 100644
--- a/gcc12/Makefile
+++ b/gcc12/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2024/06/28 17:55:09 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2025/07/14 16:27:26 wiz Exp $
 
 PKGNAME=	${GCC_PKGNAME}-${GCC12_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc12-libs needs to be bumped to be at least 1 more than the
 ## PKGREVISION of this package!
-PKGREVISION=	1
+#PKGREVISION=	1
 COMMENT=	The GNU Compiler Collection (GCC) - 12.0 Release Series
 
 LANGS=			c
diff --git a/gcc12/Makefile.common b/gcc12/Makefile.common
index 125269d016..f32b61d0e5 100644
--- a/gcc12/Makefile.common
+++ b/gcc12/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2024/07/24 23:01:27 gutteridge Exp $
+# $NetBSD: Makefile.common,v 1.14 2025/12/15 04:39:26 maya Exp $
 # used by lang/gcc12-libjit/Makefile
 
 GCC_PKGNAME=		gcc12
@@ -23,8 +23,6 @@ DISTINFO_FILE=		${.CURDIR}/../../wip/gcc12/distinfo
 MKPIE_SUPPORTED=	no
 CHECK_RELRO_SKIP+=	${GCC_PKGNAME}/lib/*
 
-NOT_FOR_PLATFORM=	Interix-*-*
-
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake makeinfo sed tar:build
 USE_TOOLS.NetBSD+=	gsed
@@ -42,7 +40,6 @@ INFO_FILES=		yes
 CONFIGURE_ARGS+=	--disable-libstdcxx-pch
 
 # error: 'for' loop initial declarations are only allowed in C99 mode
-USE_CC_FEATURES+=	c99
 FORCE_C_STD=		gnu99
 USE_CXX_FEATURES+=	c++11
 FORCE_CXX_STD=		c++11
@@ -57,22 +54,13 @@ CHECK_PORTABILITY_SKIP+=	gcc/configure.orig_dist
 
 .include "options.mk"
 
-# note: homebrew patchset should work for both x86_64 and aarch64, but
-#       may only work up to Sonoma (MacOS v14, Darwin v23)
-# see:  https://formulae.brew.sh/formula/gcc@12
-#
-.if ${OPSYS} == "Darwin" && ${OPSYS_VERSION} < 150000
+.if ${MACHINE_PLATFORM:MDarwin-*-aarch64}
 BUILDLINK_TRANSFORM+=	rm:-nodefaultrpaths
 CONFIGURE_ARGS+=	--disable-darwin-at-rpath
-PATCHFILES=		gcc-12.4.0.diff
-PATCH_SITES=		https://raw.githubusercontent.com/Homebrew/formula-patches/ca7047d/gcc/
+PATCHFILES=		gcc-12.5.0.diff
+PATCH_SITES=		https://ftp.netbsd.org/pub/pkgsrc/misc/maya/
+#PATCH_SITES=		https://raw.githubusercontent.com/Homebrew/formula-patches/ca7047dad38f16fb02eb63bd4447e17d0b68b3bb/gcc/
 PATCH_DIST_STRIP=	-p1
-.elif ${MACHINE_PLATFORM:MDarwin-*-x86_64}
-PATCHFILES=		gcc-12.4.0-Darwin-x86_64.diff
-PATCH_SITES=		ftp://ftp.netbsd.org/pub/pkgsrc/distfiles
-.else # use a distribution patchset to avoid conflicts with above
-PATCHFILES=		gcc-12.4.0-patch-libgcc_config.host
-PATCH_SITES=		ftp://ftp.netbsd.org/pub/pkgsrc/distfiles
 .endif
 
 ## For graphite support.
diff --git a/gcc12/distinfo b/gcc12/distinfo
index babd6676e9..6bd5486c5b 100644
--- a/gcc12/distinfo
+++ b/gcc12/distinfo
@@ -1,20 +1,17 @@
-$NetBSD: distinfo,v 1.10 2024/12/20 09:29:10 jperkin Exp $
+$NetBSD: distinfo,v 1.14 2025/12/15 04:39:26 maya Exp $
 
-BLAKE2s (gcc-12.4.0.diff) = ff17898717cb3781dd802a3376ce9a659df97d7d4a3ec3c4bd26279755ab752b
-SHA512 (gcc-12.4.0.diff) = 1e5df17525c13ff3b79117ffb426726c47a9bbb1ffb8555a75083eff5b2134c728decf765be24e4e0bb21685e60973211e359027e9b90f298e24b501cbc899aa
-Size (gcc-12.4.0.diff) = 667262 bytes
-BLAKE2s (gcc-12.4.0-Darwin-x86_64.diff) = 657396d893235af7940672e6a77e9edc489de194cdb7a654c73bceadad714f05
-SHA512 (gcc-12.4.0-Darwin-x86_64.diff) = 591cb2cff8310ba09babafea39dad87b2ab5431dcd22083df858a6010081a794d78b7d01d3dbda2262e910e3e8f4a63ae492b2fa892f16224e0b916db177f805
-Size (gcc-12.4.0-Darwin-x86_64.diff) = 6489 bytes
-BLAKE2s (gcc-12.4.0-patch-libgcc_config.host) = 7c2643ff3143b619e556dc710bd3993bc523a22f709375fe3ca8e8a8644c77cf
-SHA512 (gcc-12.4.0-patch-libgcc_config.host) = 96fa0f067d382807793a7fcb83036db32b46728bf7a3f5c60dfcbe02712345293bde641c8bbc3edb5c121d1f73c7e72aea15739c57b5e53ff375712c969e843b
-Size (gcc-12.4.0-patch-libgcc_config.host) = 3279 bytes
-BLAKE2s (gcc-12.4.0.tar.xz) = cf7717fff3e77f79f41e2cd298df81b5836e002b5abac1867a1d7d2a55314148
-SHA512 (gcc-12.4.0.tar.xz) = 5bd29402cad2deb5d9388d0236c7146414d77e5b8d5f1c6c941c7a1f47691c3389f08656d5f6e8e2d6717bf2c81f018d326f632fb468f42925b40bd217fc4853
-Size (gcc-12.4.0.tar.xz) = 83377372 bytes
+BLAKE2s (gcc-12.5.0.diff) = 37de4c2df06457eda7e277e776fffb0f7c260c6e920fa73ede252ae70427c3cf
+SHA512 (gcc-12.5.0.diff) = 14f8e682946b37bf4a259dea79782736683bcde387e24877b364e770489bb1a7d1fbb49dc6d7c7b98dcd1aca16c1f98a8b924cfde2fec1a111913d4f13d9ce6c
+Size (gcc-12.5.0.diff) = 664993 bytes
+BLAKE2s (gcc-12.5.0.tar.xz) = 403e8a3b4dc15a2e49f6ebf206d8b4b5d7f3b69d2ebcf6d901addf58ac259991
+SHA512 (gcc-12.5.0.tar.xz) = c76020e4c844b53485502cb8a4e295221c9d37487d66c9f4559031fb14c85de20602e6387310005386cb0ef25e55067d2cfef141423bb445f3b77e7456a23533
+Size (gcc-12.5.0.tar.xz) = 85897368 bytes
 BLAKE2s (isl-0.16.1.tar.bz2) = 01c3fc657326e81414986eb7ede6f73e540b97009745ced125cdf7f4a8d80f61
 SHA512 (isl-0.16.1.tar.bz2) = c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b
 Size (isl-0.16.1.tar.bz2) = 1626446 bytes
+SHA1 (patch-fixincludes_fixincl.x) = b233e8ae9589ee7e40523e7af1d195afc142742b
+SHA1 (patch-fixincludes_inclhack.def) = 6c1a88850153b9de44c62607adeb638cbb9dcbca
+SHA1 (patch-fixincludes_tests_base_math.h) = 2897678edae52784b19398d368f6634189fc8cd0
 SHA1 (patch-gcc_Makefile.in) = a31ddc27f1092cfdf5ac896ca79c8590b5aceb47
 SHA1 (patch-gcc_config.gcc) = 260f187048260e539e928bb04594b6394bb03912
 SHA1 (patch-gcc_config.host) = bf95dd21bfdf79d173e745fbd35c9bb99fdf4087
@@ -30,8 +27,10 @@ SHA1 (patch-gcc_targhooks.cc) = 3bd54b7c3efc310aa2277f33cbd87b4a877cafea
 SHA1 (patch-isl_configure) = 5523c76d95b229b3cd25461b4c2b7af24bf2534e
 SHA1 (patch-libffi_configure) = 919bbe094e3ce547a0186eeaddb20a662595f79a
 SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 89e2dd6aaf2c1f75726f02362d8a8bf7178694ea
+SHA1 (patch-libgcc_config.host) = d40d4d08c807eeff98cc246d1ea756b5b2c749b0
 SHA1 (patch-libgcc_crtstuff.c) = a16d465039de00c195cf0694560140a9c38f3a25
 SHA1 (patch-libgfortran_io_io.h) = d44676239a7f45e42054d24bd5224f43c20055c0
 SHA1 (patch-libquadmath_printf_quadmath-printf.c) = 78e09f1e6d61ee57cee83275093cf46b2335d204
 SHA1 (patch-libquadmath_strtod_strtod__l.c) = 6142c10d34174174cce7f06c37eab04dc431b2dc
 SHA1 (patch-libstdc++-v3_libsupc++_new__opa.cc) = c8169d28f25c57ba89ffe8c9f897313bb8644382
+SHA1 (patch-zlib_zutil.h) = 10ee1a925a6d4c54e92f81402192cb6a21a82c27
diff --git a/gcc12/patches/patch-fixincludes_fixincl.x b/gcc12/patches/patch-fixincludes_fixincl.x
new file mode 100644
index 0000000000..458c8bd816
--- /dev/null
+++ b/gcc12/patches/patch-fixincludes_fixincl.x
@@ -0,0 +1,92 @@
+$NetBSD$
+
+Fix build on Darwin for macOS 26.2.
+
+Patch from https://github.com/markmentovai/gcc/commit/8708938
+fixincludes, Darwin: Handle macOS 15 SDK
+The macOS 15 SDK has declarations that use the _Float16 type in its
+<math.h>, but GCC 12 doesn't support that type in C++ code, support
+having been introduced in b042088 (in GCC 13). Add a fixincludes
+hack to hide these declarations inside #ifndef __cplusplus guards.
+
+--- fixincludes/fixincl.x.orig	2026-02-18 05:39:44.820015042 +0000
++++ fixincludes/fixincl.x
+@@ -2796,6 +2796,46 @@ extern \"C\" {\n\
+ #endif\n",
+     (char*)NULL };
+ 
++
++/* * * * * * * * * * * * * * * * * * * * * * * * * *
++ *
++ *  Description of Darwin_Float16 fix
++ */
++tSCC zDarwin_Float16Name[] =
++     "darwin_float16";
++
++/*
++ *  File name selection pattern
++ */
++tSCC zDarwin_Float16List[] =
++  "math.h\0";
++/*
++ *  Machine/OS name selection pattern
++ */
++tSCC* apzDarwin_Float16Machs[] = {
++        "*-*-darwin*",
++        (const char*)NULL };
++
++/*
++ *  content selection pattern - do fix if pattern found
++ */
++tSCC zDarwin_Float16Select0[] =
++       "^.*(^|[ \t])_Float16[ \t]+__[0-9A-Za-z_]+f16[ \t]*\\([ \t]*_Float16[,) \t].*$";
++
++#define    DARWIN_FLOAT16_TEST_CT  1
++static tTestDesc aDarwin_Float16Tests[] = {
++  { TT_EGREP,    zDarwin_Float16Select0, (regex_t*)NULL }, };
++
++/*
++ *  Fix Command Arguments for Darwin_Float16
++ */
++static const char* apzDarwin_Float16Patch[] = {
++    "format",
++    "#ifndef __cplusplus\n\
++%0\n\
++#endif",
++    (char*)NULL };
++
+ /* * * * * * * * * * * * * * * * * * * * * * * * * *
+  *
+  *  Description of Darwin_Gcc4_Breakage fix
+@@ -10864,9 +10904,9 @@ static const char* apzX11_SprintfPatch[]
+  *
+  *  List of all fixes
+  */
+-#define REGEX_COUNT          304
++#define REGEX_COUNT          305
+ #define MACH_LIST_SIZE_LIMIT 187
+-#define FIX_COUNT            267
++#define FIX_COUNT            268
+ 
+ /*
+  *  Enumerate the fixes
+@@ -10938,6 +10978,7 @@ typedef enum {
+     CXX_UNREADY_FIXIDX,
+     DARWIN_9_LONG_DOUBLE_FUNCS_2_FIXIDX,
+     DARWIN_EXTERNC_FIXIDX,
++    DARWIN_FLOAT16_FIXIDX,
+     DARWIN_GCC4_BREAKAGE_FIXIDX,
+     DARWIN_LL_FUNCS_AVAIL_FIXIDX,
+     DARWIN_LONGJMP_NORETURN_FIXIDX,
+@@ -11472,6 +11513,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
+      DARWIN_EXTERNC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+      aDarwin_ExterncTests,   apzDarwin_ExterncPatch, 0 },
+ 
++  {  zDarwin_Float16Name,    zDarwin_Float16List,
++     apzDarwin_Float16Machs,
++     DARWIN_FLOAT16_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
++     aDarwin_Float16Tests,   apzDarwin_Float16Patch, 0 },
++
+   {  zDarwin_Gcc4_BreakageName,    zDarwin_Gcc4_BreakageList,
+      apzDarwin_Gcc4_BreakageMachs,
+      DARWIN_GCC4_BREAKAGE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
diff --git a/gcc12/patches/patch-fixincludes_inclhack.def b/gcc12/patches/patch-fixincludes_inclhack.def
new file mode 100644
index 0000000000..0f7592c550
--- /dev/null
+++ b/gcc12/patches/patch-fixincludes_inclhack.def
@@ -0,0 +1,36 @@
+$NetBSD$
+
+Fix build on Darwin for macOS 26.2.
+
+Patch from https://github.com/markmentovai/gcc/commit/8708938
+fixincludes, Darwin: Handle macOS 15 SDK
+The macOS 15 SDK has declarations that use the _Float16 type in its
+<math.h>, but GCC 12 doesn't support that type in C++ code, support
+having been introduced in b042088 (in GCC 13). Add a fixincludes
+hack to hide these declarations inside #ifndef __cplusplus guards.
+
+--- fixincludes/inclhack.def.orig	2026-02-17 21:17:12.726549576 +0000
++++ fixincludes/inclhack.def
+@@ -483,6 +483,22 @@ fix = {
+ };
+ 
+ /*
++ * The macOS 15 SDK's <math.h> uses _Float16, which is avialable in gcc 12 for
++ * C, but not C++.
++ */
++fix = {
++  hackname  = darwin_float16;
++  mach      = "*-*-darwin*";
++  files     = math.h;
++  select    = "^.*(^|[ \t])_Float16[ \t]+__[0-9A-Za-z_]+f16[ \t]*\\([ \t]*_Float16[,) \t].*$";
++  c_fix     = format;
++  c_fix_arg = "#ifndef __cplusplus\n"
++              "%0\n"
++              "#endif";
++  test_text = "extern _Float16 __fabsf16(_Float16) __API_AVAILABLE(macos(15.0), ios(18.0), watchos(11.0), tvos(18.0));";
++};
++
++/*
+  * complex.h on AIX 5 and AIX 6 define _Complex_I and I in terms of __I,
+  * which only is provided by AIX xlc C99.
+  */
diff --git a/gcc12/patches/patch-fixincludes_tests_base_math.h b/gcc12/patches/patch-fixincludes_tests_base_math.h
new file mode 100644
index 0000000000..478d5044bc
--- /dev/null
+++ b/gcc12/patches/patch-fixincludes_tests_base_math.h
@@ -0,0 +1,27 @@
+$NetBSD$
+
+Fix build on Darwin for macOS 26.2.
+
+Patch from https://github.com/markmentovai/gcc/commit/8708938
+fixincludes, Darwin: Handle macOS 15 SDK
+The macOS 15 SDK has declarations that use the _Float16 type in its
+<math.h>, but GCC 12 doesn't support that type in C++ code, support
+having been introduced in b042088 (in GCC 13). Add a fixincludes
+hack to hide these declarations inside #ifndef __cplusplus guards.
+
+--- fixincludes/tests/base/math.h.orig	2026-02-17 21:20:00.303296688 +0000
++++ fixincludes/tests/base/math.h
+@@ -30,6 +30,13 @@
+ #endif  /* DARWIN_9_LONG_DOUBLE_FUNCS_2_CHECK */
+ 
+ 
++#if defined( DARWIN_FLOAT16_CHECK )
++#ifndef __cplusplus
++extern _Float16 __fabsf16(_Float16) __API_AVAILABLE(macos(15.0), ios(18.0), watchos(11.0), tvos(18.0));
++#endif
++#endif  /* DARWIN_FLOAT16_CHECK */
++
++
+ #if defined( DARWIN_FLT_EVAL_METHOD_CHECK )
+ #if __FLT_EVAL_METHOD__ == 0 || __FLT_EVAL_METHOD__ == 16
+ #if __FLT_EVAL_METHOD__ == 0 || __FLT_EVAL_METHOD__ == -1 || __FLT_EVAL_METHOD__ == 16
diff --git a/gcc12/patches/patch-gcc_Makefile.in b/gcc12/patches/patch-gcc_Makefile.in
index 4398eb10af..e06c4b35f6 100644
--- a/gcc12/patches/patch-gcc_Makefile.in
+++ b/gcc12/patches/patch-gcc_Makefile.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-gcc_Makefile.in,v 1.1 2022/06/16 15:43:55 adam Exp $
+$NetBSD: patch-gcc_Makefile.in,v 1.2 2025/01/07 19:55:38 riastradh Exp $
 
 Ensure libgcc from this GCC is found before others.  Note that there must
 not be a whitespace between $(LINKER_RPATH_FLAG) and the path.  Otherwise
diff --git a/gcc12/patches/patch-libgcc_config.host b/gcc12/patches/patch-libgcc_config.host
new file mode 100644
index 0000000000..da417b6afb
--- /dev/null
+++ b/gcc12/patches/patch-libgcc_config.host
@@ -0,0 +1,25 @@
+$NetBSD: patch-libgcc_config.host,v 1.3 2024/12/20 09:29:10 jperkin Exp $
+
+This is needed for arm64 to get Out-of-line LSE atomics linked into libgcc.
+libsupc++ fails to link without this, and for arm to build.
+
+--- libgcc/config.host.orig	2021-04-08 04:56:29.805761640 -0700
++++ libgcc/config.host	2022-02-02 04:08:51.653635705 -0800
+@@ -377,6 +377,7 @@
+ aarch64*-*-netbsd*)
+ 	extra_parts="$extra_parts crtfastmath.o"
+ 	tmake_file="${tmake_file} ${cpu_type}/t-aarch64"
++	tmake_file="${tmake_file} ${cpu_type}/t-lse"
+ 	tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm"
+ 	md_unwind_header=aarch64/aarch64-unwind.h
+ 	;;
+@@ -463,7 +464,8 @@
+ 	case ${host} in
+ 	  arm*-*-netbsdelf-*eabi*)
+ 	    tmake_file="${tmake_file} arm/t-netbsd-eabi"
+-	    unwind_header=config/arm/unwind-arm.h
++	    # GCC 7 vs NetBSD/eabi -> avoid arm unwinder
++	    #unwind_header=config/arm/unwind-arm.h
+ 	    ;;
+ 	  *)
+ 	    tmake_file="${tmake_file} arm/t-netbsd t-slibgcc-gld-nover"
diff --git a/gcc12/patches/patch-zlib_zutil.h b/gcc12/patches/patch-zlib_zutil.h
new file mode 100644
index 0000000000..f6a4ebf031
--- /dev/null
+++ b/gcc12/patches/patch-zlib_zutil.h
@@ -0,0 +1,52 @@
+$NetBSD$
+
+Fix build on Darwin for macOS 26.2.
+
+Patch from https://github.com/madler/zlib/commit/4bd9a71
+Remove fdopen #defines in zutil.h.
+fdopen() is not used by zlib anymore. The #defines are vestigial.
+
+--- zlib/zutil.h.orig	2026-02-17 18:13:27.663096470 +0000
++++ zlib/zutil.h
+@@ -130,17 +130,8 @@ extern z_const char * const z_errmsg[10]
+ #  endif
+ #endif
+ 
+-#if defined(MACOS) || defined(TARGET_OS_MAC)
++#if defined(MACOS)
+ #  define OS_CODE  7
+-#  ifndef Z_SOLO
+-#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+-#      include <unix.h> /* for fdopen */
+-#    else
+-#      ifndef fdopen
+-#        define fdopen(fd,mode) NULL /* No fdopen() */
+-#      endif
+-#    endif
+-#  endif
+ #endif
+ 
+ #ifdef __acorn
+@@ -163,22 +154,6 @@ extern z_const char * const z_errmsg[10]
+ #  define OS_CODE 19
+ #endif
+ 
+-#if defined(_BEOS_) || defined(RISCOS)
+-#  define fdopen(fd,mode) NULL /* No fdopen() */
+-#endif
+-
+-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
+-#  if defined(_WIN32_WCE)
+-#    define fdopen(fd,mode) NULL /* No fdopen() */
+-#    ifndef _PTRDIFF_T_DEFINED
+-       typedef int ptrdiff_t;
+-#      define _PTRDIFF_T_DEFINED
+-#    endif
+-#  else
+-#    define fdopen(fd,type)  _fdopen(fd,type)
+-#  endif
+-#endif
+-
+ #if defined(__BORLANDC__) && !defined(MSDOS)
+   #pragma warn -8004
+   #pragma warn -8008
diff --git a/gcc12/version.mk b/gcc12/version.mk
index 7c9e1ec9eb..2625887863 100644
--- a/gcc12/version.mk
+++ b/gcc12/version.mk
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.4 2024/06/28 17:55:09 wiz Exp $
+# $NetBSD: version.mk,v 1.5 2025/07/14 16:27:26 wiz Exp $
 
-GCC12_DIST_VERSION:=	12.4.0
+GCC12_DIST_VERSION:=	12.5.0


Home | Main Index | Thread Index | Old Index