CVS commit: pkgsrc/lang/gcc14

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Jul 14 11:16:56 UTC 2025

Modified Files:
        pkgsrc/lang/gcc14: Makefile distinfo
        pkgsrc/lang/gcc14/patches: patch-gcc_targhooks.cc

Log Message:
lang/gcc14: Fix visibility error with -fPIC/-fPIE under NetBSD/i386 9

* Fix build of lang/llvm under NetBSD/i386 9, for example.
* Import from lang/gcc12.
* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc14/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/gcc14/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc14/patches/patch-gcc_targhooks.cc

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

Modified files:

Index: pkgsrc/lang/gcc14/Makefile
diff -u pkgsrc/lang/gcc14/Makefile:1.3 pkgsrc/lang/gcc14/Makefile:1.4
--- pkgsrc/lang/gcc14/Makefile:1.3      Sun Jun  8 07:37:45 2025
+++ pkgsrc/lang/gcc14/Makefile  Mon Jul 14 11:16:56 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2025/06/08 07:37:45 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2025/07/14 11:16:56 ryoon Exp $
 
 PKGNAME=       ${GCC_PKGNAME}-${GCC14_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc14-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) - 14.0 Release Series
 
 LANGS=         c

Index: pkgsrc/lang/gcc14/distinfo
diff -u pkgsrc/lang/gcc14/distinfo:1.9 pkgsrc/lang/gcc14/distinfo:1.10
--- pkgsrc/lang/gcc14/distinfo:1.9      Fri Jun 20 07:05:18 2025
+++ pkgsrc/lang/gcc14/distinfo  Mon Jul 14 11:16:56 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2025/06/20 07:05:18 adam Exp $
+$NetBSD: distinfo,v 1.10 2025/07/14 11:16:56 ryoon Exp $
 
 BLAKE2s (gcc-14.3.0.tar.xz) = 70036c7d07767bba3476d19a6fd52f0b09dc05651c6cf5d136afe18ffa3b63a9
 SHA512 (gcc-14.3.0.tar.xz) = cb4e3259640721bbd275c723fe4df53d12f9b1673afb3db274c22c6aa457865dccf2d6ea20b4fd4c591f6152e6d4b87516c402015900f06ce9d43af66d3b7a93
@@ -71,7 +71,7 @@ SHA1 (patch-gcc_jit_libgccjit.h) = f4c90
 SHA1 (patch-gcc_opts.cc) = 5cebef0db25dc6cfd1d067a934183bda5ab481ee
 SHA1 (patch-gcc_target.def) = 492dd52d713affb9c976a184aac289ef17c4611c
 SHA1 (patch-gcc_target.h) = 8f874ab5b7894285d9ddcbabd23be9517e6775d6
-SHA1 (patch-gcc_targhooks.cc) = 96676212a086a1fe260d36364eab4abc3573e63b
+SHA1 (patch-gcc_targhooks.cc) = 26783d97e8e4240e3a9f4e6c40d0f66916d75115
 SHA1 (patch-gcc_targhooks.h) = 6769cdc38b6a586306f224c4b8bef32b8898cddb
 SHA1 (patch-gcc_testsuite_g++.dg_cpp0x_pr106435-b.cc) = a4d22c5924393b549caea0395e9490dcea356f83
 SHA1 (patch-gcc_testsuite_g++.dg_cpp0x_pr106435.C) = 3a60c331c0039c28b28ca17e97f752e6d1e59095

Index: pkgsrc/lang/gcc14/patches/patch-gcc_targhooks.cc
diff -u pkgsrc/lang/gcc14/patches/patch-gcc_targhooks.cc:1.2 pkgsrc/lang/gcc14/patches/patch-gcc_targhooks.cc:1.3
--- pkgsrc/lang/gcc14/patches/patch-gcc_targhooks.cc:1.2        Sun Jun  8 07:37:45 2025
+++ pkgsrc/lang/gcc14/patches/patch-gcc_targhooks.cc    Mon Jul 14 11:16:56 2025
@@ -1,8 +1,12 @@
-$NetBSD: patch-gcc_targhooks.cc,v 1.2 2025/06/08 07:37:45 wiz Exp $
+$NetBSD: patch-gcc_targhooks.cc,v 1.3 2025/07/14 11:16:56 ryoon Exp $
 
 Support Darwin/aarch64, from https://github.com/Homebrew/formula-patches.
 
---- gcc/targhooks.cc.orig      2025-05-23 11:02:05.072209824 +0000
+Patch from NetBSD src. Fix -fPIC/-fPIE and -fstack-protector-strong/
+-fstack-protector-all causes undefined reference to `__stack_chk_fail_local'
+under NetBSD/i386 9 at least.
+
+--- gcc/targhooks.cc.orig      2025-07-05 02:14:56.999722429 +0000
 +++ gcc/targhooks.cc
 @@ -162,6 +162,15 @@ default_promote_function_mode_always_pro
  }
@@ -49,3 +53,21 @@ Support Darwin/aarch64, from https://git
  void
  hook_void_bitmap (bitmap regs ATTRIBUTE_UNUSED)
  {
+@@ -987,7 +1012,17 @@ default_hidden_stack_protect_fail (void)
+       DECL_ARTIFICIAL (t) = 1;
+       DECL_IGNORED_P (t) = 1;
+       DECL_VISIBILITY_SPECIFIED (t) = 1;
++#if defined(__NetBSD__)
++      /*
++       * This is a hack:
++       * It appears that our gas does not generate @PLT for hidden
++       * symbols. It could be that we need a newer version, or that
++       * this local function is handled differently on linux.
++       */
++      DECL_VISIBILITY (t) = VISIBILITY_DEFAULT;
++#else
+       DECL_VISIBILITY (t) = VISIBILITY_HIDDEN;
++#endif
+ 
+       stack_chk_fail_decl = t;
+     }