From owner-dev-commits-src-all@freebsd.org Wed Sep 15 16:05:28 2021 Return-Path: Delivered-To: dev-commits-src-all@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 D3678668FBD; Wed, 15 Sep 2021 16:05:28 +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 4H8lRr51D8z3G5f; Wed, 15 Sep 2021 16:05:28 +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 8B11B1131C; Wed, 15 Sep 2021 16:05:28 +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 18FG5SlC086429; Wed, 15 Sep 2021 16:05:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18FG5SHQ086428; Wed, 15 Sep 2021 16:05:28 GMT (envelope-from git) Date: Wed, 15 Sep 2021 16:05:28 GMT Message-Id: <202109151605.18FG5SHQ086428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9553c6af881e - main - : Don't use __has_builtin(). 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/main X-Git-Reftype: branch X-Git-Commit: 9553c6af881e1f869cecb11b4476279e0ed6c4e0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2021 16:05:28 -0000 The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9553c6af881e1f869cecb11b4476279e0ed6c4e0 commit 9553c6af881e1f869cecb11b4476279e0ed6c4e0 Author: John Baldwin AuthorDate: 2021-09-15 16:03:17 +0000 Commit: John Baldwin CommitDate: 2021-09-15 16:03:17 +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 --- 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 6f53f0b59384..2d540796cd43 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 /* __LINUX_OVERFLOW_H__ */