From nobody Mon Nov 27 17:50:18 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 4SfCmC4TKJz52Bqy; Mon, 27 Nov 2023 17:50:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfCmC2zG9z4HB0; Mon, 27 Nov 2023 17:50:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701107419; 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: in-reply-to:in-reply-to:references:references; bh=sedSWZfHdt22DC4uzejXwAm5fHYrashBPdRbqMfr83Y=; b=HTB0SJvGAgEwHdBXol7dPgO8hKIUj1cYn78Z4XxdN+EUciDIvNrNV0Bk5Oh5OAgqRdYCNh LjUgKZLkYbF8/vkCrVZdQy8/sey0Ep+SzsssmiTVC34amhjVyEtWH7aiOtMQC6VOLwZGUZ 8SuFT5DmIdkRmHafLkA05a4l3tVAdfAuG/OglEdoRs6k9oHZ5JUB9MiZwWDVAaurCvKFPU RMUKqewTnbEcDCQHI0uz+UPpFY57bygCoTVsuKkv7BmWFInCl68Zq9TC7DnugyOPGsRNkH 3BLf/FRujhet9KS76TNsZGweKSz8pnxvKWSuwv+DGjyiKi12LA4Koz4w/Ojrkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701107419; 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: in-reply-to:in-reply-to:references:references; bh=sedSWZfHdt22DC4uzejXwAm5fHYrashBPdRbqMfr83Y=; b=iW9NpHGOdKgtU5zAZ/gY9UCyCQNp0ohTiIJ6/N8WtqG6DOYq1XeCekd4/MnXC349gyc7In LBFAvSUpDxQ8u6UMvlf4RSHDAbokq3J1uMQ2nrffVeGvLhcKsn9QzMx6WL+wwI0BYHB/VV ELY4L2/DcC7/F1MVrzuIgPOPpX+W6S3/nMZIZyNEY/QUXFMg9ZJ4ouKvLXjzffYmkMLtKI x5N+uHNyk5diPsfbK8wQYlG70xKiACuMoiEN/2U5nuPYAi6Ul2rpulYULdpG6GxVCekii/ Sup5TAgKfVslLjFYyCuFI+9qO9hbo3QdQGAZzMu+bDCSovWLNykENUBrFnTQiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701107419; a=rsa-sha256; cv=none; b=vdwTsHO4kRv1XTnhRhFXahtuM1qtQz76S6cv/Aw3FvSL223vriLHW9MsriHS5vdDRNSXwG 40eT+SIIQAwTZrjI9kcSXCCwcNTwaD6Q2m5CPfDyEqIQnvFC957U2vNXEsxyZbsRY6z25s MOJcDw6MHflsF4BKebvMDl+IOXXzskIszT7D+pd9QEa4JrH5YmNI6DxeQ0SE8K2VgzOV0I w9kqMo5rCrDpCazZ/H8tP+wPbtiFpkbA9Q5CyqqD2o13a2AFQavDYv0yThBVQ89k6UAW15 tndkYFrsx8LKfrIutOhb3AWEDbMgXBuv1FrTJM2whEtDevJDQRDwOWjqTQcd4Q== Received: from [IPV6:2601:648:8384:fd00:bc78:e4e1:3e17:3e10] (unknown [IPv6:2601:648:8384:fd00:bc78:e4e1:3e17:3e10]) (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 did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SfCmB60gJzy5S; Mon, 27 Nov 2023 17:50:18 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <136388c6-424f-427f-8584-fededcf1cede@FreeBSD.org> Date: Mon, 27 Nov 2023 09:50:18 -0800 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 17a238a15fbe - main - cdefs: Remove __func__ define Content-Language: en-US To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202311270525.3AR5PK1V067372@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202311270525.3AR5PK1V067372@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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=17a238a15fbed01477fbc54744d35cbccdb65871 > > commit 17a238a15fbed01477fbc54744d35cbccdb65871 > Author: Warner Losh > AuthorDate: 2023-11-20 23:34:22 +0000 > Commit: Warner Losh > CommitDate: 2023-11-27 05:24:02 +0000 > > cdefs: Remove __func__ define > > We require an ANSI-C compiler to build the base system. It's required > that __func__ work. Remove this define since the only known problem > compilers are ancient history (gcc 2.6 from 1994, almost pre-dating the > project). 3rd party code that used this define will now need to provide > it via some other means when using non-ansi-c compilers. > > PR: 275221 (exp-run) > Sponsored by: Netflix > --- > sys/sys/cdefs.h | 40 ++------------------------------------ > tests/sys/opencrypto/cryptodevh.py | 4 ---- > 2 files changed, 2 insertions(+), 42 deletions(-) > > diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h > index c5b6190077b3..bcbf418f9323 100644 > --- a/sys/sys/cdefs.h > +++ b/sys/sys/cdefs.h > @@ -96,14 +96,9 @@ > /* > * The __CONCAT macro is used to concatenate parts of symbol names, e.g. > * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo. > - * The __CONCAT macro is a bit tricky to use if it must work in non-ANSI > - * mode -- there must be no spaces between its arguments, and for nested > - * __CONCAT's, all the __CONCAT's must be at the left. __CONCAT can also > - * concatenate double-quoted strings produced by the __STRING macro, but > - * this only works with ANSI C. > * > * __XSTRING is like __STRING, but it expands any macros in its argument > - * first. It is only available with ANSI C. > + * first. > */ > #if defined(__STDC__) || defined(__cplusplus) > #define __P(protos) protos /* full-blown ANSI C */ > @@ -122,33 +117,7 @@ > #define __inline /* delete GCC keyword */ > #endif /* ! __CC_SUPPORTS___INLINE */ > #endif /* !__cplusplus */ > - > -#else /* !(__STDC__ || __cplusplus) */ > -#define __P(protos) () /* traditional C preprocessor */ > -#define __CONCAT(x,y) x/**/y > -#define __STRING(x) "x" > - > -#if !defined(__CC_SUPPORTS___INLINE) > -#define __const /* delete pseudo-ANSI C keywords */ > -#define __inline > -#define __signed > -#define __volatile > -/* > - * In non-ANSI C environments, new programs will want ANSI-only C keywords > - * deleted from the program and old programs will want them left alone. > - * When using a compiler other than gcc, programs using the ANSI C keywords > - * const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS. > - * When using "gcc -traditional", we assume that this is the intent; if > - * __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone. > - */ > -#ifndef NO_ANSI_KEYWORDS > -#define const /* delete ANSI C keywords */ > -#define inline > -#define signed > -#define volatile > -#endif /* !NO_ANSI_KEYWORDS */ > -#endif /* !__CC_SUPPORTS___INLINE */ > -#endif /* !(__STDC__ || __cplusplus) */ > +#endif /* __STDC__ || __cplusplus */ > > /* > * Compiler-dependent macros to help declare dead (non-returning) and > @@ -343,11 +312,6 @@ > #define __unreachable() ((void)0) > #endif > > -/* XXX: should use `#if __STDC_VERSION__ < 199901'. */ > -#if !__GNUC_PREREQ__(2, 7) > -#define __func__ NULL > -#endif > - > #if (defined(__GNUC__) && __GNUC__ >= 2) && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901 > #define __LONG_LONG_SUPPORTED > #endif This removed a lot more than just __func__? -- John Baldwin