From nobody Fri Aug 02 07:53:32 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WZykh2bSMz5RDXJ; Fri, 02 Aug 2024 07:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZykh1zG9z4ZLy; Fri, 2 Aug 2024 07:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722585212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ubRO0K0zZpS3oXfdNs8OoXHUsS3CIza3kmsTMa2yAqI=; b=vl3Jsq/TuOtgYyBS2RFgW/6B6kDIEPWpAM14nZmGa3MTWCZSWkfT12nuskR+F+6uOCEn7R LRWQg0sT/2HWKQa8fzUMfiwDgl7wMi0lErVJsvbTlUE534/hDrvZ5cOkkbjtsuN/JoZ3RJ xRiRiU0A+SqBaMnzX4IPYRyZOpmQy0DLxb7os7fzcGifPQyn7MbPYhlm4SP0Yr0cuTt9dd DgPVxReJuUlv0bMS+J8Y2TJXzFFgZPwYq7QJwvD8PO+DB70YTaNd4BmjeLI1UBgrBlqQSP eL5LHHHUkuutHBJhiht5JSdlaYNEU5nHaCJU7ykii7MHhEQSvUgKkGlI7tk6+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722585212; a=rsa-sha256; cv=none; b=JHg/m5qz1z0GH75yLwH5vcNGrlE08tFTJkpSbmESmsY5jaPM1rp1l1WdQpRd3wkOoZW0IL L2dEZnzbVCdegVf7QVQWJlMfF9qlzUv0ZXbUf7cD+Yw3ekQuKkvl9LN1eSYLrQeo/+rEvC AL9EjnmThPW1pxo1qypt5XjmYcwHUKv1GNRA/fVfJ0DMzJqOVXV/m3RYEfsNCOIfzA4dvt i0yCE7H+nbbQ3wYevU1FuCnqfIBVWl2Ki5kbYNpRVL0l3mHi6Oh84CB30tiR16Qzn1eNKO uAFTc6a2IgyfRsZm0uQ7w5ILds0unpUpmg7H2E37Rf8lyBZZN/PXc+vxE7u3vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722585212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ubRO0K0zZpS3oXfdNs8OoXHUsS3CIza3kmsTMa2yAqI=; b=DI+5QqagfqUVnltY/eIOshN1NoR+qZIyj1ZCJO+WortLAeFtF0sfK0/7Wr2QDiyjeNkuPo auGamiLYlTuVTCCpi1vV/jpmJJ/xJhbuXPbxOfMnD4MKdl9Spw18ils2eMJycC5n+Jl0HH bmkNQ6s5GYYjEdos4qjIitrcR3h5iqyz97373K1qZmqO711QspOxQDyjbr+Izjg0DnnfeY XgvaACTVq74UiuRpn0hPA+I0F4G1tiK4eAaoTkfHi4o+tS82+bmDQufMA8+NA0y1n7n1YV +ZignvgA72fuJBAChAZsy1QfV+HnsXB06nFibEwtGC+R+abNe5KQ8itrXeUg4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WZykh1bC1zKgD; Fri, 2 Aug 2024 07:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4727rWvL093218; Fri, 2 Aug 2024 07:53:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4727rWnX093215; Fri, 2 Aug 2024 07:53:32 GMT (envelope-from git) Date: Fri, 2 Aug 2024 07:53:32 GMT Message-Id: <202408020753.4727rWnX093215@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 48aefee896d0 - main - devel/binutils: fix build with libc++ 19 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48aefee896d03d9992ff22a8763c4233849415c0 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=48aefee896d03d9992ff22a8763c4233849415c0 commit 48aefee896d03d9992ff22a8763c4233849415c0 Author: Dimitry Andric AuthorDate: 2024-08-01 18:33:37 +0000 Commit: Dimitry Andric CommitDate: 2024-08-02 07:52:10 +0000 devel/binutils: fix build with libc++ 19 As noted in the libc++ 19 release notes [1], std::char_traits<> is now only provided for char, char8_t, char16_t, char32_t and wchar_t, and any instantiation for other types will fail. This causes devel/binutils to fail to compile with clang 19 and libc++ 19, resulting in errors similar to: /usr/include/c++/v1/string:820:42: error: implicit instantiation of undefined template 'std::char_traits' 820 | static_assert(is_same<_CharT, typename traits_type::char_type>::value, | ^ ./stringpool.h:225:35: note: in instantiation of template class 'std::basic_string' requested here 225 | { return this->add_with_length(s.data(), s.size(), copy, pkey); } | ^ stringpool.cc:530:7: note: in instantiation of member function 'gold::Stringpool_template::add' requested here 530 | class Stringpool_template; | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ Upstream binutils has fixed this in commit 5e9091dab88 [2], so import it as a separate patch, until the next version of binutils is released. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals [2] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=5e9091dab88 PR: 280563 Approved by: cy (maintainer) MFH: 2024Q3 --- devel/binutils/files/patch-commit-5e9091dab88 | 108 ++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/devel/binutils/files/patch-commit-5e9091dab88 b/devel/binutils/files/patch-commit-5e9091dab88 new file mode 100644 index 000000000000..49927ebef60c --- /dev/null +++ b/devel/binutils/files/patch-commit-5e9091dab88 @@ -0,0 +1,108 @@ +commit 5e9091dab8858b25210a91d22fbbbfdee9c969ad +Author: Roland McGrath +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 . + (Output_section::add_merge_input_section): Use char16_t and + char32_t for 2- and 4-byte entry size, respectively. + * stringpool.cc: Include . + (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 ++ ++ 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 . ++ (Output_section::add_merge_input_section): Use char16_t and ++ char32_t for 2- and 4-byte entry size, respectively. ++ * stringpool.cc: Include . ++ (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 + + * 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; + + template +-class Output_merge_string; ++class Output_merge_string; + + template +-class Output_merge_string; ++class Output_merge_string; + + #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 + #include + #include ++#include + + #ifdef HAVE_SYS_MMAN_H + #include +@@ -2706,10 +2707,10 @@ Output_section::add_merge_input_section(Relobj* object, unsigned int shndx, + pomb = new Output_merge_string(addralign); + break; + case 2: +- pomb = new Output_merge_string(addralign); ++ pomb = new Output_merge_string(addralign); + break; + case 4: +- pomb = new Output_merge_string(addralign); ++ pomb = new Output_merge_string(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 + #include + #include ++#include + + #include "output.h" + #include "parameters.h" +@@ -527,9 +528,9 @@ template + class Stringpool_template; + + template +-class Stringpool_template; ++class Stringpool_template; + + template +-class Stringpool_template; ++class Stringpool_template; + + } // End namespace gold.