Attachment #236016 for bug #265917




PORTNAME=	binutils
PORTVERSION=	2.39
PORTREVISION=	4
PORTEPOCH?=	1
CATEGORIES?=	devel
MASTER_SITES=	SOURCEWARE/binutils/releases

		riscv64_none_elf s390x sparc64 riscv32_unknown_elf
FLAVOR?=	native

USES=		bison:alias compiler:env cpe gmake libtool makeinfo perl5 tar:lz
USE_PERL5=	build
CPE_VENDOR=	gnu
GNU_CONFIGURE=	yes

			--with-mpfr=${LOCALBASE} \
			--enable-targets=all \
			--enable-threads=yes
# XXX Needed to support gcc10 and earlier:
CONFIGURE_ARGS+=	--with-isa-spec=2.2
INFO=		as \
		binutils \
		ctf-spec \
		gprof \
		bfd \
		ld

Lines 1-3 Link Here

(-)b/devel/binutils/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1626719973	1	TIMESTAMP = 1660760045
2	SHA256 (binutils-2.37.tar.xz) = 820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c	2	SHA256 (binutils-2.39.tar.lz) = 5ab51668874d8533201b8edd2edb5e5d81d588205c6da300c8919bd7cf8664e8
3	SIZE (binutils-2.37.tar.xz) = 22916924	3	SIZE (binutils-2.39.tar.lz) = 24759528

Removed Link Here

(-)a/devel/binutils/files/patch-etc_texi2pod.pl (-11 lines)
1	--- etc/texi2pod.pl.orig 2021-08-30 17:17:09 UTC
2	+++ etc/texi2pod.pl
3	@@ -59,6 +59,8 @@ while ($_ = shift) {
4	$flag = shift;
5	}
6	push (@ipath, $flag);
7	+ } elsif (/^--no-split$/) {
8	+ # ignore option for makeinfo compatibility
9	} elsif (/^-/) {
10	usage();
11	} else {




From 10b4dbbf281397e2827820c715c39559c7f7a29d Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Tue, 20 Jul 2021 18:46:57 +0930
Subject: [PATCH] PR28106, build of 2.37 fails on FreeBSD and Clang

https://en.cppreference.com/w/cpp/types/NULL says NULL might be
defined as nullptr.
https://en.cppreference.com/w/cpp/language/reinterpret_cast says
reinterpret_cast can't be used on nullptr.

	PR gold/28106
	PR gold/27815
	* gc.h (gc_process_relocs): Use static_cast in Section_id constructor.

(cherry picked from commit b97bd976233ee4d43c2fe18f6356e62779cbe82d)
---
 gold/ChangeLog | 6 ++++++
 gold/gc.h      | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git gold/gc.h gold/gc.h
index 6ebd81f3fd0..4a1368f5abe 100644
--- gold/gc.h
+++ gold/gc.h
@@ -247,7 +247,7 @@ gc_process_relocs(
 	      if (is_ordinary) 
 		(*secvec).push_back(Section_id(src_obj, dst_indx));
 	      else
-		(*secvec).push_back(Section_id(reinterpret_cast<Relobj*>(NULL), 0));
+		(*secvec).push_back(Section_id(static_cast<Relobj*>(NULL), 0));
               // If the target of the relocation is an STT_SECTION symbol,
               // make a note of that by storing -1 in the symbol vector.
               if (lsym.get_st_type() == elfcpp::STT_SECTION)
@@ -329,7 +329,7 @@ gc_process_relocs(
               if (is_ordinary && dst_obj != NULL)
 		(*secvec).push_back(Section_id(dst_obj, dst_indx));
 	      else
-		(*secvec).push_back(Section_id(reinterpret_cast<Relobj*>(NULL), 0));
+		(*secvec).push_back(Section_id(static_cast<Relobj*>(NULL), 0));
               (*symvec).push_back(gsym);
 	      (*addendvec).push_back(std::make_pair(
 					static_cast<long long>(symvalue),
-- 
2.32.0


Lines 100-105 man/man1/strip.1.gz Link Here

(-)b/devel/binutils/pkg-plist (-1 / +1 lines)
100	%%NLS%%share/locale/ja/LC_MESSAGES/gas.mo	100	%%NLS%%share/locale/ja/LC_MESSAGES/gas.mo
101	%%NLS%%share/locale/ja/LC_MESSAGES/gprof.mo	101	%%NLS%%share/locale/ja/LC_MESSAGES/gprof.mo
102	%%NLS%%share/locale/ja/LC_MESSAGES/ld.mo	102	%%NLS%%share/locale/ja/LC_MESSAGES/ld.mo
		103	%%NLS%%share/locale/ka/LC_MESSAGES/gprof.mo
103	%%NLS%%share/locale/ms/LC_MESSAGES/gprof.mo	104	%%NLS%%share/locale/ms/LC_MESSAGES/gprof.mo
104	%%NLS%%share/locale/nl/LC_MESSAGES/gprof.mo	105	%%NLS%%share/locale/nl/LC_MESSAGES/gprof.mo
105	%%NLS%%share/locale/nl/LC_MESSAGES/opcodes.mo	106	%%NLS%%share/locale/nl/LC_MESSAGES/opcodes.mo
106	-

Return to bug 265917

Lines 1-6 Link Here

(-)b/devel/binutils/Makefile (-3 / +5 lines)
1	PORTNAME= binutils	1	PORTNAME= binutils
2	PORTVERSION= 2.37	2	PORTVERSION= 2.39
3	PORTREVISION= 4
4	PORTEPOCH?= 1	3	PORTEPOCH?= 1
5	CATEGORIES?= devel	4	CATEGORIES?= devel
6	MASTER_SITES= SOURCEWARE/binutils/releases	5	MASTER_SITES= SOURCEWARE/binutils/releases
Lines 21-27 FLAVORS= native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \ Link Here
21	riscv64_none_elf s390x sparc64 riscv32_unknown_elf	20	riscv64_none_elf s390x sparc64 riscv32_unknown_elf
22	FLAVOR?= native	21	FLAVOR?= native
23		22
24	USES= bison:alias compiler:env cpe gmake libtool makeinfo perl5 tar:xz	23	USES= bison:alias compiler:env cpe gmake libtool makeinfo perl5 tar:lz
25	USE_PERL5= build	24	USE_PERL5= build
26	CPE_VENDOR= gnu	25	CPE_VENDOR= gnu
27	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
Lines 95-102 CONFIGURE_ARGS+= --with-system-zlib \ Link Here
95	--with-mpfr=${LOCALBASE} \	94	--with-mpfr=${LOCALBASE} \
96	--enable-targets=all \	95	--enable-targets=all \
97	--enable-threads=yes	96	--enable-threads=yes
		97	# XXX Needed to support gcc10 and earlier:
		98	CONFIGURE_ARGS+= --with-isa-spec=2.2
98	INFO= as \	99	INFO= as \
99	binutils \	100	binutils \
		101	ctf-spec \
100	gprof \	102	gprof \
101	bfd \	103	bfd \
102	ld	104	ld

Removed Link Here

(-)a/devel/binutils/files/patch-gold_gc.h (-45 lines)
1	From 10b4dbbf281397e2827820c715c39559c7f7a29d Mon Sep 17 00:00:00 2001
2	From: Alan Modra <amodra@gmail.com>
3	Date: Tue, 20 Jul 2021 18:46:57 +0930
4	Subject: [PATCH] PR28106, build of 2.37 fails on FreeBSD and Clang
5
6	https://en.cppreference.com/w/cpp/types/NULL says NULL might be
7	defined as nullptr.
8	https://en.cppreference.com/w/cpp/language/reinterpret_cast says
9	reinterpret_cast can't be used on nullptr.
10
11	PR gold/28106
12	PR gold/27815
13	* gc.h (gc_process_relocs): Use static_cast in Section_id constructor.
14
15	(cherry picked from commit b97bd976233ee4d43c2fe18f6356e62779cbe82d)
16	---
17	gold/ChangeLog \| 6 ++++++
18	gold/gc.h \| 4 ++--
19	2 files changed, 8 insertions(+), 2 deletions(-)
20
21	diff --git gold/gc.h gold/gc.h
22	index 6ebd81f3fd0..4a1368f5abe 100644
23	--- gold/gc.h
24	+++ gold/gc.h
25	@@ -247,7 +247,7 @@ gc_process_relocs(
26	if (is_ordinary)
27	(*secvec).push_back(Section_id(src_obj, dst_indx));
28	else
29	- (secvec).push_back(Section_id(reinterpret_cast<Relobj>(NULL), 0));
30	+ (secvec).push_back(Section_id(static_cast<Relobj>(NULL), 0));
31	// If the target of the relocation is an STT_SECTION symbol,
32	// make a note of that by storing -1 in the symbol vector.
33	if (lsym.get_st_type() == elfcpp::STT_SECTION)
34	@@ -329,7 +329,7 @@ gc_process_relocs(
35	if (is_ordinary && dst_obj != NULL)
36	(*secvec).push_back(Section_id(dst_obj, dst_indx));
37	else
38	- (secvec).push_back(Section_id(reinterpret_cast<Relobj>(NULL), 0));
39	+ (secvec).push_back(Section_id(static_cast<Relobj>(NULL), 0));
40	(*symvec).push_back(gsym);
41	(*addendvec).push_back(std::make_pair(
42	static_cast<long long>(symvalue),
43	--
44	2.32.0
45