From nobody Mon Nov 27 05:25:20 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 4SdvDc4mVTz51hYy; Mon, 27 Nov 2023 05:25:20 +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 4SdvDc2QPYz4XtM; Mon, 27 Nov 2023 05:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062720; 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; bh=3td4B/x0nf7vs07MxtdHhlDG2sD3FOj9LJy7AUWRAW4=; b=BuJp09yGZF5W4s+3llF6qM01uX5NNl4zDBkA0sVTMlKl2r5xat+3hD/uSAhvHIXrMLBymt IQQbG9ApEV+rLBkFwqAcaa4wDHF1NZMSwteGB0mFn9Sxowetm4WCdU1lbS2BhWRRIUq1Va 2Kxwuc0y0z1b4xBPepr6siVW67P1WyiH5T6b9wYMX4c+tUDM87s94wgWjxpXerQost2qjv lQempGeMNbz/y7DyNpKU/igyQQvsZPdqGzvYQ8atzqnPzcMgxleU8p4P0DHOUGsu4MmsC1 LGfM0GzD3DxCJNzlmymZw12fCFthfQcji17Ya5X+tSpBZm8nLquRsH28wK+LqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701062720; 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; bh=3td4B/x0nf7vs07MxtdHhlDG2sD3FOj9LJy7AUWRAW4=; b=NttS7ZFxKksDVKN76avMGSvJbYYFETt8M/pSiE3H1SpM+coxRT6w5RjTE8Wib5yS0hDVYV VQdtZ7Mqz8KENYYOjnh7XRIjTaG17oSGTDpP+jDptx62yumyCpT5Rztt8xWmeFGpqXCdhy YsXIaMCqQaCJhTEQq8HTw35I76u8wphXt5G3SB9JJKZoT+8hagFzCGvkSHd7cSWmgOECJX fLhd6oxFiugD0XjC7752UKwqRKQ9xCOotuO2CtuuGvm2IimpEwI1rC21/ZCwCxByb2aVwp n0wQxH6a4yCMLbHmKz8Fx6o7C1JC7JWxisPkZJuaYa2T7t2wtM2IDl+hEuRwBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701062720; a=rsa-sha256; cv=none; b=Bh+fkLR4VdHZ/ffY2wDhsmiLGjNPqrY1/OjS1Z/sWTu3CwW55H8FmaZ5NVQU9wKQBGtA8v nUtaGsySq8vbyH6wl8mnwUATdqJ7fpZoPhdzV05wgyWbdfJJQf8U0lb6HpeKWcbg0ZmV7Y 86RtGyL3825EH3cocnYi8uM8n98sLkJxNc9q13Q6lzCkPcgv5s1w90ZLJ/oW69vEK+UAL0 84LdcI5DQzSxKC4vUqJeG+bYwKhuKxZGWcCaclLOBEOdWqnGssvOmgP6/tJxs7Ftv9b7fh tB0yKZgdD7ll8Cg4bEQjylbBt4HkcUtN/4Epg7UU3pkFpaFbYQGJTu4CyWeuog== 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 4SdvDc188dz9nN; Mon, 27 Nov 2023 05:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AR5PKNG067375; Mon, 27 Nov 2023 05:25:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AR5PK1V067372; Mon, 27 Nov 2023 05:25:20 GMT (envelope-from git) Date: Mon, 27 Nov 2023 05:25:20 GMT Message-Id: <202311270525.3AR5PK1V067372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 17a238a15fbe - main - cdefs: Remove __func__ define 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17a238a15fbed01477fbc54744d35cbccdb65871 Auto-Submitted: auto-generated 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 diff --git a/tests/sys/opencrypto/cryptodevh.py b/tests/sys/opencrypto/cryptodevh.py index 9607bcd4d115..2d723999abc7 100644 --- a/tests/sys/opencrypto/cryptodevh.py +++ b/tests/sys/opencrypto/cryptodevh.py @@ -29,10 +29,6 @@ def __STRING(x): return #x def __XSTRING(x): return __STRING(x) -def __P(protos): return () - -def __STRING(x): return "x" - def __aligned(x): return __attribute__((__aligned__(x))) def __section(x): return __attribute__((__section__(x)))