Attachment #239535 for bug #268994

Lines 1-5 Link Here

(-)b/devel/binutils/Makefile (-2 / +3 lines)
1	PORTNAME= binutils	1	PORTNAME= binutils
2	PORTVERSION= 2.39	2	PORTVERSION= 2.40
3	PORTEPOCH?= 1	3	PORTEPOCH?= 1
4	CATEGORIES?= devel	4	CATEGORIES?= devel
5	MASTER_SITES= SOURCEWARE/binutils/releases	5	MASTER_SITES= SOURCEWARE/binutils/releases
Lines 102-108 INFO= as \ Link Here
102	ctf-spec \	102	ctf-spec \
103	gprof \	103	gprof \
104	bfd \	104	bfd \
105	ld	105	ld \
		106	sframe-spec
106	.endif	107	.endif
107		108
108	.include <bsd.port.pre.mk>	109	.include <bsd.port.pre.mk>

Lines 1-3 Link Here

(-)b/devel/binutils/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1660760045	1	TIMESTAMP = 1673799644
2	SHA256 (binutils-2.39.tar.lz) = 5ab51668874d8533201b8edd2edb5e5d81d588205c6da300c8919bd7cf8664e8	2	SHA256 (binutils-2.40.tar.lz) = 48e65ecee1bbcf334d7efb4ea8487fe048dea522e5da3bdf7fa42b1ec779ea33
3	SIZE (binutils-2.39.tar.lz) = 24759528	3	SIZE (binutils-2.40.tar.lz) = 24784952




--- gold/testsuite/Makefile.in.orig	2021-07-02 07:48:07 UTC
+++ gold/testsuite/Makefile.in
@@ -9585,9 +9585,9 @@ uninstall-am:
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	cp -f incr_comdat_test_2_v3.o incr_comdat_test_1_tmp.o
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie incr_comdat_test_1.o incr_comdat_test_1_tmp.o
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_1.o: exception_test_1.cc gcctestdir/as
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -c -fpic -Wa,-madd-bnd-prefix -o $@ $<
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -c -fpic -o $@ $<
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_2.o: exception_test_2.cc gcctestdir/as
-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -c -Wa,-madd-bnd-prefix -o $@ $<
+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(CXXCOMPILE) -c -o $@ $<
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_test.stdout: gnu_property_test
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@	$(TEST_READELF) -lhSWn $< >$@
 @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_test: gcctestdir/ld gnu_property_a.o gnu_property_b.o gnu_property_c.o

Lines 23-28 include/ctf.h Link Here

(-)b/devel/binutils/pkg-plist (-2 / +4 lines)
23	include/diagnostics.h	23	include/diagnostics.h
24	include/dis-asm.h	24	include/dis-asm.h
25	%%GOLD%%include/plugin-api.h	25	%%GOLD%%include/plugin-api.h
		26	include/sframe-api.h
		27	include/sframe.h
26	include/symcat.h	28	include/symcat.h
27	%%STATIC%%lib/bfd-plugins/libdep.a	29	%%STATIC%%lib/bfd-plugins/libdep.a
28	%%NO_STATIC%%lib/bfd-plugins/libdep.so	30	%%NO_STATIC%%lib/bfd-plugins/libdep.so
Lines 30-35 lib/libbfd.a Link Here
30	lib/libctf-nobfd.a	32	lib/libctf-nobfd.a
31	lib/libctf.a	33	lib/libctf.a
32	lib/libopcodes.a	34	lib/libopcodes.a
		35	lib/libsframe.a
33	man/man1/addr2line.1.gz	36	man/man1/addr2line.1.gz
34	man/man1/ar.1.gz	37	man/man1/ar.1.gz
35	man/man1/as.1.gz	38	man/man1/as.1.gz
Lines 111-116 man/man1/strip.1.gz Link Here
111	%%NLS%%share/locale/pt_BR/LC_MESSAGES/opcodes.mo	114	%%NLS%%share/locale/pt_BR/LC_MESSAGES/opcodes.mo
112	%%NLS%%share/locale/ro/LC_MESSAGES/bfd.mo	115	%%NLS%%share/locale/ro/LC_MESSAGES/bfd.mo
113	%%NLS%%share/locale/ro/LC_MESSAGES/binutils.mo	116	%%NLS%%share/locale/ro/LC_MESSAGES/binutils.mo
		117	%%NLS%%share/locale/ro/LC_MESSAGES/gold.mo
114	%%NLS%%share/locale/ro/LC_MESSAGES/gprof.mo	118	%%NLS%%share/locale/ro/LC_MESSAGES/gprof.mo
115	%%NLS%%share/locale/ro/LC_MESSAGES/opcodes.mo	119	%%NLS%%share/locale/ro/LC_MESSAGES/opcodes.mo
116	%%NLS%%share/locale/ru/LC_MESSAGES/bfd.mo	120	%%NLS%%share/locale/ru/LC_MESSAGES/bfd.mo
117	-
118	--
119	devel/binutils/Makefile \| 4 +++-	121	devel/binutils/Makefile \| 4 +++-
120	1 file changed, 3 insertions(+), 1 deletion(-)	122	1 file changed, 3 insertions(+), 1 deletion(-)

Lines 1-5 Link Here

(-)b/devel/binutils/Makefile (-2 / +3 lines)
1	PORTNAME= binutils	1	PORTNAME= binutils
2	PORTVERSION= 2.40	2	PORTVERSION= 2.40
		3	PORTREVISION= 1
3	PORTEPOCH?= 1	4	PORTEPOCH?= 1
4	CATEGORIES?= devel	5	CATEGORIES?= devel
5	MASTER_SITES= SOURCEWARE/binutils/releases	6	MASTER_SITES= SOURCEWARE/binutils/releases
Lines 30-36 GNU_CONFIGURE= yes Link Here
30	CONFIGURE_ARGS+= --disable-werror \	31	CONFIGURE_ARGS+= --disable-werror \
31	--enable-deterministic-archives \	32	--enable-deterministic-archives \
32	--with-sysroot=/ \	33	--with-sysroot=/ \
33	--enable-x86-relax-relocations=no	34	--enable-x86-relax-relocations=no \
		35	--with-zstd
34	MAKE_ARGS+= LIBDL=""	36	MAKE_ARGS+= LIBDL=""
35	MAKE_ENV+= ac_cv_func_sbrk=0	37	MAKE_ENV+= ac_cv_func_sbrk=0
36	TEST_TARGET= check	38	TEST_TARGET= check
37	-

Return to bug 268994

Removed Link Here

(-)a/devel/binutils/files/patch-gold_testsuite_Makefile.in (-14 lines)
1	--- gold/testsuite/Makefile.in.orig 2021-07-02 07:48:07 UTC
2	+++ gold/testsuite/Makefile.in
3	@@ -9585,9 +9585,9 @@ uninstall-am:
4	@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ cp -f incr_comdat_test_2_v3.o incr_comdat_test_1_tmp.o
5	@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Wl,--incremental-update -Wl,-z,norelro,-no-pie incr_comdat_test_1.o incr_comdat_test_1_tmp.o
6	@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_1.o: exception_test_1.cc gcctestdir/as
7	-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -fpic -Wa,-madd-bnd-prefix -o $@ $<
8	+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -fpic -o $@ $<
9	@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_2.o: exception_test_2.cc gcctestdir/as
10	-@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -Wa,-madd-bnd-prefix -o $@ $<
11	+@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -o $@ $<
12	@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_test.stdout: gnu_property_test
13	@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_READELF) -lhSWn $< >$@
14	@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@gnu_property_test: gcctestdir/ld gnu_property_a.o gnu_property_b.o gnu_property_c.o