Attachment 237731 Details for Bug 265917 – This patch should address reported regressions.

[patch] This patch should address reported regressions.

binutils-221030.diff (text/plain), 12.34 KB, created by Cy Schubert on 2022-10-30 21:46:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2022-10-30 21:46:12 UTC

Size: 12.34 KB

patch

obsolete

>From fa13ecfa311157c34d1a4f15a9870a1781203e8c Mon Sep 17 00:00:00 2001
>From: Cy Schubert <cy@FreeBSD.org>
>Date: Wed, 17 Aug 2022 11:46:24 -0700
>Subject: [PATCH 1/4] devel/binutils: Update from 2.37 to 2.39
>
>Update our binutils port from 2.37 to 2.39. While at it change the distfile
>from tar.xz to tar.lz, which is 4 MB smaller than the .xz version.
>
>Exp-run PR:	265917
>Exp-run by:	fluffy, antoine
>---
> devel/binutils/Makefile                    |  8 +-
> devel/binutils/distinfo                    |  6 +-
> devel/binutils/files/patch-etc_texi2pod.pl | 11 ---
> devel/binutils/files/patch-gold_gc.h       | 45 -----------
> devel/binutils/pkg-plist                   |  1 +
> devel/binutils/pkg-plist-amd64             | 88 ----------------------
> 6 files changed, 9 insertions(+), 150 deletions(-)
> delete mode 100644 devel/binutils/files/patch-etc_texi2pod.pl
> delete mode 100644 devel/binutils/files/patch-gold_gc.h
>
>diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
>index fc3cd70cd8d2..a7db40351340 100644
>--- a/devel/binutils/Makefile
>+++ b/devel/binutils/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	binutils
>-PORTVERSION=	2.37
>-PORTREVISION=	4
>+PORTVERSION=	2.39
> PORTEPOCH?=	1
> CATEGORIES?=	devel
> MASTER_SITES=	SOURCEWARE/binutils/releases
>@@ -22,7 +21,7 @@ FLAVORS=	native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \
> 		riscv64_none_elf s390x sparc64 riscv32_unknown_elf
> FLAVOR?=	native
> 
>-USES=		bison:alias compiler:env cpe gmake libtool makeinfo perl5 tar:xz
>+USES=		bison:alias compiler:env cpe gmake libtool makeinfo perl5 tar:lz
> USE_PERL5=	build
> CPE_VENDOR=	gnu
> GNU_CONFIGURE=	yes
>@@ -96,8 +95,11 @@ CONFIGURE_ARGS+=	--with-system-zlib \
> 			--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
>diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo
>index 429395053a3a..29906643c282 100644
>--- a/devel/binutils/distinfo
>+++ b/devel/binutils/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1626719973
>-SHA256 (binutils-2.37.tar.xz) = 820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c
>-SIZE (binutils-2.37.tar.xz) = 22916924
>+TIMESTAMP = 1660760045
>+SHA256 (binutils-2.39.tar.lz) = 5ab51668874d8533201b8edd2edb5e5d81d588205c6da300c8919bd7cf8664e8
>+SIZE (binutils-2.39.tar.lz) = 24759528
>diff --git a/devel/binutils/files/patch-etc_texi2pod.pl b/devel/binutils/files/patch-etc_texi2pod.pl
>deleted file mode 100644
>index 456d44cfcdbd..000000000000
>--- a/devel/binutils/files/patch-etc_texi2pod.pl
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- etc/texi2pod.pl.orig	2021-08-30 17:17:09 UTC
>-+++ etc/texi2pod.pl
>-@@ -59,6 +59,8 @@ while ($_ = shift) {
>- 	    $flag = shift;
>- 	}
>-         push (@ipath, $flag);
>-+    } elsif (/^--no-split$/) {
>-+	# ignore option for makeinfo compatibility
>-     } elsif (/^-/) {
>- 	usage();
>-     } else {
>diff --git a/devel/binutils/files/patch-gold_gc.h b/devel/binutils/files/patch-gold_gc.h
>deleted file mode 100644
>index 5430f1897ee5..000000000000
>--- a/devel/binutils/files/patch-gold_gc.h
>+++ /dev/null
>@@ -1,45 +0,0 @@
>-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
>-
>diff --git a/devel/binutils/pkg-plist b/devel/binutils/pkg-plist
>index 2c8766973a3e..71a7c06f83ac 100644
>--- a/devel/binutils/pkg-plist
>+++ b/devel/binutils/pkg-plist
>@@ -100,6 +100,7 @@ man/man1/strip.1.gz
> %%NLS%%share/locale/ja/LC_MESSAGES/gas.mo
> %%NLS%%share/locale/ja/LC_MESSAGES/gprof.mo
> %%NLS%%share/locale/ja/LC_MESSAGES/ld.mo
>+%%NLS%%share/locale/ka/LC_MESSAGES/gprof.mo
> %%NLS%%share/locale/ms/LC_MESSAGES/gprof.mo
> %%NLS%%share/locale/nl/LC_MESSAGES/gprof.mo
> %%NLS%%share/locale/nl/LC_MESSAGES/opcodes.mo
>diff --git a/devel/binutils/pkg-plist-amd64 b/devel/binutils/pkg-plist-amd64
>index 66958eb7482d..b6fc6b18834d 100644
>--- a/devel/binutils/pkg-plist-amd64
>+++ b/devel/binutils/pkg-plist-amd64
>@@ -109,94 +109,6 @@ man/man1/%%BUTARGET%%-windres.1.gz
> %%BUTARGET%%/lib/ldscripts/elf_iamcu.xu
> %%BUTARGET%%/lib/ldscripts/elf_iamcu.xw
> %%BUTARGET%%/lib/ldscripts/elf_iamcu.xwe
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.x
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xbn
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xc
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xce
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xd
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xdc
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xdce
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xde
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xdw
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xdwe
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xe
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xn
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xr
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xs
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xsc
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xsce
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xse
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xsw
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xswe
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xu
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xw
>-%%BUTARGET%%/lib/ldscripts/elf_k1om.xwe
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.x
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xbn
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xc
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xce
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xd
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xdc
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xdce
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xde
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xdw
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xdwe
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xe
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xn
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xr
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xs
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xsc
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xsce
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xse
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xsw
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xswe
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xu
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xw
>-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xwe
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.x
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xbn
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xc
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xce
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xd
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xdc
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xdce
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xde
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xdw
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xdwe
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xe
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xn
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xr
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xs
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xsc
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xsce
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xse
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xsw
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xswe
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xu
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xw
>-%%BUTARGET%%/lib/ldscripts/elf_l1om.xwe
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.x
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xbn
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xc
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xce
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xd
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xdc
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xdce
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xde
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xdw
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xdwe
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xe
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xn
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xr
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xs
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xsc
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xsce
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xse
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xsw
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xswe
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xu
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xw
>-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xwe
> %%BUTARGET%%/lib/ldscripts/elf_x86_64.x
> %%BUTARGET%%/lib/ldscripts/elf_x86_64.xbn
> %%BUTARGET%%/lib/ldscripts/elf_x86_64.xc
>-- 
>2.38.1
>
>
>From d0c7bb9218902a12d2cadee655c1fb2bc57220a7 Mon Sep 17 00:00:00 2001
>From: Cy Schubert <cy@FreeBSD.org>
>Date: Mon, 24 Oct 2022 20:17:11 -0700
>Subject: [PATCH 2/4] sysutils/atf-*: Fix binutils 3.39 build
>
>PR:		265917
>---
> sysutils/atf-master/Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/sysutils/atf-master/Makefile b/sysutils/atf-master/Makefile
>index 8eddf3a53436..05ee5ae767a9 100644
>--- a/sysutils/atf-master/Makefile
>+++ b/sysutils/atf-master/Makefile
>@@ -34,6 +34,8 @@ DESCR?=		${.CURDIR}/pkg-descr
> 
> NO_ARCH=	yes
> 
>+LDFLAGS+=	--no-warn-rwx-segments
>+
> .if !defined(PLAT)
> PLAT=		NONE
> IGNORE=		is a metaport; there is nothing to build
>-- 
>2.38.1
>
>
>From 2a68db05a895a74bbe49bf2c87e382013f0b1fef Mon Sep 17 00:00:00 2001
>From: Cy Schubert <cy@FreeBSD.org>
>Date: Mon, 24 Oct 2022 21:12:09 -0700
>Subject: [PATCH 3/4] multimedia/libxine: Fix binutils 2.39 regression
>
>Fix build under 2.39.
>
>PR:		265917
>Obtained from:	https://www.linuxquestions.org/questions/slackware-14/\
>		regression-on-current-with-xine-lib-4175715727/
>---
> multimedia/libxine/Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
>index e1b4f51622f4..dbbf06d45dae 100644
>--- a/multimedia/libxine/Makefile
>+++ b/multimedia/libxine/Makefile
>@@ -170,6 +170,8 @@ pre-configure-GNUTLS-off:
> 		${WRKSRC}/configure
> 
> post-patch:
>+	@${REINPLACE_CMD} -e '/xine_set_flags/s/XINE_PROTECTED//' \
>+		${WRKSRC}/include/xine.h
> .if ${COMPILER_TYPE} == "clang"
> 	@${REINPLACE_CMD} -e 's|-fno-rename-registers||' \
> 		${WRKSRC}/src/libw32dll/Makefile.in
>-- 
>2.38.1
>
>
>From f51679fbda6ab44b3fafa9257131d9e0f9dc2245 Mon Sep 17 00:00:00 2001
>From: Cy Schubert <cy@FreeBSD.org>
>Date: Tue, 25 Oct 2022 07:16:02 -0700
>Subject: [PATCH 4/4] devel/elf-dissector: Fix binutils 2.39 regression
>
>Fix build with binutils 2.39
>
>PR:		265917
>---
> .../files/patch-src_lib_disassembler_disassembler.cpp | 11 +++++++++++
> 1 file changed, 11 insertions(+)
> create mode 100644 devel/elf-dissector/files/patch-src_lib_disassembler_disassembler.cpp
>
>diff --git a/devel/elf-dissector/files/patch-src_lib_disassembler_disassembler.cpp b/devel/elf-dissector/files/patch-src_lib_disassembler_disassembler.cpp
>new file mode 100644
>index 000000000000..c8af0ae4afce
>--- /dev/null
>+++ b/devel/elf-dissector/files/patch-src_lib_disassembler_disassembler.cpp
>@@ -0,0 +1,11 @@
>+--- src/lib/disassmbler/disassembler.cpp.orig	2021-07-21 03:44:26.000000000 -0700
>++++ src/lib/disassmbler/disassembler.cpp	2022-10-25 07:11:53.794805000 -0700
>+@@ -127,7 +127,7 @@
>+     QString result;
>+     disassembler_ftype disassemble_fn;
>+     disassemble_info info;
>+-    INIT_DISASSEMBLE_INFO(info, &result, qstring_printf);
>++    INIT_DISASSEMBLE_INFO(info, &result, qstring_printf, qstring_printf);
>+ 
>+     info.application_data = this;
>+     info.flavour = bfd_target_elf_flavour;
>-- 
>2.38.1
>

Actions: View | Diff

Attachments on bug 265917: 235978 | 236016 | 237383 | 237731