From nobody Wed Dec 22 10:05:34 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 EA648190500E; 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 4JJpqM6ZqDz4YPl; Wed, 22 Dec 2021 10:05:35 +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 408371B071; Wed, 22 Dec 2021 10:05:34 +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 1BMA5YLB091526; Wed, 22 Dec 2021 10:05:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA5YVo091525; Wed, 22 Dec 2021 10:05:34 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:05:34 GMT Message-Id: <202112221005.1BMA5YVo091525@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: 4184d83296df - stable/12 - Undo r230021 again, further shrinking the diff against upstream. 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: 4184d83296dfcec12e3fae94870715b968e8cf83 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167537; 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=9t+Rg6oxNnvJD02GQPuSPZwerqR6x5YlhLaaMqI0AEA=; b=CG2egdM9jGptEVb0xRnvTFdSNLrOX9JrMuDFvPeDyOxT5bQEDbDMgTJz6AE123H5PeFgUm WLkZfUwvVfeNu8sGNC4hisXfPDwGBQ+AFQPSPqa9lrJmo1NtXZARf7MC8pPR6BhlF6rR17 gr24GxZYm6F2JISUOUbFY8L2w13qL76QE5ordaXYzP4of9qOvHOvsnSnwgnhQM7TSW/Ruo zMhET0R5UccsFLZJDRcPogiQKpl1bP8Yn2pRSNIjQquVNfKCkoR9mcBj/15+7C7UPgSeHE NmXPfUI1APlk7Q5aCewju//TYvZz0rJU2I+ynYbmhZWYfJBzEOn+P8FvcZpbSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167537; a=rsa-sha256; cv=none; b=IkHZFksEgDKSJPB8Udmn/PSeeuCnvlw2ImMVVVb+vPukSlig6/K+7cDZG4kGXsm+kcqo3W vivHV5/4avumetfhXRBCbKnZ3diXjkrckEY8fNDYL7wjXoRMjMs7UB1JRfC1tmRSjHn9Wy S71DEx1xRor02T636GQ7XMIcbHWPOxaLqmTEAgr4guQO5IEelnKp56NdH6xYXSCk1hrrSB DLxtlLcI0+Ibu3Xajw/q2tHi9J8UVhA2pr2QYAxqERE873m818spRcRfKgu0mkl8X9M631 8ChUUI2b6FNcouM4bP6CkK0nEcvNhm64C6fob/7Wh+yFcdDRCfU7L6Dh7sP/Og== 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=4184d83296dfcec12e3fae94870715b968e8cf83 commit 4184d83296dfcec12e3fae94870715b968e8cf83 Author: Dimitry Andric AuthorDate: 2020-08-03 17:51:57 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 09:58:15 +0000 Undo r230021 again, further shrinking the diff against upstream. This revision worked around an endless recursion when compiling clzdi2.c and ctzdi2.c with gcc, upstream landed a different workaround for this in https://reviews.llvm.org/rL324593, which is effective enough. Noticed by: jrtc27 (cherry picked from commit 876f11703dabed6f07d9d7352ceb996c5ffc407f) --- .../compiler-rt/lib/builtins/int_lib.h | 23 ---------------------- 1 file changed, 23 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h b/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h index 4a972da23fcc..58c6debfd4bc 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h +++ b/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h @@ -98,29 +98,6 @@ // Include internal utility function declarations. #include "int_util.h" -/* - * Workaround for LLVM bug 11663. Prevent endless recursion in - * __c?zdi2(), where calls to __builtin_c?z() are expanded to - * __c?zdi2() instead of __c?zsi2(). - * - * Instead of placing this workaround in c?zdi2.c, put it in this - * global header to prevent other C files from making the detour - * through __c?zdi2() as well. - * - * This problem has been observed on FreeBSD for sparc64 and - * mips64 with GCC 4.2.1, and for riscv with GCC 5.2.0. - * Presumably it's any version of GCC, and targeting an arch that - * does not have dedicated bit counting instructions. - */ -#if defined(__FreeBSD__) && (defined(__sparc64__) || \ - defined(__mips_n32) || defined(__mips_n64) || defined(__mips_o64) || \ - defined(__riscv)) -si_int __clzsi2(si_int); -si_int __ctzsi2(si_int); -#define __builtin_clz __clzsi2 -#define __builtin_ctz __ctzsi2 -#endif /* FreeBSD && (sparc64 || mips_n32 || mips_n64 || mips_o64 || riscv) */ - COMPILER_RT_ABI int __paritysi2(si_int a); COMPILER_RT_ABI int __paritydi2(di_int a);