From nobody Tue May 10 23:24:00 2022 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 C7F281AD7834; Tue, 10 May 2022 23:24:00 +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 4KyYyS3RjWz4c4X; Tue, 10 May 2022 23:24:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652225040; 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=I1P0jcsfOVMEFbrVP/YsVWDDwHyK8zvY5+kmvgIlC6M=; b=TtVr88t9h+DOFcOEBZqaiG9G0r7mWtdDwqvhK4d6ormbyIzPtEBXNb0QXX0g5Nwrgkh+1q QnLOp3/E9uhQbXbmB44W6S/pe4YzXEgp7NyKvAdkRXGeuMA+66L46fdWLmViIAiS/bQ4rL QOp7KQYWQ/5ltWULApxRUGLdPYIbQJQZrFeImsx4grubxHcEpd5JTKANLdH+4Vfr9T5GsD KVwJ5EV37lUquwxrpbJCp00h76SPCdjGlMtISnVmnN47Wj41KEankHjt9TfSxAGLfivkqm kUukCjCIaRx7vbvhVME6X8p+FQQRzD8OpeZGvW+swqCp9rVsDIer6h2oAdx2CQ== 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 342E46C3D; Tue, 10 May 2022 23:24:00 +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 24ANO09l072240; Tue, 10 May 2022 23:24:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24ANO05C072239; Tue, 10 May 2022 23:24:00 GMT (envelope-from git) Date: Tue, 10 May 2022 23:24:00 GMT Message-Id: <202205102324.24ANO05C072239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e77b37914ad6 - stable/13 - : Don't use __has_builtin(). 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e77b37914ad62ce713d59f874e1c547188e647d6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652225040; 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=I1P0jcsfOVMEFbrVP/YsVWDDwHyK8zvY5+kmvgIlC6M=; b=Upq/uK3sHHSrBA/qLwg4n6Lze2iNKhPdEuUxSQLw9gKQQTcOviwn4GPYnQcubGzd4iL4mI xwxAFZD3NEQANgN5D4i9xF4Cp18OvNl5UE8E3DhVUFUwt9xfFEmOKfcq1q+1V0LYUzZNg+ lTefRESPDr6ib7gMVOafq5hZeMZ15Tpj/cDAItdouvELur9gYdFMBXWSAoiMCOmEcUXr0S kFvuaMtB2bIwxBzJgS268XbzJyaTrCqFkfFylns0UJuktQLJww8Hs+8D096ophkB/7IRwD MDhqw2neaNp5XtfFGgwoWOttR78lj/9SOf4kHPcyo4lIJqj7cr+w3oSiBASNUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652225040; a=rsa-sha256; cv=none; b=hM1aVu6RKQjIWNscgvqdM64aU5+5snceTzHzooIMOXW0k8rA53D+2OFmpGzIq4Pj+EI0b1 XyiKwSNfvSaUgjl8+g2m7Lztnvrm6BNzR4XofuzvGYoX82d8L+rMEx1p0DdcF4LavS6P9y bwHdyP4A1bnVlTku9wAWOHUhqYReTjAtQroYjPKd+b80uyDlfVjYr62IlcWpAVPLfXI/cV +VhMtLdEajpR//bV50rp0baIPAdBd6gw8d7g3n+jn7tl2anEKgkx/O00NJIJC/8xShlgqM uPEpQtV3bEIDLQONGJ7kWsQv/GVY1LzeS4rDOQ3gmCswd7OOeZChXU0wSqstOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e77b37914ad62ce713d59f874e1c547188e647d6 commit e77b37914ad62ce713d59f874e1c547188e647d6 Author: John Baldwin AuthorDate: 2021-09-15 16:03:17 +0000 Commit: John Baldwin CommitDate: 2022-05-10 22:51:49 +0000 : Don't use __has_builtin(). GCC only added support for __has_builtin in GCC 10. However, all supported versions of GCC and clang include these builtins so just use them unconditionally. This fixes the build with GCC 9. Reviewed by: manu, hselasky, imp Differential Revision: https://reviews.freebsd.org/D31942 (cherry picked from commit 9553c6af881e1f869cecb11b4476279e0ed6c4e0) --- sys/compat/linuxkpi/common/include/linux/overflow.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/overflow.h b/sys/compat/linuxkpi/common/include/linux/overflow.h index f156e968218c..d2e15d8d2383 100644 --- a/sys/compat/linuxkpi/common/include/linux/overflow.h +++ b/sys/compat/linuxkpi/common/include/linux/overflow.h @@ -34,18 +34,9 @@ #include #include -#ifndef __has_builtin -#define __has_builtin(x) 0 -#endif - -#if __has_builtin(__builtin_add_overflow) #define check_add_overflow(a, b, c) \ __builtin_add_overflow(a, b, c) -#else -#error "Compiler does not support __builtin_add_overflow" -#endif -#if __has_builtin(__builtin_mul_overflow) #define check_mul_overflow(a, b, c) \ __builtin_mul_overflow(a, b, c) @@ -58,8 +49,5 @@ array_size(size_t x, size_t y) retval = SIZE_MAX; return (retval); } -#else -#error "Compiler does not support __builtin_mul_overflow" -#endif #endif /* __LINUXKPI_LINUX_OVERFLOW_H__ */