From nobody Wed Oct 23 18:30:33 2024 X-Original-To: dev-commits-src-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 4XYczs6FF1z5ZX8s; Wed, 23 Oct 2024 18:30:33 +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 4XYczs3xvBz59C1; Wed, 23 Oct 2024 18:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708233; 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=/Xeez4lQSIFqmduMk6VWHNS7QyqwmH3UiT69b1EBm2U=; b=MXY0avOwj+64gPI3GFflv13dJ4sUdZHr3X8dP6o7UvFWL++G0g/BjIcdPa1wUBj1GoKHji P9o77HYWHirSN7eMN8Ssy0tUZIk3Aidc7TwX7KdEIibc9JrMV2Qn2oGmyPtK2Z6gZPtbUV PDeytmdBzIwYOVeZKyifegZ6PAQ0j/lKgHNWsgFgFi9XLRQmaxsIPm89H0C6Wq1reh5eBo k16kuuk0p4L6PuMo+61+7M9F/ZHL3xHdQ6V6nTMLjy9Oop9P8Nkc4ZnrSDkSKMO1s/Uzy2 NO0BEkuSKj4hc4XIE9h0k7ArfaVCjUgQ5L6XX3X7ceyZIfAPPfKQ01hC5bPs7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708233; 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=/Xeez4lQSIFqmduMk6VWHNS7QyqwmH3UiT69b1EBm2U=; b=Nx4AkS94/LxNwhJzmbDmmpkANS8f9CzqZIRO2oK8yEDo9baB2WOZ84yxkCpSg0J66A6aff 7eb3wVsqPe2xYo49/T5oyV8YZ4o0S/kUN/hu2i2lQ3SA39MmGeILCxiN0VLWE8ukDrjNRS yQPPjm8I5RNWzZcH5zdW7x6etbAhw/9nRky/JBS6yspyOf3+8dVBPVg8riK/oay38RsLta lVN/sgfLxECu/8rfw0ADgWG2nHMWQaTrujM7Ba0KtPXm5FYn6LoDXhs/1I3SSaZpKgmfiQ e2b0WmdzPFVX8ko1Qf5P1LGNA9bRM6Ic8Mua4Ogc5elk/hwKGFK3IVrN0BEFbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708233; a=rsa-sha256; cv=none; b=LXn3uaNuYPJl6YuUFQ3UwSvDG7XbRp4v3TDqF7jLZDG9IFHEn9uhJ67s+A2fbUTRShSRYy cdQmnC0MpQGLhImOS5DFPAgqrm909g2YedzZZbiDKm/Rp7Lf6VBjKfU5mEpGYPowAj24iL xhPhHhsYnlsSZa6rjoBCCTD0ME9346VE2UwzU+ur7OnTQRtfS8PDyl8lQ8tTB68mKjAhWH jxJGoxtKP15sIZb0Cs9UlmSViwytiyUoiSCjzsH+iio8bgHbuTisQ1cV1siUiuY43Rbh+I UXYjEULAqAO4TDFoTfHl631GCI1s3h+APvckqkxac4MR7gaZGRHPrrYo7FYnTg== 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 4XYczs2cBtz18RV; Wed, 23 Oct 2024 18:30:33 +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 49NIUXhT069192; Wed, 23 Oct 2024 18:30:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUXxq069189; Wed, 23 Oct 2024 18:30:33 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:33 GMT Message-Id: <202410231830.49NIUXxq069189@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 6b4981df6008 - main - 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-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: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b4981df6008fb59a5b4c1f0b79f0a0b21ac232e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=6b4981df6008fb59a5b4c1f0b79f0a0b21ac232e commit 6b4981df6008fb59a5b4c1f0b79f0a0b21ac232e Author: Dimitry Andric AuthorDate: 2024-08-05 20:08:49 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26: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 --- 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;