Attachment #253123 for bug #281091

Lines 1-6 Link Here

(-)b/lang/gcc11/Makefile (-2 / +1 lines)
1	PORTNAME= gcc	1	PORTNAME= gcc
2	PORTVERSION= 11.4.0	2	PORTVERSION= 11.5.0
3	PORTREVISION= 1
4	CATEGORIES= lang	3	CATEGORIES= lang
5	MASTER_SITES= GCC	4	MASTER_SITES= GCC
6	PKGNAMESUFFIX= ${SUFFIX}	5	PKGNAMESUFFIX= ${SUFFIX}

Lines 1-3 Link Here

(-)b/lang/gcc11/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1692015163	1	TIMESTAMP = 1724163102
2	SHA256 (gcc-11.4.0.tar.xz) = 3f2db222b007e8a4a23cd5ba56726ef08e8b1f1eb2055ee72c1402cea73a8dd9	2	SHA256 (gcc-11.5.0.tar.xz) = a6e21868ead545cf87f0c01f84276e4b5281d672098591c1c896241f09363478
3	SIZE (gcc-11.4.0.tar.xz) = 79837032	3	SIZE (gcc-11.5.0.tar.xz) = 82399864




Enable support for .init_array and .fini_array, which FreeBSD supports
since commit 83aa9cc00c2d83d05a0efe7a1496d8aab4a153bb in the src
repository.

There __FreeBSD_version is 1000009, so we start enabling the support
from __FreeBSD_version == 1000010.
--- gcc/configure.orig	2023-05-11 22:33:34 UTC
+++ gcc/configure
@@ -24214,6 +24214,13 @@ EOF
 #else
 # if defined __sun__ && defined __svr4__
    /* Solaris ld.so.1 supports .init_array/.fini_array since Solaris 8.  */
+# elif defined __FreeBSD__
+#  include <sys/param.h>
+#   if __FreeBSD_version >= 1000010
+     /* FreeBSD supports .init_array/.fini_array since FreeBSD 10.  */
+#   else
+#    error The C library not known to support .init_array/.fini_array
+#   endif
 # else
 #  error The C library not known to support .init_array/.fini_array
 # endif




--- gcc/system.h.orig	2022-04-21 07:58:53 UTC
+++ gcc/system.h
@@ -203,19 +203,6 @@ extern int fprintf_unlocked (FILE *, const char *, ...
 #endif
 #endif
 
-/* There are an extraordinary number of issues with <ctype.h>.
-   The last straw is that it varies with the locale.  Use libiberty's
-   replacement instead.  */
-#include "safe-ctype.h"
-
-#include <sys/types.h>
-
-#include <errno.h>
-
-#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO
-extern int errno;
-#endif
-
 #ifdef __cplusplus
 #if defined (INCLUDE_ALGORITHM) || !defined (HAVE_SWAP_IN_UTILITY)
 # include <algorithm>
@@ -242,6 +229,19 @@ extern int errno;
 # include <new>
 # include <utility>
 # include <type_traits>
+#endif
+
+/* There are an extraordinary number of issues with <ctype.h>.
+   The last straw is that it varies with the locale.  Use libiberty's
+   replacement instead.  */
+#include "safe-ctype.h"
+
+#include <sys/types.h>
+
+#include <errno.h>
+
+#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO
+extern int errno;
 #endif
 
 /* Some of glibc's string inlines cause warnings.  Plus we'd rather
- 

Return to bug 281091

Added Link Here

(-)b/lang/gcc11/files/patch-gcc_configure (+22 lines)
1	Enable support for .init_array and .fini_array, which FreeBSD supports
2	since commit 83aa9cc00c2d83d05a0efe7a1496d8aab4a153bb in the src
3	repository.
4
5	There __FreeBSD_version is 1000009, so we start enabling the support
6	from __FreeBSD_version == 1000010.
7	--- gcc/configure.orig 2023-05-11 22:33:34 UTC
8	+++ gcc/configure
9	@@ -24214,6 +24214,13 @@ EOF
10	#else
11	# if defined __sun__ && defined __svr4__
12	/* Solaris ld.so.1 supports .init_array/.fini_array since Solaris 8. */
13	+# elif defined __FreeBSD__
14	+# include <sys/param.h>
15	+# if __FreeBSD_version >= 1000010
16	+ /* FreeBSD supports .init_array/.fini_array since FreeBSD 10. */
17	+# else
18	+# error The C library not known to support .init_array/.fini_array
19	+# endif
20	# else
21	# error The C library not known to support .init_array/.fini_array
22	# endif

Removed Link Here

(-)a/lang/gcc11/files/patch-gcc_system.h (-43 lines)
1	--- gcc/system.h.orig 2022-04-21 07:58:53 UTC
2	+++ gcc/system.h
3	@@ -203,19 +203,6 @@ extern int fprintf_unlocked (FILE , const char , ...
4	#endif
5	#endif
6
7	-/* There are an extraordinary number of issues with <ctype.h>.
8	- The last straw is that it varies with the locale. Use libiberty's
9	- replacement instead. */
10	-#include "safe-ctype.h"
11	-
12	-#include <sys/types.h>
13	-
14	-#include <errno.h>
15	-
16	-#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO
17	-extern int errno;
18	-#endif
19	-
20	#ifdef __cplusplus
21	#if defined (INCLUDE_ALGORITHM) \|\| !defined (HAVE_SWAP_IN_UTILITY)
22	# include <algorithm>
23	@@ -242,6 +229,19 @@ extern int errno;
24	# include <new>
25	# include <utility>
26	# include <type_traits>
27	+#endif
28	+
29	+/* There are an extraordinary number of issues with <ctype.h>.
30	+ The last straw is that it varies with the locale. Use libiberty's
31	+ replacement instead. */
32	+#include "safe-ctype.h"
33	+
34	+#include <sys/types.h>
35	+
36	+#include <errno.h>
37	+
38	+#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO
39	+extern int errno;
40	#endif
41
42	/* Some of glibc's string inlines cause warnings. Plus we'd rather
43	-