From nobody Sun Dec 1 11:18:35 2024 X-Original-To: dev-commits-src-branches@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 4Y1PYR6Tynz5fTHl; Sun, 01 Dec 2024 11:18:35 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y1PYR4K12z42W9; Sun, 1 Dec 2024 11:18:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733051915; 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=0drbIcQ2hhf3lhJrRcSGqeg3x6PNrnyvW9xC4RFuXiA=; b=t+TZGXF0t89pwxtP/TONPjcDnEFQW9yFawBFqCa/fVKBLQVfBsmSV/dPE1ZQDiT6lrwxbD JGgZLkw8JUCL94oEugir2WWps40mJoFXXAwqyfABK33m/oOnJVtmSJiWiafuZvEtuSYhjE 6QmSTyt+H3+CI5WQjV4PA2QOapIzDPBVl7sFImhCFokF7ufX00KJuOjc9coGXXB9dxB5uq FFd28KmlUfKfZ+4iPxmXBoRs12UM6KANGj6E1iOZH80BsD0b0zgnCk3pjj2vOrIkHiNeAl d9N/PglkIPjEQP3xJmJJVGYEq8pH3AtSfLiEn+bara0KAeqLPX8yb3e2CdH2JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733051915; 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=0drbIcQ2hhf3lhJrRcSGqeg3x6PNrnyvW9xC4RFuXiA=; b=SXOpHrEp/29qbKdM3TRSx9pZ6r8EZW8REaM/UmudADNha76xDb3iSRKHy6gYD+3vCKyZ2p 1JfK8BQY4ieH86EYjNPL19ytGWMHRMUL+qy5ZSxY6M9S+3x2ARfhtk9+nNEYyCM4FiNLLP TyaQ+IK57+iz9Xb/ZWLJ55fAlz/z4cHdZWG/z85DXKMT4562HZQhx/HFHKnNE4tfGMZT4c v0kZVYUmwrQN31jF7EtyScwEFWDjMzYwsKaGqwBaPTqB3WglkTFJWVUTtBPbme6QGaIT5o ngBkLRP70ZgAg3Xenf7LU3qrIGybdH7wphXuwAU2urX6/aa+ol4XSKeToD6oyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733051915; a=rsa-sha256; cv=none; b=UlDsHRWzyj8O3E5D6OqLtOPgdDOGgxZE00zwR1VdpF/ik9MvukksJNHOxDXe+eikjhTH87 jrHcrzLIf/lmvpWuc61/sENYDrfxt533h0LK2dZAiJauC/gg1s26e1CGmWF4QNeDmGXp4Z rXV/7tCDUAFoSCEJFdulS7F1h0S6X/ItKXKKFBx7/TwmyIZxiVu1o/weXD/K0tsdJ7Vt/J r9Cxhud7lMaYcj/SJHG7zAec0wTqqNQfbM3Y+OiJ3nGA+Tl8XS1yChPp/fCDceB7Nr0Len QxFzWSrARh+HicpXOa4UeBiYH9tmVmwjK+RN9pVRhGO1hDDQ6eRlRiw0EbZZ+A== 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 4Y1PYR3jdtzq9y; Sun, 1 Dec 2024 11:18:35 +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 4B1BIZWE007949; Sun, 1 Dec 2024 11:18:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B1BIZuU007946; Sun, 1 Dec 2024 11:18:35 GMT (envelope-from git) Date: Sun, 1 Dec 2024 11:18:35 GMT Message-Id: <202412011118.4B1BIZuU007946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 983d17bc1d75 - stable/14 - libcxx cstdlib, cwchar: avoid using long long functions if not supported, even for older compilers that do not support the using_if_exists attribute. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 983d17bc1d753b0653415da20147080d4d03971b Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=983d17bc1d753b0653415da20147080d4d03971b commit 983d17bc1d753b0653415da20147080d4d03971b Author: Dimitry Andric AuthorDate: 2024-08-05 20:08:49 +0000 Commit: Dimitry Andric CommitDate: 2024-12-01 11:17:08 +0000 libcxx cstdlib, cwchar: avoid using long long functions if not supported, even for older compilers that do not support the using_if_exists attribute. PR: 280562 MFC after: 1 month (cherry picked from commit 6b4981df6008fb59a5b4c1f0b79f0a0b21ac232e) --- contrib/llvm-project/libcxx/include/cstdlib | 12 ++++++++++++ contrib/llvm-project/libcxx/include/cwchar | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/contrib/llvm-project/libcxx/include/cstdlib b/contrib/llvm-project/libcxx/include/cstdlib index c817fd8f4acc..d9e17ee65c56 100644 --- a/contrib/llvm-project/libcxx/include/cstdlib +++ b/contrib/llvm-project/libcxx/include/cstdlib @@ -102,18 +102,26 @@ _LIBCPP_BEGIN_NAMESPACE_STD using ::size_t _LIBCPP_USING_IF_EXISTS; using ::div_t _LIBCPP_USING_IF_EXISTS; using ::ldiv_t _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::lldiv_t _LIBCPP_USING_IF_EXISTS; +#endif using ::atof _LIBCPP_USING_IF_EXISTS; using ::atoi _LIBCPP_USING_IF_EXISTS; using ::atol _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::atoll _LIBCPP_USING_IF_EXISTS; +#endif using ::strtod _LIBCPP_USING_IF_EXISTS; using ::strtof _LIBCPP_USING_IF_EXISTS; using ::strtold _LIBCPP_USING_IF_EXISTS; using ::strtol _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::strtoll _LIBCPP_USING_IF_EXISTS; +#endif using ::strtoul _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::strtoull _LIBCPP_USING_IF_EXISTS; +#endif using ::rand _LIBCPP_USING_IF_EXISTS; using ::srand _LIBCPP_USING_IF_EXISTS; using ::calloc _LIBCPP_USING_IF_EXISTS; @@ -130,10 +138,14 @@ using ::bsearch _LIBCPP_USING_IF_EXISTS; using ::qsort _LIBCPP_USING_IF_EXISTS; using ::abs _LIBCPP_USING_IF_EXISTS; using ::labs _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::llabs _LIBCPP_USING_IF_EXISTS; +#endif using ::div _LIBCPP_USING_IF_EXISTS; using ::ldiv _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::lldiv _LIBCPP_USING_IF_EXISTS; +#endif using ::mblen _LIBCPP_USING_IF_EXISTS; #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS using ::mbtowc _LIBCPP_USING_IF_EXISTS; diff --git a/contrib/llvm-project/libcxx/include/cwchar b/contrib/llvm-project/libcxx/include/cwchar index 08cfac58c846..dd16eaeaa07f 100644 --- a/contrib/llvm-project/libcxx/include/cwchar +++ b/contrib/llvm-project/libcxx/include/cwchar @@ -151,9 +151,13 @@ using ::wcstod _LIBCPP_USING_IF_EXISTS; using ::wcstof _LIBCPP_USING_IF_EXISTS; using ::wcstold _LIBCPP_USING_IF_EXISTS; using ::wcstol _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::wcstoll _LIBCPP_USING_IF_EXISTS; +#endif using ::wcstoul _LIBCPP_USING_IF_EXISTS; +#if defined(__FreeBSD__) && defined(__LONG_LONG_SUPPORTED) using ::wcstoull _LIBCPP_USING_IF_EXISTS; +#endif using ::wcscpy _LIBCPP_USING_IF_EXISTS; using ::wcsncpy _LIBCPP_USING_IF_EXISTS; using ::wcscat _LIBCPP_USING_IF_EXISTS;