From nobody Sat Dec 16 12:18:55 2023 X-Original-To: dev-commits-ports-all@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 4SslW36M8Pz53qwj; Sat, 16 Dec 2023 12:18:55 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SslW34G4Qz4R6x; Sat, 16 Dec 2023 12:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702729135; 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=LUEuvCa5SeXpcKfq0tGSNOj4lARmCpaQPOr8eWytnNs=; b=MMJ1Mqqztb1k6QKS4FddDfcca+i6m6+Bl7aOavQhwTZQCo8hmeIWqmod7vJ7Y/2gPQ2e9y qlWCIPDsSX/G3FUSeG/gYeIac3eU9S43VjnsnvmGc4uAF9wGARtn/wZDLZFvx58yIgwwcS A0YRa5TqSSD3f4zOfqHrtF5+ISpyNetKfechxmGY+Xi4PIeVvfyQX2UC2PX0B3MEgXmReh 5jldg8shkCzm4S046NkwGJp9aL5mW7OrJm+9FSoP+D60DwZ+kR7k+8rUdduO+Hb9zWWaGz xepzhldjAJgT/5+Agb1ssGAYYo2gVp1c/gLvaEIS62pq1GR0MX7iOs2DfYxfmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702729135; a=rsa-sha256; cv=none; b=hP+2PbgLLs41BxliaXtXfdh4mRXss8g7o7CNmrR+RriP77xwYX/2S3u6o9sN7Yk1p7ZwdH Mb1q8PSVXrkpiHAQPwYprJ5tvVNqAQ2Hw/P0UcUPsNUvJpQ+u3+VHi/gEbG43ZcArzpX/0 DN/iXdZFzqevSJwuVVz02QAGGK05lY1XulSd87qMfIrC4/Wq+68tf/9ZkOqa6PgFS1u+BF B6C1mjePsZchLR0tLtDBJ5CORk4rYv2j280K2yuC2vWBotfRfZ9lSfKF+Y2SLmdwNpXfsV EjTrMTrggOfyhtXo1gif3EMKTMyNHtIlKjdJtghCH9SgCLTFR1n26Ka6totFrA== 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=1702729135; 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=LUEuvCa5SeXpcKfq0tGSNOj4lARmCpaQPOr8eWytnNs=; b=OBLS4VIqsJKrPQ00ETAtgTVetoY/FGksaoqd2GGLuhMrBqXchMhd+joNRHR+fksiirkzcn 6M9bjh92SVqX0aGZEVP/2Z3WGeb5DYpzDC7z8dduBkNq+yAFc5vELcIGtNIBaPJXJBRqGk htjYpImr98KxJg1av4tyY9ocPZoyVBsnQ/CvZkeJ7vLFysTfM39t6p/7UZUmiGBHScO+KY M+nQXfJ3QhgVJE+dRgfxskV0MCi6pJr2+myHsm57Dz+pzU3WrkB8L5uQn6tWYnaUWKjUC3 zLd2bz0ZRingPbNAu/OUickM2dOl9sNYk9eQRU5+3RsUWGHRZBVblF0DVH+YWg== 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 4SslW339P6ztYm; Sat, 16 Dec 2023 12:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BGCItU4062052; Sat, 16 Dec 2023 12:18:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BGCItGc062049; Sat, 16 Dec 2023 12:18:55 GMT (envelope-from git) Date: Sat, 16 Dec 2023 12:18:55 GMT Message-Id: <202312161218.3BGCItGc062049@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: 7d3021973352 - main - lang/gcc10: Revert "fix build with clang 17" List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 7d3021973352b3095ab4dfe667f0f64a30a8a6fe Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=7d3021973352b3095ab4dfe667f0f64a30a8a6fe commit 7d3021973352b3095ab4dfe667f0f64a30a8a6fe Author: Dimitry Andric AuthorDate: 2023-12-16 11:38:42 +0000 Commit: Dimitry Andric CommitDate: 2023-12-16 12:16:37 +0000 lang/gcc10: Revert "fix build with clang 17" This reverts commit eb5e0517d2a6e25d43fd03786f526e9043543b47: lang/gcc10: fix build with clang 17 When building lang/gcc10 with recent clang versions, which default to C++17, the following errors are produced: cfns.gperf:35:18: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] 35 | libc_name::hash (register const char *str, register unsigned int len) | ^~~~~~~~ cfns.gperf:35:44: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] 35 | libc_name::hash (register const char *str, register unsigned int len) | ^~~~~~~~ ...many more of these... Upstream fixed this in https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=642dc602f89b2c11d5d833a52f37b04427a27cab, so apply it. I accidentally included a patch for devel/electron25 in this commit. That one will be split off and committed separately. Reported by: Gunther Nikl --- .../patch-base_containers_checked__iterators.h | 75 -------------- lang/gcc10/files/patch-gcc_cp_cfns.h | 111 --------------------- 2 files changed, 186 deletions(-) diff --git a/devel/electron25/files/patch-base_containers_checked__iterators.h b/devel/electron25/files/patch-base_containers_checked__iterators.h deleted file mode 100644 index a5ad942a78cf..000000000000 --- a/devel/electron25/files/patch-base_containers_checked__iterators.h +++ /dev/null @@ -1,75 +0,0 @@ ---- base/containers/checked_iterators.h.orig 2023-08-12 07:07:10 UTC -+++ base/containers/checked_iterators.h -@@ -24,6 +24,9 @@ class CheckedContiguousIterator { - using pointer = T*; - using reference = T&; - using iterator_category = std::random_access_iterator_tag; -+#if __cplusplus >= 202002L -+ using iterator_concept = std::contiguous_iterator_tag; -+#endif - - // Required for converting constructor below. - template -@@ -31,10 +34,8 @@ class CheckedContiguousIterator { - - // Required for certain libc++ algorithm optimizations that are not available - // for NaCl. --#if defined(_LIBCPP_VERSION) && !BUILDFLAG(IS_NACL) - template - friend struct std::pointer_traits; --#endif - - constexpr CheckedContiguousIterator() = default; - -@@ -224,7 +225,6 @@ using CheckedContiguousConstIterator = CheckedContiguo - - } // namespace base - --#if defined(_LIBCPP_VERSION) && !BUILDFLAG(IS_NACL) - // Specialize both std::__is_cpp17_contiguous_iterator and std::pointer_traits - // for CCI in case we compile with libc++ outside of NaCl. The former is - // required to enable certain algorithm optimizations (e.g. std::copy can be a -@@ -242,13 +242,35 @@ using CheckedContiguousConstIterator = CheckedContiguo - // [1] https://wg21.link/iterator.concept.contiguous - // [2] https://wg21.link/std.iterator.tags - // [3] https://wg21.link/pointer.traits.optmem --namespace std { - -+#if defined(_LIBCPP_VERSION) -+ -+// TODO(crbug.com/1284275): Remove when C++20 is on by default, as the use -+// of `iterator_concept` above should suffice. -+_LIBCPP_BEGIN_NAMESPACE_STD -+ -+// TODO(crbug.com/1449299): https://reviews.llvm.org/D150801 renamed this from -+// `__is_cpp17_contiguous_iterator` to `__libcpp_is_contiguous_iterator`. Clean -+// up the old spelling after libc++ rolls. - template -+struct __is_cpp17_contiguous_iterator; -+template - struct __is_cpp17_contiguous_iterator<::base::CheckedContiguousIterator> - : true_type {}; - - template -+struct __libcpp_is_contiguous_iterator; -+template -+struct __libcpp_is_contiguous_iterator<::base::CheckedContiguousIterator> -+ : true_type {}; -+ -+_LIBCPP_END_NAMESPACE_STD -+ -+#endif -+ -+namespace std { -+ -+template - struct pointer_traits<::base::CheckedContiguousIterator> { - using pointer = ::base::CheckedContiguousIterator; - using element_type = T; -@@ -267,6 +289,5 @@ struct pointer_traits<::base::CheckedContiguousIterato - }; - - } // namespace std --#endif - - #endif // BASE_CONTAINERS_CHECKED_ITERATORS_H_ diff --git a/lang/gcc10/files/patch-gcc_cp_cfns.h b/lang/gcc10/files/patch-gcc_cp_cfns.h deleted file mode 100644 index c542619ec0eb..000000000000 --- a/lang/gcc10/files/patch-gcc_cp_cfns.h +++ /dev/null @@ -1,111 +0,0 @@ -commit 642dc602f89b2c11d5d833a52f37b04427a27cab -Author: Marek Polacek -Date: 2020-05-15T23:54:05+02:00 - - c++: Regenerate cp/cfns.h. - - Current cfns.h includes register-qualified variables and that wouldn't - play well when bootstrapping with GCC that uses the C++17 dialect, - because 'register' was removed in C++17. Regenerating it using the - command specified in cfns.h luckily cleaned this up. - - * cfns.h: Regenerated. - ---- gcc/cp/cfns.h.orig 2023-07-07 07:08:19 UTC -+++ gcc/cp/cfns.h -@@ -1,4 +1,4 @@ --/* C++ code produced by gperf version 3.0.4 */ -+/* C++ code produced by gperf version 3.1 */ - /* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ --output-file cfns.h cfns.gperf */ - - #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ -@@ -25,7 +25,7 @@ - && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ - && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) - /* The character set is not based on ISO-646. */ --#error "gperf generated tables don't work with this execution character set. Please report a bug to ." -+#error "gperf generated tables don't work with this execution character set. Please report a bug to ." - #endif - - #line 4 "cfns.gperf" -@@ -54,13 +54,13 @@ class libc_name (private) - class libc_name - { - private: -- static inline unsigned int hash (const char *str, unsigned int len); -+ static inline unsigned int hash (const char *str, size_t len); - public: -- static const struct libc_name_struct *libc_name_p (const char *str, unsigned int len); -+ static const struct libc_name_struct *libc_name_p (const char *str, size_t len); - }; - - inline unsigned int --libc_name::hash (register const char *str, register unsigned int len) -+libc_name::hash (const char *str, size_t len) - { - static const unsigned short asso_values[] = - { -@@ -91,34 +91,34 @@ libc_name::hash (register const char *str, register un - 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, - 1488, 1488, 1488, 1488, 1488, 1488, 1488 - }; -- register int hval = len; -+ unsigned int hval = len; - - switch (hval) - { - default: -- hval += asso_values[(unsigned char)str[5]+1]; -+ hval += asso_values[static_cast(str[5]+1)]; - /*FALLTHROUGH*/ - case 5: -- hval += asso_values[(unsigned char)str[4]]; -+ hval += asso_values[static_cast(str[4])]; - /*FALLTHROUGH*/ - case 4: -- hval += asso_values[(unsigned char)str[3]]; -+ hval += asso_values[static_cast(str[3])]; - /*FALLTHROUGH*/ - case 3: -- hval += asso_values[(unsigned char)str[2]]; -+ hval += asso_values[static_cast(str[2])]; - /*FALLTHROUGH*/ - case 2: -- hval += asso_values[(unsigned char)str[1]+1]; -+ hval += asso_values[static_cast(str[1]+1)]; - /*FALLTHROUGH*/ - case 1: -- hval += asso_values[(unsigned char)str[0]]; -+ hval += asso_values[static_cast(str[0])]; - break; - } -- return hval + asso_values[(unsigned char)str[len - 1]]; -+ return hval + asso_values[static_cast(str[len - 1])]; - } - - const struct libc_name_struct * --libc_name::libc_name_p (register const char *str, register unsigned int len) -+libc_name::libc_name_p (const char *str, size_t len) - { - enum - { -@@ -1116,15 +1116,15 @@ libc_name::libc_name_p (register const char *str, regi - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { -- register int key = hash (str, len); -+ unsigned int key = hash (str, len); - -- if (key <= MAX_HASH_VALUE && key >= 0) -+ if (key <= MAX_HASH_VALUE) - { -- register int index = lookup[key]; -+ int index = lookup[key]; - - if (index >= 0) - { -- register const char *s = wordlist[index].name; -+ const char *s = wordlist[index].name; - - if (*str == *s && !strcmp (str + 1, s + 1)) - return &wordlist[index];