Attachment #253125 for bug #281091

Lines 1-6 Link Here

(-)b/lang/gcc13/Makefile (-2 / +1 lines)
1	PORTNAME= gcc	1	PORTNAME= gcc
2	PORTVERSION= 13.2.0	2	PORTVERSION= 13.3.0
3	PORTREVISION= 4
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/gcc13/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1692015565	1	TIMESTAMP = 1724158317
2	SHA256 (gcc-13.2.0.tar.xz) = e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da	2	SHA256 (gcc-13.3.0.tar.xz) = 0845e9621c9543a13f484e94584a49ffc0129970e9914624235fc1d061a0c083
3	SIZE (gcc-13.2.0.tar.xz) = 87858592	3	SIZE (gcc-13.3.0.tar.xz) = 87909952




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	2023-04-26 07:09:40 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>
@@ -243,6 +230,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




--- libcc1/libcc1plugin.cc.orig	2023-07-27 08:13:07 UTC
+++ libcc1/libcc1plugin.cc
@@ -32,6 +32,7 @@
 #undef PACKAGE_VERSION
 
 #define INCLUDE_MEMORY
+#define INCLUDE_VECTOR
 #include "gcc-plugin.h"
 #include "system.h"
 #include "coretypes.h"
@@ -68,8 +69,6 @@
 #include "rpc.hh"
 #include "gcc-c-interface.h"
 #include "context.hh"
-
-#include <vector>
 
 using namespace cc1_plugin;
 




--- libcc1/libcp1plugin.cc.orig	2023-07-27 08:13:07 UTC
+++ libcc1/libcp1plugin.cc
@@ -33,6 +33,7 @@
 #undef PACKAGE_VERSION
 
 #define INCLUDE_MEMORY
+#define INCLUDE_VECTOR
 #include "gcc-plugin.h"
 #include "system.h"
 #include "coretypes.h"
@@ -70,8 +71,6 @@
 #include "marshall-cp.hh"
 #include "rpc.hh"
 #include "context.hh"
-
-#include <vector>
 
 using namespace cc1_plugin;
 
- 

Return to bug 281091

Added Link Here

(-)b/lang/gcc13/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/gcc13/files/patch-gcc_system.h (-42 lines)
1	--- gcc/system.h.orig 2023-04-26 07:09:40 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	@@ -243,6 +230,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

Removed Link Here

(-)a/lang/gcc13/files/patch-libcc1_libcc1plugin.cc (-19 lines)
1	--- libcc1/libcc1plugin.cc.orig 2023-07-27 08:13:07 UTC
2	+++ libcc1/libcc1plugin.cc
3	@@ -32,6 +32,7 @@
4	#undef PACKAGE_VERSION
5
6	#define INCLUDE_MEMORY
7	+#define INCLUDE_VECTOR
8	#include "gcc-plugin.h"
9	#include "system.h"
10	#include "coretypes.h"
11	@@ -68,8 +69,6 @@
12	#include "rpc.hh"
13	#include "gcc-c-interface.h"
14	#include "context.hh"
15	-
16	-#include <vector>
17
18	using namespace cc1_plugin;
19

Removed Link Here

(-)a/lang/gcc13/files/patch-libcc1_libcp1plugin.cc (-20 lines)
1	--- libcc1/libcp1plugin.cc.orig 2023-07-27 08:13:07 UTC
2	+++ libcc1/libcp1plugin.cc
3	@@ -33,6 +33,7 @@
4	#undef PACKAGE_VERSION
5
6	#define INCLUDE_MEMORY
7	+#define INCLUDE_VECTOR
8	#include "gcc-plugin.h"
9	#include "system.h"
10	#include "coretypes.h"
11	@@ -70,8 +71,6 @@
12	#include "marshall-cp.hh"
13	#include "rpc.hh"
14	#include "context.hh"
15	-
16	-#include <vector>
17
18	using namespace cc1_plugin;
19
20	-