From nobody Wed Dec 22 10:05:36 2021 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 E79D21904E5C; Wed, 22 Dec 2021 10:05:39 +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 4JJpqQ2vXGz4YVK; Wed, 22 Dec 2021 10:05:38 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 93A651B5F3; Wed, 22 Dec 2021 10:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BMA5avm091580; Wed, 22 Dec 2021 10:05:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA5ak3091579; Wed, 22 Dec 2021 10:05:36 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:05:36 GMT Message-Id: <202112221005.1BMA5ak3091579@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: 6dba98b9281d - stable/12 - Reapply r329859 (partially, by imp): 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 6dba98b9281d0cedbf96af2dc565b71011181a22 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167539; 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=sg0nbGdrpVr2LKYHYlu8KIUpRQBRC+7+YpKbSpt//UM=; b=HYhlY2F7F7woLX+CA3WegnFCQrlmHfEtib55BW3ICzUw6HZXms+B764oEZwnSeFWdO+o3q CO6Hpn4r1Owf9UlNf1NsMk0cUUy3jNVlTrRBEY3YcbPrU46bzHG5VvazdmtdfA+MiIkOSa 0uR8mY+W7tvSxG7CAJdmTHH9q148uViGQccWt4OSREoKuSmBPS0BBnBipsusW2UnbPnZe2 D3y+4FdlO69+k4lJ2D5XDRVg6B0z6dDK2/lX3eQQHv1QjU+kzZmzUairjwf/WS8bk6Oggj jgqbsTEyvNT8eMYuHk7HychedpbZNyRRh1XPMqcC6bBBnXp/v5H/JKAIj7wHPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167539; a=rsa-sha256; cv=none; b=UHKDwFdNB33fMPbLaPMWTaRkZVGOIXU6u1e+i0GdEjMphwEc7mvTlBzBbe9iGHRM79Taqv hfXBZuwB/lTivFVeBkYPIhFXGf8G11pY/9ZLycrMSWK8NvRNhKSEYojzeBrs35HC2ofhME yrw1uBUUcCnr3m04qLHEfvZWeklGnWph+6tGWWcmI4QrwovRgefKPup8aLtL0kmv7L6V97 r7z2B9PmCbrRLYH55bImEegFREGHu5hhniLHzaIuirm0iTuc4KHEKD++8EiSHDkIxGt2dh EjTJoM5U0JyeCrPhWaCmgCI5UaSAUPHGF3mHYnHPsC7hbkbr66kvDuX4hVaY+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=6dba98b9281d0cedbf96af2dc565b71011181a22 commit 6dba98b9281d0cedbf96af2dc565b71011181a22 Author: Dimitry Andric AuthorDate: 2020-08-06 16:12:13 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 09:58:16 +0000 Reapply r329859 (partially, by imp): Do not include float interfaces when using libsa. We don't support float in the boot loaders, so don't include interfaces for float or double in systems headers. In addition, take the unusual step of spiking double and float to prevent any more accidental seepage. (cherry picked from commit 8630bfad40a427d0ab21d9f051c876480ad15dc2) --- contrib/llvm-project/compiler-rt/lib/builtins/int_types.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/int_types.h b/contrib/llvm-project/compiler-rt/lib/builtins/int_types.h index 705355a4840d..5a4fe97b9fb3 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/int_types.h +++ b/contrib/llvm-project/compiler-rt/lib/builtins/int_types.h @@ -121,6 +121,7 @@ static __inline tu_int make_tu(du_int h, du_int l) { #endif // CRT_HAS_128BIT +#ifndef _STANDALONE typedef union { su_int u; float f; @@ -130,6 +131,7 @@ typedef union { udwords u; double f; } double_bits; +#endif typedef struct { #if _YUGA_LITTLE_ENDIAN @@ -155,6 +157,7 @@ typedef struct { #define HAS_80_BIT_LONG_DOUBLE 0 #endif +#ifndef _STANDALONE typedef union { uqwords u; long double f; @@ -183,4 +186,5 @@ typedef struct { #define COMPLEX_REAL(x) (x).real #define COMPLEX_IMAGINARY(x) (x).imaginary #endif +#endif #endif // INT_TYPES_H