From nobody Sun Dec 1 12:54:07 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 4Y1Rgg73xzz5fZsT; Sun, 01 Dec 2024 12:54:07 +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 4Y1Rgg5G0Hz4P4h; Sun, 1 Dec 2024 12:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733057647; 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=BdSds2PMKCVrYhxl17e1uLdRcDQf1vxm2uXfTFmhKz4=; b=Y4iR0jwENV4qXV6YXwbV7fzAs4K9TudMgb8AVLNdnmto1xiLNivwHB0qhoAn+0sfigyk/e Pb6Fx+KadsbOOjsabh92XcsWXM5j+X6Gvj+u/h8wK11zASij7Y4klPqHDEg0a9YjarULmq O+3lldSR+ezrGn45MIDo/IsFy5OniXK1+pZ8Au/LYl/B7NRkoBHs1djbhUudQra47eno6q qV+JNPylxuPwx8CbH3QDiSFWNX+g6Xw03b8s3okHUz63H8kiYG6ZnAbUOgzl/QwdhLOR2Z h2gbMVv29O0RwGr3waogL3cXFEwQ+tbT9U9PPS5JIVqjDVqtKEKgIoLtBkdANA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733057647; 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=BdSds2PMKCVrYhxl17e1uLdRcDQf1vxm2uXfTFmhKz4=; b=sTT/FYw9l31YDCR4kb5Zf9BLoZZAzKBGfPvttymP03o29Jk76FAQP+s1wCKkUCk+uFyBJL Xw+N7t0nXzsmcvmcmAkSZVpABFGV7Ei88u1ut/48wly8yr1D5Co+pv6tK9AaPpQurfjKwN 35Mt8/oWxocBlQEnfZE7g1y6N9MBqS4Vno6GE6WRrP+9LpnSPYilSdfSVtWLT9RZTgkmUH hXaNCD+dgbUAixsgOzxhlSbFVNwNYJ0uUpTTyAPIOvuBkhkFwnGBlvbrJ+R/dENsJh+i++ kM4+XioSUuQiPmtJXDdnyWOZAzfCcF33Uqau1iq63FcMzDPAoOdkg7MB/QBNCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733057647; a=rsa-sha256; cv=none; b=ItpkIafa/f1ZSem5JsK5P0GcIkx4MP6UG5OttUrShDTtCNrB4++lAVIQbyxQxEGRANeuB3 26xtTv5nAYHSr9p30bAbop8z7g1+JqOO9/o16QJ4oJ5bGTsX+OEFnBQsIOe4P+qLIiTXZ+ y2k2gFSmQ5EhRftkJD8sSXlcSVrODU74FdCX/UDR6qrXEAFyCZVlTuxFMWU9oTUCeNxAPe TYCicPA0zVe8L+rNlCrie+Sqa5RlMSsiK02spWjD6VNkQ5hUjYDyd8JC5eM94S1N1W8+5x qq/QCIqmvepzxQaac9YA32sFk+YlbpTkxq8FAB1ZzMOZxXYpkstxGUEh1HVuKA== 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 4Y1Rgg4kLwztNN; Sun, 1 Dec 2024 12:54:07 +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 4B1Cs7SO093512; Sun, 1 Dec 2024 12:54:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B1Cs7Oa093509; Sun, 1 Dec 2024 12:54:07 GMT (envelope-from git) Date: Sun, 1 Dec 2024 12:54:07 GMT Message-Id: <202412011254.4B1Cs7Oa093509@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: 1a8adfae6409 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 1a8adfae64097d9fce7dab18ccaebd4b19effae3 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1a8adfae64097d9fce7dab18ccaebd4b19effae3 commit 1a8adfae64097d9fce7dab18ccaebd4b19effae3 Author: Dimitry Andric AuthorDate: 2024-08-05 20:08:49 +0000 Commit: Dimitry Andric CommitDate: 2024-12-01 12:32:38 +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;