From owner-svn-src-projects@freebsd.org Mon Aug 3 17:51:58 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9220E3A343A for ; Mon, 3 Aug 2020 17:51:58 +0000 (UTC) (envelope-from dim@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BL5723PGHz4BQ3; Mon, 3 Aug 2020 17:51:58 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5773018499; Mon, 3 Aug 2020 17:51:58 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 073Hpw69046138; Mon, 3 Aug 2020 17:51:58 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 073Hpwi2046137; Mon, 3 Aug 2020 17:51:58 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202008031751.073Hpwi2046137@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 3 Aug 2020 17:51:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r363803 - projects/clang1100-import/contrib/llvm-project/compiler-rt/lib/builtins X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: projects/clang1100-import/contrib/llvm-project/compiler-rt/lib/builtins X-SVN-Commit-Revision: 363803 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Aug 2020 17:51:58 -0000 Author: dim Date: Mon Aug 3 17:51:57 2020 New Revision: 363803 URL: https://svnweb.freebsd.org/changeset/base/363803 Log: 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 Modified: projects/clang1100-import/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h Modified: projects/clang1100-import/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h ============================================================================== --- projects/clang1100-import/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h Mon Aug 3 17:18:12 2020 (r363802) +++ projects/clang1100-import/contrib/llvm-project/compiler-rt/lib/builtins/int_lib.h Mon Aug 3 17:51:57 2020 (r363803) @@ -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);