Attachment #253097 for bug #281070




PORTNAME=	binutils
DISTVERSION=	2.43
PORTREVISION=	6
PORTEPOCH?=	1
CATEGORIES?=	devel
MASTER_SITES=	GNU \


BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.so:math/gmp \
		${LOCALBASE}/lib/libmpfr.so:math/mpfr

LIB_DEPENDS=	libzstd.so:archivers/zstd
#TEST_DEPENDS+=	runtest:misc/dejagnu

FLAVORS=	native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \
		avr i386 mingw32 mips mips64 powerpc powerpc64 powerpc64le riscv64 \

FLAVOR?=	native

USES=		bison:alias compiler:env cpe gmake localbase libtool perl5 pkgconfig tar:lz
USE_PERL5=	build
CPE_VENDOR=	gnu
USE_PERL5=	build
GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share

GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=	--disable-werror \
			--enable-deterministic-archives \
			--with-sysroot=/ \
			--enable-x86-relax-relocations=no \
			--with-zstd \
			--enable-default-compressed-debug-sections-algorithm=zstd

MAKE_ARGS+=	LIBDL="" V=1
MAKE_ENV+=	ac_cv_func_sbrk=0


PLIST_SUB+=		SHARED='@comment'
.endif


.if ${FLAVOR} == native
BUREMOVE=	coffdump \
		dlltool \

	${RM} -r ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}
.endif
	${RM} ${STAGEDIR}${PREFIX}/${BUTARGET}/lib/ldscripts/i386bsd.*
	@if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH:H} ] ; then ${RM} -rf ${STAGEDIR}${PREFIX}/${INFO_PATH:H}; fi
	${LN} -fs ../../bin/${BUTARGET}-size ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/size
	${RM} -r ${STAGEDIR}${PREFIX}/lib/bfd-plugins
.endif

Lines 1-3 Link Here

(-)b/devel/binutils/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1673799644	1	TIMESTAMP = 1724602857
2	SHA256 (binutils-2.40.tar.lz) = 48e65ecee1bbcf334d7efb4ea8487fe048dea522e5da3bdf7fa42b1ec779ea33	2	SHA256 (binutils-2.43.tar.lz) = f2cf0ea54ae2a223df27b20915b1624008e06e2f10dc57893f292bbb033e7001
3	SIZE (binutils-2.40.tar.lz) = 24784952	3	SIZE (binutils-2.43.tar.lz) = 27688115





--- bfd/Makefile.in.orig	2023-01-14 03:00:00.000000000 +0300
+++ bfd/Makefile.in	2023-11-27 02:50:29.374411000 +0300
@@ -2046,6 +2046,6 @@
 check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h
+all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
 		config.h
 installdirs: installdirs-recursive
 installdirs-am:
@@ -2113,8 +2113,7 @@
 
 info-am: $(INFO_DEPS)
 

 
--- libctf/Makefile.in.orig	2023-01-14 03:00:00.000000000 +0300
+++ libctf/Makefile.in	2023-11-28 00:05:24.527961000 +0300
@@ -1572,7 +1572,7 @@
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
 check: check-recursive
-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h
+all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
 installdirs: installdirs-recursive
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
@@ -1513,7 +1513,7 @@




--- bfd/elf.c.orig	2023-01-14 00:00:00 UTC
+++ bfd/elf.c
@@ -3870,21 +3870,23 @@ assign_section_numbers (bfd *abfd, struct bfd_link_inf
 	{
 	case SHT_REL:
 	case SHT_RELA:
-	  /* A reloc section which we are treating as a normal BFD
-	     section.  sh_link is the section index of the symbol
-	     table.  sh_info is the section index of the section to
-	     which the relocation entries apply.  We assume that an
-	     allocated reloc section uses the dynamic symbol table
-	     if there is one.  Otherwise we guess the normal symbol
-	     table.  FIXME: How can we be sure?  */
-	  if (d->this_hdr.sh_link == 0 && (sec->flags & SEC_ALLOC) != 0)
+	  /* sh_link is the section index of the symbol table.
+	     sh_info is the section index of the section to which the
+	     relocation entries apply.  */
+	  if (d->this_hdr.sh_link == 0)
 	    {
-	      s = bfd_get_section_by_name (abfd, ".dynsym");
-	      if (s != NULL)
-		d->this_hdr.sh_link = elf_section_data (s)->this_idx;
+	      /* FIXME maybe: If this is a reloc section which we are
+		 treating as a normal section then we likely should
+		 not be assuming its sh_link is .dynsym or .symtab.  */
+	      if ((sec->flags & SEC_ALLOC) != 0)
+		{
+		  s = bfd_get_section_by_name (abfd, ".dynsym");
+		  if (s != NULL)
+		    d->this_hdr.sh_link = elf_section_data (s)->this_idx;
+		}
+	      else
+		d->this_hdr.sh_link = elf_onesymtab (abfd);
 	    }
-	  if (d->this_hdr.sh_link == 0)
-	    d->this_hdr.sh_link = elf_onesymtab (abfd);
 
 	  s = elf_get_reloc_section (sec);
 	  if (s != NULL)




commit 5e9091dab8858b25210a91d22fbbbfdee9c969ad
Author: Roland McGrath <mcgrathr@google.com>
Date:   2023-09-05T12:28:31-07:00

    gold: Use char16_t, char32_t instead of uint16_t, uint32_t as character types
    
    The std::basic_string template type is only specified for
    instantiations using character types.  Newer (LLVM) libc++
    implementations no longer allow non-character integer types
    to be used.
    
    gold/
            * output.cc: Include <uchar.h>.
            (Output_section::add_merge_input_section): Use char16_t and
            char32_t for 2- and 4-byte entry size, respectively.
            * stringpool.cc: Include <uchar.h>.
            (Stringpool_template): Explicitly instantiate for char16_t,
            char32_t instead of uint16_t, uint32_t.
            * merge.cc (Output_merge_string): Likewise.

diff --git gold/ChangeLog gold/ChangeLog
index 93a1125cfed..54fb1c16e17 100644
--- gold/ChangeLog
+++ gold/ChangeLog
@@ -1,3 +1,17 @@
+2023-09-05  Roland McGrath  <mcgrathr@google.com>
+
+	The std::basic_string template type is only specified for
+	instantiations using character types.  Newer (LLVM) libc++
+	implementations no longer allow non-character integer types
+	to be used.
+	* output.cc: Include <uchar.h>.
+	(Output_section::add_merge_input_section): Use char16_t and
+	char32_t for 2- and 4-byte entry size, respectively.
+	* stringpool.cc: Include <uchar.h>.
+	(Stringpool_template): Explicitly instantiate for char16_t,
+	char32_t instead of uint16_t, uint32_t.
+	* merge.cc (Output_merge_string): Likewise.
+
 2023-07-03  Nick Clifton  <nickc@redhat.com>
 
 	* po/gold.pot: Regenerate.
diff --git gold/merge.cc gold/merge.cc
index c12efc9905e..ce31a792443 100644
--- gold/merge.cc
+++ gold/merge.cc
@@ -665,10 +665,10 @@ template
 class Output_merge_string<char>;
 
 template
-class Output_merge_string<uint16_t>;
+class Output_merge_string<char16_t>;
 
 template
-class Output_merge_string<uint32_t>;
+class Output_merge_string<char32_t>;
 
 #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG)
 template
diff --git gold/output.cc gold/output.cc
index a1978eb5f32..6053e4db33d 100644
--- gold/output.cc
+++ gold/output.cc
@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <algorithm>
+#include <uchar.h>
 
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
@@ -2706,10 +2707,10 @@ Output_section::add_merge_input_section(Relobj* object, unsigned int shndx,
 	      pomb = new Output_merge_string<char>(addralign);
 	      break;
 	    case 2:
-	      pomb = new Output_merge_string<uint16_t>(addralign);
+	      pomb = new Output_merge_string<char16_t>(addralign);
 	      break;
 	    case 4:
-	      pomb = new Output_merge_string<uint32_t>(addralign);
+	      pomb = new Output_merge_string<char32_t>(addralign);
 	      break;
 	    default:
 	      return false;
diff --git gold/stringpool.cc gold/stringpool.cc
index a2cd44d5244..b5ac1dd34ca 100644
--- gold/stringpool.cc
+++ gold/stringpool.cc
@@ -25,6 +25,7 @@
 #include <cstring>
 #include <algorithm>
 #include <vector>
+#include <uchar.h>
 
 #include "output.h"
 #include "parameters.h"
@@ -527,9 +528,9 @@ template
 class Stringpool_template<char>;
 
 template
-class Stringpool_template<uint16_t>;
+class Stringpool_template<char16_t>;
 
 template
-class Stringpool_template<uint32_t>;
+class Stringpool_template<char32_t>;
 
 } // End namespace gold.




--- ld/ldlang.c.orig	2023-01-13 16:00:00.000000000 -0800
+++ ld/ldlang.c	2023-05-13 21:48:06.006092000 -0700
@@ -649,7 +649,8 @@
 	 looking at the sections for this file.  */
 
       /* Find the correct node to append this section.  */
-      if (compare_section (sec->spec.sorted, section, (*tree)->section) < 0)
+      if (sec && sec->spec.sorted != none && sec->spec.sorted != by_none
+	  && compare_section (sec->spec.sorted, section, (*tree)->section) < 0)
 	tree = &((*tree)->left);
       else
 	tree = &((*tree)->right);

Lines 4-11 The GNU Binutils are a collection of binary tools. The main ones are: Link Here

(-)b/devel/binutils/pkg-descr (-2 / +2 lines)
4	* as - the GNU assembler.	4	* as - the GNU assembler.
5		5
6	Most of these programs use BFD, the Binary File Descriptor library, to do	6	Most of these programs use BFD, the Binary File Descriptor library, to do
7	low-level manipulation. Many of them also use the opcodes library to assemble	7	low-level manipulation. Many of them also use the opcodes library to
8	and disassemble machine instructions.	8	assemble and disassemble machine instructions.
9		9
10	This port may be used as a replacement for the system binutils and support	10	This port may be used as a replacement for the system binutils and support
11	features from the latest versions of GCC.	11	features from the latest versions of GCC.




include/sframe.h
include/symcat.h
%%SHARED%%lib/bfd-plugins/libdep.so
%%SHARED%%lib/libbfd-2.43.so
lib/libbfd.a
%%SHARED%%lib/libbfd.so
lib/libctf-nobfd.a

%%SHARED%%lib/libctf.so
%%SHARED%%lib/libctf.so.0
%%SHARED%%lib/libctf.so.0.0.0
%%SHARED%%lib/libopcodes-2.43.so
lib/libopcodes.a
%%SHARED%%lib/libopcodes.so
lib/libsframe.a
%%SHARED%%lib/libsframe.so
%%SHARED%%lib/libsframe.so.1
%%SHARED%%lib/libsframe.so.1.0.0
%%INFO%%share/info/ldint.info
share/man/man1/addr2line.1.gz
share/man/man1/ar.1.gz
share/man/man1/as.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/bfd.mo
%%NLS%%share/locale/ka/LC_MESSAGES/gprof.mo
%%NLS%%share/locale/ka/LC_MESSAGES/ld.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

%%NLS%%share/locale/pt_BR/LC_MESSAGES/opcodes.mo
%%NLS%%share/locale/ro/LC_MESSAGES/bfd.mo
%%NLS%%share/locale/ro/LC_MESSAGES/binutils.mo
%%NLS%%share/locale/ro/LC_MESSAGES/gas.mo
%%NLS%%share/locale/ro/LC_MESSAGES/ld.mo
%%NLS%%%%GOLD%%share/locale/ro/LC_MESSAGES/gold.mo
%%NLS%%share/locale/ro/LC_MESSAGES/gprof.mo
%%NLS%%share/locale/ro/LC_MESSAGES/opcodes.mo
- 

Return to bug 281070

Lines 1-6 Link Here

(-)b/devel/binutils/Makefile (-9 / +6 lines)
1	PORTNAME= binutils	1	PORTNAME= binutils
2	DISTVERSION= 2.40	2	DISTVERSION= 2.43
3	PORTREVISION= 6
4	PORTEPOCH?= 1	3	PORTEPOCH?= 1
5	CATEGORIES?= devel	4	CATEGORIES?= devel
6	MASTER_SITES= GNU \	5	MASTER_SITES= GNU \
Lines 17-24 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING3.LIB Link Here
17		16
18	BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.so:math/gmp \	17	BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.so:math/gmp \
19	${LOCALBASE}/lib/libmpfr.so:math/mpfr	18	${LOCALBASE}/lib/libmpfr.so:math/mpfr
20
21	LIB_DEPENDS= libzstd.so:archivers/zstd	19	LIB_DEPENDS= libzstd.so:archivers/zstd
		20	#TEST_DEPENDS+= runtest:misc/dejagnu
22		21
23	FLAVORS= native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \	22	FLAVORS= native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \
24	avr i386 mingw32 mips mips64 powerpc powerpc64 powerpc64le riscv64 \	23	avr i386 mingw32 mips mips64 powerpc powerpc64 powerpc64le riscv64 \
Lines 26-43 FLAVORS= native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \ Link Here
26	FLAVOR?= native	25	FLAVOR?= native
27		26
28	USES= bison:alias compiler:env cpe gmake localbase libtool perl5 pkgconfig tar:lz	27	USES= bison:alias compiler:env cpe gmake localbase libtool perl5 pkgconfig tar:lz
29	USE_PERL5= build
30	CPE_VENDOR= gnu	28	CPE_VENDOR= gnu
31	GNU_CONFIGURE= yes	29	USE_PERL5= build
32	GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
33		30
34	#TEST_DEPENDS+= runtest:misc/dejagnu	31	GNU_CONFIGURE= yes
35	CONFIGURE_ARGS+= --disable-werror \	32	CONFIGURE_ARGS+= --disable-werror \
36	--enable-deterministic-archives \	33	--enable-deterministic-archives \
37	--with-sysroot=/ \	34	--with-sysroot=/ \
38	--enable-x86-relax-relocations=no \	35	--enable-x86-relax-relocations=no \
39	--with-zstd \	36	--with-zstd \
40	--enable-default-compressed-debug-sections-algorithm=zstd	37	--enable-default-compressed-debug-sections-algorithm=zstd
		38
41	MAKE_ARGS+= LIBDL="" V=1	39	MAKE_ARGS+= LIBDL="" V=1
42	MAKE_ENV+= ac_cv_func_sbrk=0	40	MAKE_ENV+= ac_cv_func_sbrk=0
43		41
Lines 102-108 CONFIGURE_ARGS+= --disable-shared Link Here
102	PLIST_SUB+= SHARED='@comment'	100	PLIST_SUB+= SHARED='@comment'
103	.endif	101	.endif
104		102
105
106	.if ${FLAVOR} == native	103	.if ${FLAVOR} == native
107	BUREMOVE= coffdump \	104	BUREMOVE= coffdump \
108	dlltool \	105	dlltool \
Lines 174-180 post-install: Link Here
174	${RM} -r ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}	171	${RM} -r ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}
175	.endif	172	.endif
176	${RM} ${STAGEDIR}${PREFIX}/${BUTARGET}/lib/ldscripts/i386bsd.*	173	${RM} ${STAGEDIR}${PREFIX}/${BUTARGET}/lib/ldscripts/i386bsd.*
177	@if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH:H} ] ; then rm -rf ${STAGEDIR}${PREFIX}/${INFO_PATH:H}; fi	174	@if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH:H} ] ; then ${RM} -rf ${STAGEDIR}${PREFIX}/${INFO_PATH:H}; fi
178	${LN} -fs ../../bin/${BUTARGET}-size ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/size	175	${LN} -fs ../../bin/${BUTARGET}-size ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/size
179	${RM} -r ${STAGEDIR}${PREFIX}/lib/bfd-plugins	176	${RM} -r ${STAGEDIR}${PREFIX}/lib/bfd-plugins
180	.endif	177	.endif

Lines 2-17 From: firk <firk@cantconnect.ru> Link Here

(-)b/devel/binutils/files/extra-patch-no-info (-8 / +7 lines)
2		2
3	--- bfd/Makefile.in.orig 2023-01-14 03:00:00.000000000 +0300	3	--- bfd/Makefile.in.orig 2023-01-14 03:00:00.000000000 +0300
4	+++ bfd/Makefile.in 2023-11-27 02:50:29.374411000 +0300	4	+++ bfd/Makefile.in 2023-11-27 02:50:29.374411000 +0300
5	@@ -2053,7 +2053,7 @@	5	@@ -2046,6 +2046,6 @@
6	check-am: all-am	6	check-am: all-am
7	check: $(BUILT_SOURCES)	7	check: $(BUILT_SOURCES)
8	$(MAKE) $(AM_MAKEFLAGS) check-recursive	8	$(MAKE) $(AM_MAKEFLAGS) check-recursive
9	-all-am: Makefile $(INFO_DEPS) $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) \	9	-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h
10	+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) \	10	+all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
11	config.h
12	installdirs: installdirs-recursive	11	installdirs: installdirs-recursive
13	installdirs-am:	12	installdirs-am:
14	@@ -2122,8 +2122,7 @@	13	@@ -2113,8 +2113,7 @@
15		14
16	info-am: $(INFO_DEPS)	15	info-am: $(INFO_DEPS)
17		16
Lines 112-124 From: firk <firk@cantconnect.ru> Link Here
112		111
113	--- libctf/Makefile.in.orig 2023-01-14 03:00:00.000000000 +0300	112	--- libctf/Makefile.in.orig 2023-01-14 03:00:00.000000000 +0300
114	+++ libctf/Makefile.in 2023-11-28 00:05:24.527961000 +0300	113	+++ libctf/Makefile.in 2023-11-28 00:05:24.527961000 +0300
115	@@ -1449,7 +1449,7 @@	114	@@ -1572,7 +1572,7 @@
116	check-am: all-am	115	check-am: all-am
117	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU	116	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
118	check: check-am	117	check: check-recursive
119	-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h	118	-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS) config.h
120	+all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h	119	+all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
121	installdirs:	120	installdirs: installdirs-recursive
122	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)"; do \	121	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)"; do \
123	test -z "$$dir" \|\| $(MKDIR_P) "$$dir"; \	122	test -z "$$dir" \|\| $(MKDIR_P) "$$dir"; \
124	@@ -1513,7 +1513,7 @@	123	@@ -1513,7 +1513,7 @@

Removed Link Here

(-)a/devel/binutils/files/patch-bfd_elf.c (-39 lines)
1	--- bfd/elf.c.orig 2023-01-14 00:00:00 UTC
2	+++ bfd/elf.c
3	@@ -3870,21 +3870,23 @@ assign_section_numbers (bfd *abfd, struct bfd_link_inf
4	{
5	case SHT_REL:
6	case SHT_RELA:
7	- /* A reloc section which we are treating as a normal BFD
8	- section. sh_link is the section index of the symbol
9	- table. sh_info is the section index of the section to
10	- which the relocation entries apply. We assume that an
11	- allocated reloc section uses the dynamic symbol table
12	- if there is one. Otherwise we guess the normal symbol
13	- table. FIXME: How can we be sure? */
14	- if (d->this_hdr.sh_link == 0 && (sec->flags & SEC_ALLOC) != 0)
15	+ /* sh_link is the section index of the symbol table.
16	+ sh_info is the section index of the section to which the
17	+ relocation entries apply. */
18	+ if (d->this_hdr.sh_link == 0)
19	{
20	- s = bfd_get_section_by_name (abfd, ".dynsym");
21	- if (s != NULL)
22	- d->this_hdr.sh_link = elf_section_data (s)->this_idx;
23	+ /* FIXME maybe: If this is a reloc section which we are
24	+ treating as a normal section then we likely should
25	+ not be assuming its sh_link is .dynsym or .symtab. */
26	+ if ((sec->flags & SEC_ALLOC) != 0)
27	+ {
28	+ s = bfd_get_section_by_name (abfd, ".dynsym");
29	+ if (s != NULL)
30	+ d->this_hdr.sh_link = elf_section_data (s)->this_idx;
31	+ }
32	+ else
33	+ d->this_hdr.sh_link = elf_onesymtab (abfd);
34	}
35	- if (d->this_hdr.sh_link == 0)
36	- d->this_hdr.sh_link = elf_onesymtab (abfd);
37
38	s = elf_get_reloc_section (sec);
39	if (s != NULL)

Removed Link Here

(-)a/devel/binutils/files/patch-commit-5e9091dab88 (-108 lines)
1	commit 5e9091dab8858b25210a91d22fbbbfdee9c969ad
2	Author: Roland McGrath <mcgrathr@google.com>
3	Date: 2023-09-05T12:28:31-07:00
4
5	gold: Use char16_t, char32_t instead of uint16_t, uint32_t as character types
6
7	The std::basic_string template type is only specified for
8	instantiations using character types. Newer (LLVM) libc++
9	implementations no longer allow non-character integer types
10	to be used.
11
12	gold/
13	* output.cc: Include <uchar.h>.
14	(Output_section::add_merge_input_section): Use char16_t and
15	char32_t for 2- and 4-byte entry size, respectively.
16	* stringpool.cc: Include <uchar.h>.
17	(Stringpool_template): Explicitly instantiate for char16_t,
18	char32_t instead of uint16_t, uint32_t.
19	* merge.cc (Output_merge_string): Likewise.
20
21	diff --git gold/ChangeLog gold/ChangeLog
22	index 93a1125cfed..54fb1c16e17 100644
23	--- gold/ChangeLog
24	+++ gold/ChangeLog
25	@@ -1,3 +1,17 @@
26	+2023-09-05 Roland McGrath <mcgrathr@google.com>
27	+
28	+ The std::basic_string template type is only specified for
29	+ instantiations using character types. Newer (LLVM) libc++
30	+ implementations no longer allow non-character integer types
31	+ to be used.
32	+ * output.cc: Include <uchar.h>.
33	+ (Output_section::add_merge_input_section): Use char16_t and
34	+ char32_t for 2- and 4-byte entry size, respectively.
35	+ * stringpool.cc: Include <uchar.h>.
36	+ (Stringpool_template): Explicitly instantiate for char16_t,
37	+ char32_t instead of uint16_t, uint32_t.
38	+ * merge.cc (Output_merge_string): Likewise.
39	+
40	2023-07-03 Nick Clifton <nickc@redhat.com>
41
42	* po/gold.pot: Regenerate.
43	diff --git gold/merge.cc gold/merge.cc
44	index c12efc9905e..ce31a792443 100644
45	--- gold/merge.cc
46	+++ gold/merge.cc
47	@@ -665,10 +665,10 @@ template
48	class Output_merge_string<char>;
49
50	template
51	-class Output_merge_string<uint16_t>;
52	+class Output_merge_string<char16_t>;
53
54	template
55	-class Output_merge_string<uint32_t>;
56	+class Output_merge_string<char32_t>;
57
58	#if defined(HAVE_TARGET_32_LITTLE) \|\| defined(HAVE_TARGET_32_BIG)
59	template
60	diff --git gold/output.cc gold/output.cc
61	index a1978eb5f32..6053e4db33d 100644
62	--- gold/output.cc
63	+++ gold/output.cc
64	@@ -29,6 +29,7 @@
65	#include <unistd.h>
66	#include <sys/stat.h>
67	#include <algorithm>
68	+#include <uchar.h>
69
70	#ifdef HAVE_SYS_MMAN_H
71	#include <sys/mman.h>
72	@@ -2706,10 +2707,10 @@ Output_section::add_merge_input_section(Relobj* object, unsigned int shndx,
73	pomb = new Output_merge_string<char>(addralign);
74	break;
75	case 2:
76	- pomb = new Output_merge_string<uint16_t>(addralign);
77	+ pomb = new Output_merge_string<char16_t>(addralign);
78	break;
79	case 4:
80	- pomb = new Output_merge_string<uint32_t>(addralign);
81	+ pomb = new Output_merge_string<char32_t>(addralign);
82	break;
83	default:
84	return false;
85	diff --git gold/stringpool.cc gold/stringpool.cc
86	index a2cd44d5244..b5ac1dd34ca 100644
87	--- gold/stringpool.cc
88	+++ gold/stringpool.cc
89	@@ -25,6 +25,7 @@
90	#include <cstring>
91	#include <algorithm>
92	#include <vector>
93	+#include <uchar.h>
94
95	#include "output.h"
96	#include "parameters.h"
97	@@ -527,9 +528,9 @@ template
98	class Stringpool_template<char>;
99
100	template
101	-class Stringpool_template<uint16_t>;
102	+class Stringpool_template<char16_t>;
103
104	template
105	-class Stringpool_template<uint32_t>;
106	+class Stringpool_template<char32_t>;
107
108	} // End namespace gold.

Removed Link Here

(-)a/devel/binutils/files/patch-ld_ldlang.c (-12 lines)
1	--- ld/ldlang.c.orig 2023-01-13 16:00:00.000000000 -0800
2	+++ ld/ldlang.c 2023-05-13 21:48:06.006092000 -0700
3	@@ -649,7 +649,8 @@
4	looking at the sections for this file. */
5
6	/* Find the correct node to append this section. */
7	- if (compare_section (sec->spec.sorted, section, (*tree)->section) < 0)
8	+ if (sec && sec->spec.sorted != none && sec->spec.sorted != by_none
9	+ && compare_section (sec->spec.sorted, section, (*tree)->section) < 0)
10	tree = &((*tree)->left);
11	else
12	tree = &((*tree)->right);

Lines 28-34 include/sframe-api.h Link Here

(-)b/devel/binutils/pkg-plist (-5 / +9 lines)
28	include/sframe.h	28	include/sframe.h
29	include/symcat.h	29	include/symcat.h
30	%%SHARED%%lib/bfd-plugins/libdep.so	30	%%SHARED%%lib/bfd-plugins/libdep.so
31	%%SHARED%%lib/libbfd-2.40.so	31	%%SHARED%%lib/libbfd-2.43.so
32	lib/libbfd.a	32	lib/libbfd.a
33	%%SHARED%%lib/libbfd.so	33	%%SHARED%%lib/libbfd.so
34	lib/libctf-nobfd.a	34	lib/libctf-nobfd.a
Lines 39-51 lib/libctf.a Link Here
39	%%SHARED%%lib/libctf.so	39	%%SHARED%%lib/libctf.so
40	%%SHARED%%lib/libctf.so.0	40	%%SHARED%%lib/libctf.so.0
41	%%SHARED%%lib/libctf.so.0.0.0	41	%%SHARED%%lib/libctf.so.0.0.0
42	%%SHARED%%lib/libopcodes-2.40.so	42	%%SHARED%%lib/libopcodes-2.43.so
43	lib/libopcodes.a	43	lib/libopcodes.a
44	%%SHARED%%lib/libopcodes.so	44	%%SHARED%%lib/libopcodes.so
45	lib/libsframe.a	45	lib/libsframe.a
46	%%SHARED%%lib/libsframe.so	46	%%SHARED%%lib/libsframe.so
47	%%SHARED%%lib/libsframe.so.0	47	%%SHARED%%lib/libsframe.so.1
48	%%SHARED%%lib/libsframe.so.0.0.0	48	%%SHARED%%lib/libsframe.so.1.0.0
		49	%%INFO%%share/info/ldint.info
49	share/man/man1/addr2line.1.gz	50	share/man/man1/addr2line.1.gz
50	share/man/man1/ar.1.gz	51	share/man/man1/ar.1.gz
51	share/man/man1/as.1.gz	52	share/man/man1/as.1.gz
Lines 116-122 share/man/man1/strip.1.gz Link Here
116	%%NLS%%share/locale/ja/LC_MESSAGES/gas.mo	117	%%NLS%%share/locale/ja/LC_MESSAGES/gas.mo
117	%%NLS%%share/locale/ja/LC_MESSAGES/gprof.mo	118	%%NLS%%share/locale/ja/LC_MESSAGES/gprof.mo
118	%%NLS%%share/locale/ja/LC_MESSAGES/ld.mo	119	%%NLS%%share/locale/ja/LC_MESSAGES/ld.mo
		120	%%NLS%%share/locale/ka/LC_MESSAGES/bfd.mo
119	%%NLS%%share/locale/ka/LC_MESSAGES/gprof.mo	121	%%NLS%%share/locale/ka/LC_MESSAGES/gprof.mo
		122	%%NLS%%share/locale/ka/LC_MESSAGES/ld.mo
120	%%NLS%%share/locale/ms/LC_MESSAGES/gprof.mo	123	%%NLS%%share/locale/ms/LC_MESSAGES/gprof.mo
121	%%NLS%%share/locale/nl/LC_MESSAGES/gprof.mo	124	%%NLS%%share/locale/nl/LC_MESSAGES/gprof.mo
122	%%NLS%%share/locale/nl/LC_MESSAGES/opcodes.mo	125	%%NLS%%share/locale/nl/LC_MESSAGES/opcodes.mo
Lines 127-132 share/man/man1/strip.1.gz Link Here
127	%%NLS%%share/locale/pt_BR/LC_MESSAGES/opcodes.mo	130	%%NLS%%share/locale/pt_BR/LC_MESSAGES/opcodes.mo
128	%%NLS%%share/locale/ro/LC_MESSAGES/bfd.mo	131	%%NLS%%share/locale/ro/LC_MESSAGES/bfd.mo
129	%%NLS%%share/locale/ro/LC_MESSAGES/binutils.mo	132	%%NLS%%share/locale/ro/LC_MESSAGES/binutils.mo
		133	%%NLS%%share/locale/ro/LC_MESSAGES/gas.mo
		134	%%NLS%%share/locale/ro/LC_MESSAGES/ld.mo
130	%%NLS%%%%GOLD%%share/locale/ro/LC_MESSAGES/gold.mo	135	%%NLS%%%%GOLD%%share/locale/ro/LC_MESSAGES/gold.mo
131	%%NLS%%share/locale/ro/LC_MESSAGES/gprof.mo	136	%%NLS%%share/locale/ro/LC_MESSAGES/gprof.mo
132	%%NLS%%share/locale/ro/LC_MESSAGES/opcodes.mo	137	%%NLS%%share/locale/ro/LC_MESSAGES/opcodes.mo
133	-