From nobody Sat Apr 06 20:18:12 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 4VBmrN4w2Tz5HGqJ; Sat, 6 Apr 2024 20:18:12 +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 4VBmrN4FPHz4L0v; Sat, 6 Apr 2024 20:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712434692; 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=Hehrq1n1Co8vCvLEBmAXxQDp2sd+4zQ2drfHevTaHSY=; b=FAv6UaJuv20M+n31s88Y95/mBAs5GPxfPFpWwmEln2Qin4MKiHu9D0Q3N9becpIZx7et9e NqDI66BoAg5SweGuFeMSwCifsrvpuit105L4Zm/eLgHHt+k2DCzFF0XEG9ePPx4ypw2kI/ C/2g3xx4jvC2EBm9hDAkQmzldc4hP09pmOlZ6O/A/wYHICm+XGgcSb3mYV0YDtiMtJ3RyU 3dNECFMxuIJVebpI3kLoyralO0OfNIdj0QB1H1ZUlf4eDLu0b+eKgXLZhZzRW6r6oMcESI M9WmkGm3lHy4L9ZO9wo2kjH9xJP8bUoj5kabUfwmozabOkPPiuXEVF3WAyhNag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712434692; a=rsa-sha256; cv=none; b=q8rYOqsP9ObmrEqykaTh/efe0FiJ0QQKVkZ0XtzedD+1GBbBa3vY9lUp1J28/tQSNJwDmR vKBfX8x6dveQSc/tfII7NdTiJoD2TpaD7beqwOmo3S3/mFIzxprYwsMwyDhnhFrNuWR/2a a+R+x2B6HUvj8HT5ZCqBzW2wTo9ezerEzF599TFB0fBurjjHHWQOVsE8lCvUc+YS1mtPui WTJO+MvEb5/iZmxvcCXoatIloucOibkPA8N4alEhnAlqqwgw8GVF7Oygn/HN8cRVP9xZ7A esE6xeaX53QaO44MN450WOytdj2uIlkp+UJFG5sEup3mkHGUuEffiDbF+i4cgw== 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=1712434692; 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=Hehrq1n1Co8vCvLEBmAXxQDp2sd+4zQ2drfHevTaHSY=; b=d+NkTjOrBLN42eAMHNlScgizMH2ODJWwlOauYyLZmxwBOwl7kGGhb2lmAn12G84qOyXlo1 qFwOAS2KnHMlPMRvNc38rxXGOz1xNjSiCzMGBpalQ483uxTVdqGxbxY4RIn4Ox4DxxUKxt fPciuonwJcos2qyLmN8M/i3sgXcMI6CDBBXSjl8IK+3CIjQ82E8bDVvR7S40vshUVS7N51 Q2Q/S0QdCMarNE+GVlpMZSuJqIQuycInzUOvQtzut25+nCsjSmyZkW9FbcBGGVbAKKUmJT RXBlVdUpSvq37JBaNQkQ2SCzxzyQU4d4FtGOgUrLmzkxy7xq89YAa7Og/5QeBg== 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 4VBmrN3t5KzxrP; Sat, 6 Apr 2024 20:18:12 +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 436KICLb029750; Sat, 6 Apr 2024 20:18:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436KICco029747; Sat, 6 Apr 2024 20:18:12 GMT (envelope-from git) Date: Sat, 6 Apr 2024 20:18:12 GMT Message-Id: <202404062018.436KICco029747@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: 46c59ea9b617 - main - Redo libc++ customizations 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 46c59ea9b61755455ff6bf9f3e7b834e1af634ea Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=46c59ea9b61755455ff6bf9f3e7b834e1af634ea commit 46c59ea9b61755455ff6bf9f3e7b834e1af634ea Author: Dimitry Andric AuthorDate: 2024-01-14 13:20:42 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 20:13:43 +0000 Redo libc++ customizations * Remove osreldate include because _LIBCPP_HAS_NO_GETS has disappeared * Instead, add direct major __FreeBSD__ check for using ::gets declaration * Mark EINTEGRITY values as FreeBSD customization * Reformat _LIBCPP_TYPE_VISIBILITY_DEFAULT customization PR: 276104 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__config | 8 ++------ contrib/llvm-project/libcxx/include/__system_error/errc.h | 4 ++-- contrib/llvm-project/libcxx/include/cstdio | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config index ce4cece198b1..9154be8d8577 100644 --- a/contrib/llvm-project/libcxx/include/__config +++ b/contrib/llvm-project/libcxx/include/__config @@ -486,10 +486,6 @@ _LIBCPP_HARDENING_MODE_DEBUG # include // for __NATIVE_ASCII_F # endif -# ifdef __FreeBSD__ -# include // for __FreeBSD_version -# endif - # ifndef __BYTE_ORDER__ # error \ "Your compiler doesn't seem to define __BYTE_ORDER__, which is required by libc++ to know the endianness of your target platform" @@ -734,8 +730,8 @@ typedef __char32_t char32_t; # define _LIBCPP_TEMPLATE_VIS # endif -# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) && __has_attribute(__type_visibility__) \ - && _LIBCPP_CLANG_VER >= 1500 // FreeBSD customization +# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) && __has_attribute(__type_visibility__) && \ + _LIBCPP_CLANG_VER >= 1500 // FreeBSD customization # define _LIBCPP_TYPE_VISIBILITY_DEFAULT __attribute__((__type_visibility__("default"))) # else # define _LIBCPP_TYPE_VISIBILITY_DEFAULT diff --git a/contrib/llvm-project/libcxx/include/__system_error/errc.h b/contrib/llvm-project/libcxx/include/__system_error/errc.h index a14ec56070c4..b0cdacc5ec1d 100644 --- a/contrib/llvm-project/libcxx/include/__system_error/errc.h +++ b/contrib/llvm-project/libcxx/include/__system_error/errc.h @@ -45,7 +45,7 @@ enum class errc identifier_removed, // EIDRM illegal_byte_sequence, // EILSEQ inappropriate_io_control_operation, // ENOTTY - integrity_check_failed, // EINTEGRITY + integrity_check_failed, // EINTEGRITY // FreeBSD customization interrupted, // EINTR invalid_argument, // EINVAL invalid_seek, // ESPIPE @@ -143,7 +143,7 @@ _LIBCPP_DECLARE_STRONG_ENUM(errc){ illegal_byte_sequence = EILSEQ, inappropriate_io_control_operation = ENOTTY, #ifdef EINTEGRITY - integrity_check_failed = EINTEGRITY, + integrity_check_failed = EINTEGRITY, // FreeBSD customization #endif interrupted = EINTR, invalid_argument = EINVAL, diff --git a/contrib/llvm-project/libcxx/include/cstdio b/contrib/llvm-project/libcxx/include/cstdio index 0a867cec1a38..383655036d5f 100644 --- a/contrib/llvm-project/libcxx/include/cstdio +++ b/contrib/llvm-project/libcxx/include/cstdio @@ -159,7 +159,7 @@ using ::tmpfile _LIBCPP_USING_IF_EXISTS; using ::tmpnam _LIBCPP_USING_IF_EXISTS; using ::getchar _LIBCPP_USING_IF_EXISTS; -#if _LIBCPP_STD_VER <= 11 +#if _LIBCPP_STD_VER <= 11 && !(defined(__FreeBSD__) && __FreeBSD__ >= 13) // FreeBSD customization using ::gets _LIBCPP_USING_IF_EXISTS; #endif using ::scanf _LIBCPP_USING_IF_EXISTS;