From nobody Mon Nov 27 18:12:19 2023 X-Original-To: dev-commits-src-main@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 4SfDFr4qPQz52Pq0 for ; Mon, 27 Nov 2023 18:12:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfDFr2kH2z4Wht for ; Mon, 27 Nov 2023 18:12:32 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-54af1daf6a9so6209784a12.1 for ; Mon, 27 Nov 2023 10:12:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701108751; x=1701713551; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=LQqplNbJ7iWc6bJ6OO4mBchEkosXa2y+GVVd5F/YWtY=; b=2GCzzoRnYbNBe1OV3g5lmPUjHnRbDnYOwoxuXpj6ascgSnw8iUabmfBW0QWkAtCniW //1MdGa1OenkdUIM2UfKGubtu2zb+VcjfXrK0AvK0a4vckQbiqK1boLWLSd+gMMEBCkB Xl0tq1lNQhW1HRfGgmDux1ddzVrViSkh9B+1l1/qNCY/h+yeowziEuIUQ8oAEcVSuCkk hpV9lRHYqtwt15W2HmAbvQFh9jW+7AF1dvA3IV1M1lQuHfoJDF73owq2Zvqz9nUKcf1q iNrdG4eDYsFwxwzqCqEwV8ZoMT2Wx1qTqqz5pZDWsG2N8aGuaVWmEZRdX5qYKiRcb1h7 T85A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701108751; x=1701713551; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LQqplNbJ7iWc6bJ6OO4mBchEkosXa2y+GVVd5F/YWtY=; b=gUxpAEOO93KpO7nRMcCiFg4EerSW5MRisVPTkpk0JKY+TXVPIqZ77aBm/NOtfd5DXB 5yjxK/Ov/t52xe+mv3APGXnU4HvnFYzL6zl6QG0yRHuua1voL96cT0tNa0KB2r0MJfif zw/cz27oUrmRCxfrISMKj65TS+sHvSUou8ugBIbyMRYFE2Qnq2FBpwzaS7suonryYTnX cErNyJQyJqYMtW70KG+/B2he9X6aRrOglmd1ZrsiYfQxgCDt3t/6x7+VtcVat8jltKru rbC+Oaw9BrPqmpz8fjmqvEIgf+Aa180DQT3W28VIS0oL8lmD5A10+BXJ6abf7rSjEih7 nTQQ== X-Gm-Message-State: AOJu0YxTUg7L44DVfTjA5CnJ5AUwjIw6fZgdpks7mg1FzTdGoUyDtC1P KUTxyYY1wpURrPTd9L+X4ocVY5gXZg7WLaTa9ve/bgTdOtGGcm55 X-Google-Smtp-Source: AGHT+IGL4wJnnrz1NaFrFqramJKX56eu7mcAZBEvDcyTQc7fmipvyUolOBN0hSQUNGEcYKebJCSIifItfETKEFP7NfM= X-Received: by 2002:aa7:c045:0:b0:54b:5007:9a12 with SMTP id k5-20020aa7c045000000b0054b50079a12mr4439270edo.10.1701108750715; Mon, 27 Nov 2023 10:12:30 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202311270525.3AR5PHQ2067285@gitrepo.freebsd.org> <8d51e8f9-37a0-4f28-bf05-2a58514fddb0@FreeBSD.org> In-Reply-To: <8d51e8f9-37a0-4f28-bf05-2a58514fddb0@FreeBSD.org> From: Warner Losh Date: Mon, 27 Nov 2023 11:12:19 -0700 Message-ID: Subject: Re: git: b88ca6ee167d - main - cdefs: Remove CC_SUPPORTS macros, they are unused To: John Baldwin Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000cfa970060b263e79" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4SfDFr2kH2z4Wht --000000000000cfa970060b263e79 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Nov 27, 2023 at 10:50=E2=80=AFAM John Baldwin wro= te: > On 11/26/23 9:25 PM, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Db88ca6ee167d079c965dfe123bbe296= d3a945c0a > > > > commit b88ca6ee167d079c965dfe123bbe296d3a945c0a > > Author: Warner Losh > > AuthorDate: 2023-11-20 22:40:55 +0000 > > Commit: Warner Losh > > CommitDate: 2023-11-27 05:24:02 +0000 > > > > cdefs: Remove CC_SUPPORTS macros, they are unused > > > > Remove __CC_SUPPORTS_INLINE, __CC_SUPPORTS___INLINE__, > > __CC_SUPPORTS___FUNC__, __CC_SUPPORTS_WARNING, > > __CC_SUPPORTS_VARADIC_XXX, __CC_SUPPORTS_DYNAMIC_ARRAY_INIT: they > are > > unused. Also remove them from the generated cryptodevh.py script. > > > > Retain, for the moment, __CC_SUPPORTS___INLINE, since it's used in > this > > file. > > > > PR: 275221 (exp-run) > > Sponsored by: Netflix > > --- > > sys/sys/cdefs.h | 10 ---------- > > tests/sys/opencrypto/cryptodevh.py | 7 ------- > > 2 files changed, 17 deletions(-) > > > > diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h > > index 5782735187c5..7f3efc9300c9 100644 > > --- a/sys/sys/cdefs.h > > +++ b/sys/sys/cdefs.h > > @@ -79,17 +79,7 @@ > > */ > > #define __compiler_membar() __asm __volatile(" " : : : > "memory") > > > > -/* XXX: if __GNUC__ >=3D 2: not tested everywhere originally, where > replaced */ > > -#define __CC_SUPPORTS_INLINE 1 > > #define __CC_SUPPORTS___INLINE 1 > > -#define __CC_SUPPORTS___INLINE__ 1 > > - > > -#define __CC_SUPPORTS___FUNC__ 1 > > -#define __CC_SUPPORTS_WARNING 1 > > - > > -#define __CC_SUPPORTS_VARADIC_XXX 1 /* see varargs.h */ > > - > > -#define __CC_SUPPORTS_DYNAMIC_ARRAY_INIT 1 > > > > #endif /* __GNUC__ */ > > > > diff --git a/tests/sys/opencrypto/cryptodevh.py > b/tests/sys/opencrypto/cryptodevh.py > > index d6982c26f1cf..9607bcd4d115 100644 > > --- a/tests/sys/opencrypto/cryptodevh.py > > +++ b/tests/sys/opencrypto/cryptodevh.py > > @@ -23,13 +23,6 @@ def __has_include(x): return 0 > > > > def __has_builtin(x): return 0 > > > > -__CC_SUPPORTS_INLINE =3D 1 > > -__CC_SUPPORTS___INLINE =3D 1 > > -__CC_SUPPORTS___INLINE__ =3D 1 > > -__CC_SUPPORTS___FUNC__ =3D 1 > > -__CC_SUPPORTS_WARNING =3D 1 > > -__CC_SUPPORTS_VARADIC_XXX =3D 1 > > -__CC_SUPPORTS_DYNAMIC_ARRAY_INIT =3D 1 > > def __P(protos): return protos > > > > def __STRING(x): return #x > > It doesn't really matter, but you accidentally removed > __CC_SUPPORTS___INLINE from > the python version but not cdefs.h. I wonder how hard it would be to jus= t > regenerate > cryptodevh.py rather than updating it manually as I'm sure it is missing > some other > updates. > Yea, I'm not at all sure how it was generated in the first place. And I removed it there when I removed it in cdefs.h, but then I failed to add it back when I concluded that I had to add it back to cdefs.h.... I think I have plans to remove it in 2024q1 cdefs.h cleaning where I'll go farther: kill K&R support macros we have in there (so one couldn't use a pure K&R compiler on FreeBSD with the system headers... though doing that is already impossible because of all the prototypes). I also plan on eliminating all support for gcc prior to 4.2. There's only one port in the tree that uses an older gcc (2.8 for hp48x cross compiler) and it's i386 only. And I've not installed it to see if it uses the system headers or not (if it doesn't, then my changes won't affect it at all). I also have tcc (aka tinyc) working after a fashion (I've fixed the compile issues we have with it) just to make sure my future cleanups don't break other compilers (though this is the only other one I know works and uses system headers). Warner --000000000000cfa970060b263e79 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Nov 27, 2023 at 10:50=E2=80= =AFAM John Baldwin <jhb@freebsd.org> wrote:
On= 11/26/23 9:25 PM, Warner Losh wrote:
> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3Db88ca6ee167d079c965dfe123bbe296d3a945c0a<= /a>
>
> commit b88ca6ee167d079c965dfe123bbe296d3a945c0a
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2023-11-20 22:40:55 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2023-11-27 05:24:02 +0000
>
>=C2=A0 =C2=A0 =C2=A0 cdefs: Remove CC_SUPPORTS macros, they are unused<= br> >=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Remove __CC_SUPPORTS_INLINE, __CC_SUPPORTS___INLIN= E__,
>=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS___FUNC__, __CC_SUPPORTS_WARNING,
>=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS_VARADIC_XXX, __CC_SUPPORTS_DYNAMIC_A= RRAY_INIT: they are
>=C2=A0 =C2=A0 =C2=A0 unused. Also remove them from the generated crypto= devh.py script.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Retain, for the moment, __CC_SUPPORTS___INLINE, si= nce it's used in this
>=C2=A0 =C2=A0 =C2=A0 file.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 PR: 275221 (exp-run)
>=C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0Netflix
> ---
>=C2=A0 =C2=A0sys/sys/cdefs.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 10 ----------
>=C2=A0 =C2=A0tests/sys/opencrypto/cryptodevh.py |=C2=A0 7 -------
>=C2=A0 =C2=A02 files changed, 17 deletions(-)
>
> diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
> index 5782735187c5..7f3efc9300c9 100644
> --- a/sys/sys/cdefs.h
> +++ b/sys/sys/cdefs.h
> @@ -79,17 +79,7 @@
>=C2=A0 =C2=A0 */
>=C2=A0 =C2=A0#define=C2=A0 =C2=A0 =C2=A0__compiler_membar()=C2=A0 =C2= =A0 =C2=A0__asm __volatile(" " : : : "memory")
>=C2=A0 =C2=A0
> -/* XXX: if __GNUC__ >=3D 2: not tested everywhere originally, wher= e replaced */
> -#define=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS_INLINE 1
>=C2=A0 =C2=A0#define=C2=A0 =C2=A0 =C2=A0__CC_SUPPORTS___INLINE 1
> -#define=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS___INLINE__ 1
> -
> -#define=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS___FUNC__ 1
> -#define=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS_WARNING 1
> -
> -#define=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS_VARADIC_XXX 1 /* see vararg= s.h */
> -
> -#define=C2=A0 =C2=A0 =C2=A0 __CC_SUPPORTS_DYNAMIC_ARRAY_INIT 1
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0#endif /* __GNUC__ */
>=C2=A0 =C2=A0
> diff --git a/tests/sys/opencrypto/cryptodevh.py b/tests/sys/opencrypto= /cryptodevh.py
> index d6982c26f1cf..9607bcd4d115 100644
> --- a/tests/sys/opencrypto/cryptodevh.py
> +++ b/tests/sys/opencrypto/cryptodevh.py
> @@ -23,13 +23,6 @@ def __has_include(x): return 0
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0def __has_builtin(x): return 0
>=C2=A0 =C2=A0
> -__CC_SUPPORTS_INLINE =3D 1
> -__CC_SUPPORTS___INLINE =3D 1
> -__CC_SUPPORTS___INLINE__ =3D 1
> -__CC_SUPPORTS___FUNC__ =3D 1
> -__CC_SUPPORTS_WARNING =3D 1
> -__CC_SUPPORTS_VARADIC_XXX =3D 1
> -__CC_SUPPORTS_DYNAMIC_ARRAY_INIT =3D 1
>=C2=A0 =C2=A0def __P(protos): return protos=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0def __STRING(x): return #x=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0

It doesn't really matter, but you accidentally removed __CC_SUPPORTS___= INLINE from
the python version but not cdefs.h.=C2=A0 I wonder how hard it would be to = just regenerate
cryptodevh.py rather than updating it manually as I'm sure it is missin= g some other
updates.

--000000000000cfa970060b263e79--