From owner-svn-src-head@freebsd.org Mon Aug 28 06:55:11 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E38B2E074E5 for ; Mon, 28 Aug 2017 06:55:11 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: from mail-yw0-x232.google.com (mail-yw0-x232.google.com [IPv6:2607:f8b0:4002:c05::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 94EAF6B913 for ; Mon, 28 Aug 2017 06:55:11 +0000 (UTC) (envelope-from ed@nuxi.nl) Received: by mail-yw0-x232.google.com with SMTP id t188so24566954ywb.1 for ; Sun, 27 Aug 2017 23:55:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuxi-nl.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=DvodAsPZpi2wonsgqc1V0TKjRmiLF0x3zShDcRQIQuw=; b=O9zCMtlK22rDzs/GFznZmXLiUSnwGnZN9OWsuGmuqHCVuxlUsSCwWrcFtFPZ8FT8NB 9PyCvdH6nYRwlnmN767kQMdbPyARuVFduIhl7FZ+/qyrZsU5LjO2QajJ3/yNW6u9BPS0 AeDWxRWXPkeajxgFmWtyv+tS4RAhQNTGMCZMFcQPzmUhr7e0YeF0RuRqYVUuwieUkkXb Ivd1TAM6Dy00HAcf6kXLHci8fDL3+KT8TR+SB3t5ATQHb0Se5yLU1vPETrly7lU/0zHE AQ4+QdJ7RTiISH/0082nfmusdq49x0MRLGJm+IpwA/qeSZG3AQ1n9zEjj6iSE0TXlv1H Wfhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=DvodAsPZpi2wonsgqc1V0TKjRmiLF0x3zShDcRQIQuw=; b=FZnx4jP5dJDXYjyARo6c5p0KEWFpdvUmOBAX2F+dvn6ceEhs1pp1ObIBWqGTgR5bBM MLUubf/FN7GhRn34R3hxIZ/S9nBIdiNlJ4j0jLM6JHLxGP7JwdlCsyuPNGz5JR7COOLN qvJyrrP8JeSxkgAjxl4vft+YPLxB5Uw2jxqMX5SFLndbHNWg/ONC/h5SJ+/W/Tt0VPrd QADnn6tqp+sjYwLz9wScA8DJJkY7QJ67TnSub8OXnuOkACcJuqIvQ3Fzyb+MqtnH875r rkT4Eeqki2/+hWScSMIL1rcTPgUtqgYUzyQR9HwZ0QWmSg+x8k9zdKFXpo7AJAsAMeYw wNBA== X-Gm-Message-State: AHYfb5hk5CtIHgAYzRjhxpD24OasUjlHz+z01ky/uv+gnGJYMbhTaXLc F8T3tR9aM3KWBsBNAbtCChNJFp7hZnD9 X-Received: by 10.129.50.206 with SMTP id y197mr2857517ywy.314.1503903310687; Sun, 27 Aug 2017 23:55:10 -0700 (PDT) MIME-Version: 1.0 Received: by 10.13.227.193 with HTTP; Sun, 27 Aug 2017 23:54:40 -0700 (PDT) In-Reply-To: References: <1C5A448F-C91A-4599-8500-E4E46E6F5205@dsl-only.net> From: Ed Schouten Date: Mon, 28 Aug 2017 08:54:40 +0200 Message-ID: Subject: Re: svn commit: r322875 - head/sys/dev/nvme To: Mark Millard Cc: David Chisnall , Warner Losh , svn-src-head@freebsd.org, FreeBSD Current , FreeBSD-STABLE Mailing List , freebsd-hackers Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Aug 2017 06:55:12 -0000 Mark, 2017-08-25 14:53 GMT+02:00 Ed Schouten : > 2017-08-25 9:46 GMT+02:00 Mark Millard : >> It appears that at least 11.1-STABLE -r322807 does not handle >> -std=c++98 styles of use of _Static_assert for g++7 in that >> g++7 reports an error: > > Maybe we need to do something like this? > > Index: sys/sys/cdefs.h > =================================================================== > --- sys/sys/cdefs.h (revision 322887) > +++ sys/sys/cdefs.h (working copy) > @@ -294,7 +294,7 @@ > #if (defined(__cplusplus) && __cplusplus >= 201103L) || \ > __has_extension(cxx_static_assert) > #define _Static_assert(x, y) static_assert(x, y) > -#elif __GNUC_PREREQ__(4,6) > +#elif __GNUC_PREREQ__(4,6) && !defined(__cplusplus) > /* Nothing, gcc 4.6 and higher has _Static_assert built-in */ > #elif defined(__COUNTER__) > #define _Static_assert(x, y) __Static_assert(x, __COUNTER__) Could you let me know whether this patch fixes the build for you? If so, I'll commit it! -- Ed Schouten Nuxi, 's-Hertogenbosch, the Netherlands KvK-nr.: 62051717