From owner-svn-src-all@freebsd.org Fri Mar 6 15:57:23 2020 Return-Path: Delivered-To: svn-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 3921E26B1F8; Fri, 6 Mar 2020 15:57:23 +0000 (UTC) (envelope-from kib@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) server-signature RSA-PSS (4096 bits) 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 48Ysh2670Xz3QSC; Fri, 6 Mar 2020 15:57:22 +0000 (UTC) (envelope-from kib@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 2E4752287D; Fri, 6 Mar 2020 15:57:22 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 026FvMl4064320; Fri, 6 Mar 2020 15:57:22 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 026FvM1e064319; Fri, 6 Mar 2020 15:57:22 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202003061557.026FvM1e064319@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 6 Mar 2020 15:57:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358707 - stable/12/sys/kern X-SVN-Group: stable-12 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/12/sys/kern X-SVN-Commit-Revision: 358707 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Mar 2020 15:57:23 -0000 Author: kib Date: Fri Mar 6 15:57:21 2020 New Revision: 358707 URL: https://svnweb.freebsd.org/changeset/base/358707 Log: Adjust r358702 by dropping type asserts. They depend on the C11 Generic feature that is not supported by gcc 4.2.1 used on stable/12 for some arches. This is a direct commit to the branch. Reported by: gjb Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/kern/kern_tc.c Modified: stable/12/sys/kern/kern_tc.c ============================================================================== --- stable/12/sys/kern/kern_tc.c Fri Mar 6 15:26:15 2020 (r358706) +++ stable/12/sys/kern/kern_tc.c Fri Mar 6 15:57:21 2020 (r358707) @@ -234,9 +234,11 @@ bintime_off(struct bintime *bt, u_int off) } #define GETTHBINTIME(dst, member) \ do { \ +/* \ _Static_assert(_Generic(((struct timehands *)NULL)->member, \ struct bintime: 1, default: 0) == 1, \ "struct timehands member is not of struct bintime type"); \ +*/ \ bintime_off(dst, __offsetof(struct timehands, member)); \ } while (0) @@ -255,10 +257,12 @@ getthmember(void *out, size_t out_size, u_int off) } #define GETTHMEMBER(dst, member) \ do { \ +/* \ _Static_assert(_Generic(*dst, \ __typeof(((struct timehands *)NULL)->member): 1, \ default: 0) == 1, \ "*dst and struct timehands member have different types"); \ +*/ \ getthmember(dst, sizeof(*dst), __offsetof(struct timehands, \ member)); \ } while (0)