Wed Apr 22 09:23:21 2020 UTC ()
For NO_KERNEL_RCSIDS, strip __RCSID() also for src/common/*.


(rin)
diff -r1.153 -r1.154 src/sys/sys/cdefs.h
cvs diff -r1.153 -r1.154 src/sys/sys/cdefs.h (expand / switch to unified diff)

--- src/sys/sys/cdefs.h 2020/04/17 14:59:23 1.153
+++ src/sys/sys/cdefs.h 2020/04/22 09:23:21 1.154
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: cdefs.h,v 1.153 2020/04/17 14:59:23 joerg Exp $ */ 1/* $NetBSD: cdefs.h,v 1.154 2020/04/22 09:23:21 rin Exp $ */
2 2
3/* * Copyright (c) 1991, 1993 3/* * Copyright (c) 1991, 1993
4 * The Regents of the University of California. All rights reserved. 4 * The Regents of the University of California. All rights reserved.
5 * 5 *
6 * This code is derived from software contributed to Berkeley by 6 * This code is derived from software contributed to Berkeley by
7 * Berkeley Software Design, Inc. 7 * Berkeley Software Design, Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -471,32 +471,32 @@ @@ -471,32 +471,32 @@
471 471
472/* 472/*
473 * C99 and C++11 define __func__ predefined identifier, which was made 473 * C99 and C++11 define __func__ predefined identifier, which was made
474 * available in GCC 2.95. 474 * available in GCC 2.95.
475 */ 475 */
476#if !(__STDC_VERSION__ >= 199901L) && !(__cplusplus - 0 >= 201103L) 476#if !(__STDC_VERSION__ >= 199901L) && !(__cplusplus - 0 >= 201103L)
477#if __GNUC_PREREQ__(2, 4) || defined(__lint__) 477#if __GNUC_PREREQ__(2, 4) || defined(__lint__)
478#define __func__ __FUNCTION__ 478#define __func__ __FUNCTION__
479#else 479#else
480#define __func__ "" 480#define __func__ ""
481#endif 481#endif
482#endif /* !(__STDC_VERSION__ >= 199901L) && !(__cplusplus - 0 >= 201103L) */ 482#endif /* !(__STDC_VERSION__ >= 199901L) && !(__cplusplus - 0 >= 201103L) */
483 483
484#if defined(_KERNEL) 484#if defined(_KERNEL) && defined(NO_KERNEL_RCSIDS)
485#if defined(NO_KERNEL_RCSIDS) 485#undef __KERNEL_RCSID
486#undef __KERNEL_RCSID 486#define __KERNEL_RCSID(_n, _s) /* nothing */
487#define __KERNEL_RCSID(_n, _s) /* nothing */ 487#undef __RCSID
488#endif /* NO_KERNEL_RCSIDS */ 488#define __RCSID(_s) /* nothing */
489#endif /* _KERNEL */ 489#endif
490 490
491#if !defined(_STANDALONE) && !defined(_KERNEL) 491#if !defined(_STANDALONE) && !defined(_KERNEL)
492#if defined(__GNUC__) || defined(__PCC__) 492#if defined(__GNUC__) || defined(__PCC__)
493#define __RENAME(x) ___RENAME(x) 493#define __RENAME(x) ___RENAME(x)
494#elif defined(__lint__) 494#elif defined(__lint__)
495#define __RENAME(x) __symbolrename(x) 495#define __RENAME(x) __symbolrename(x)
496#else 496#else
497#error "No function renaming possible" 497#error "No function renaming possible"
498#endif /* __GNUC__ */ 498#endif /* __GNUC__ */
499#else /* _STANDALONE || _KERNEL */ 499#else /* _STANDALONE || _KERNEL */
500#define __RENAME(x) no renaming in kernel/standalone environment 500#define __RENAME(x) no renaming in kernel/standalone environment
501#endif 501#endif
502 502