 @@ -1,25 +1,26 @@
-#	$NetBSD: Makefile.inc,v 1.16 2021/11/01 19:10:07 rillig Exp $
+#	$NetBSD: Makefile.inc,v 1.17 2021/11/01 19:48:51 rillig Exp $
 .include <bsd.own.mk>
 .PATH:		${.CURDIR}/../common
 # Special cases first, then check for a MACHINE_ARCH specific
 # subdir before looking for MACHINE_CPU.
 .if exists(${.CURDIR}/../arch/${MACHINE_ARCH})
 ARCHSUBDIR=	${MACHINE_ARCH}
 .elif exists(${.CURDIR}/../arch/${MACHINE_ARCH:C/e[lb]$//})
 ARCHSUBDIR=	${MACHINE_ARCH:C/e[lb]$//}
 .else
 ARCHSUBDIR=	${MACHINE_CPU}
 .endif
 CPPFLAGS+=	-I${.CURDIR}/../arch/${ARCHSUBDIR}
 CPPFLAGS+=	-I${.CURDIR}/../common
-CWARNFLAGS+=	-Wdeclaration-after-statement	# it's a build tool
+CWARNFLAGS.gcc+=-Wdeclaration-after-statement	# see tools/README
 CWARNFLAGS.gcc+=-std=c90			# see tools/README
 CLEANFILES+=	*.gcno *.gcda *.gcov
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
 .endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lint.h,v 1.32 2021/09/05 18:17:15 rillig Exp $	*/
+/*	$NetBSD: lint.h,v 1.33 2021/11/01 19:48:51 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -139,23 +139,31 @@ typedef	struct	ob {
 	char	*o_end;		/* first byte after buffer */
 	size_t	o_len;		/* length of buffer */
 	char	*o_next;	/* next free byte in buffer */
 } ob_t;
 #if defined(IS_LINT1)
 typedef struct lint1_type type_t;
 #else
 typedef struct lint2_type type_t;
 #endif
 #include "externs.h"
-static inline bool
+#if __STDC_VERSION__ >= 199901L
 #define INLINE_FUNC static inline
 #elif __GNUC__
 #define INLINE_FUNC static __attribute__((__unused__))
 #else
 #define INLINE_FUNC static
 #endif
 INLINE_FUNC bool
 ch_isalnum(char ch) { return isalnum((unsigned char)ch) != 0; }
-static inline bool
+INLINE_FUNC bool
 ch_isdigit(char ch) { return isdigit((unsigned char)ch) != 0; }
-static inline bool
+INLINE_FUNC bool
 ch_isprint(char ch) { return isprint((unsigned char)ch) != 0; }
-static inline bool
+INLINE_FUNC bool
 ch_isspace(char ch) { return isspace((unsigned char)ch) != 0; }
-static inline bool
+INLINE_FUNC bool
 ch_isupper(char ch) { return isupper((unsigned char)ch) != 0; }

 @@ -1,14 +1,14 @@
-/* $NetBSD: ckgetopt.c,v 1.13 2021/11/01 19:10:07 rillig Exp $ */
+/* $NetBSD: ckgetopt.c,v 1.14 2021/11/01 19:48:51 rillig Exp $ */
 /*-
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roland Illig <rillig@NetBSD.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: ckgetopt.c,v 1.13 2021/11/01 19:10:07 rillig Exp $");
+__RCSID("$NetBSD: ckgetopt.c,v 1.14 2021/11/01 19:48:51 rillig Exp $");
 #endif
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * In a typical while loop for parsing getopt options, ensure that each
  * option from the options string is handled, and that each handled option
  * is listed in the options string.
  */
 @@ -123,29 +123,31 @@ check_unlisted_option(char opt)
 	optptr = strchr(ck.options, opt);
 	if (optptr != NULL)
 		*optptr = ' ';
 	else if (opt != '?') {
 	warn:
 		/* option '%c' should be listed in the options string */
 		warning(339, opt);
+	}
+}
 static void
 check_unhandled_option(void)
+{
 	const char *opt;
 	lint_assert(ck.options != NULL);
-	for (const char *opt = ck.options; *opt != '\0'; opt++) {
+	for (opt = ck.options; *opt != '\0'; opt++) {
 		if (*opt == ' ' || *opt == ':')
 			continue;
 		/* option '%c' should be handled in the switch */
 		warning_at(338, &ck.options_pos, *opt);
+	}
+}
 void
 check_getopt_begin_while(const tnode_t *tn)
+{
 	if (ck.while_level == 0) {

 @@ -1,14 +1,14 @@
-/* $NetBSD: lint1.h,v 1.129 2021/09/14 19:44:40 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.130 2021/11/01 19:48:51 rillig Exp $ */
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -487,27 +487,27 @@ typedef	struct err_set {
 #ifdef BLKDEBUG
 #define ZERO	0xa5
 #else
 #define	ZERO	0
 #endif
 extern err_set	msgset;
 #ifdef DEBUG
 #  include "err-msgs.h"
 /* ARGSUSED */
-static inline void __attribute__((format(printf, 1, 2)))
+INLINE_FUNC void __attribute__((format(printf, 1, 2)))
 check_printf(const char *fmt, ...)
+{
+}
 #  define wrap_check_printf_at(func, msgid, pos, args...)		\
 	do {								\
 		check_printf(__CONCAT(MSG_, msgid), ##args);		\
 		(func)(msgid, pos, ##args);				\
 	} while (false)
 #  define error_at(msgid, pos, args...) \
 	wrap_check_printf_at(error_at, msgid, pos, ##args)
 #  define warning_at(msgid, pos, args...) \
 @@ -518,90 +518,90 @@ check_printf(const char *fmt, ...)
 #  define wrap_check_printf(func, msgid, args...)			\
 	do {								\
 		check_printf(__CONCAT(MSG_, msgid), ##args);		\
 		(func)(msgid, ##args);					\
 	} while (false)
 #  define error(msgid, args...) wrap_check_printf(error, msgid, ##args)
 #  define warning(msgid, args...) wrap_check_printf(warning, msgid, ##args)
 #  define gnuism(msgid, args...) wrap_check_printf(gnuism, msgid, ##args)
 #  define c99ism(msgid, args...) wrap_check_printf(c99ism, msgid, ##args)
 #  define c11ism(msgid, args...) wrap_check_printf(c11ism, msgid, ##args)
 #endif
-static inline bool
+INLINE_FUNC bool
 is_nonzero_val(const val_t *val)
+{
 	return is_floating(val->v_tspec)
 	    ? val->v_ldbl != 0.0
 	    : val->v_quad != 0;
+}
-static inline bool
+INLINE_FUNC bool
 constant_is_nonzero(const tnode_t *tn)
+{
 	lint_assert(tn->tn_op == CON);
 	lint_assert(tn->tn_type->t_tspec == tn->tn_val->v_tspec);
 	return is_nonzero_val(tn->tn_val);
+}
-static inline bool
+INLINE_FUNC bool
 is_zero(const tnode_t *tn)
+{
 	return tn != NULL && tn->tn_op == CON && !is_nonzero_val(tn->tn_val);
+}
-static inline bool
+INLINE_FUNC bool
 is_nonzero(const tnode_t *tn)
+{
 	return tn != NULL && tn->tn_op == CON && is_nonzero_val(tn->tn_val);
+}
-static inline bool
+INLINE_FUNC bool
 is_binary(const tnode_t *tn)
+{
 	return modtab[tn->tn_op].m_binary;
+}
-static inline uint64_t
+INLINE_FUNC uint64_t
 bit(unsigned i)
+{
 	/*
 	 * TODO: Add proper support for INT128.
 	 * This involves changing val_t to 128 bits.
 	 */
 	if (i >= 64)
 		return 0;	/* XXX: not correct for INT128 and UINT128 */
 	lint_assert(i < 64);
 	return (uint64_t)1 << i;
+}
-static inline bool
+INLINE_FUNC bool
 msb(int64_t q, tspec_t t)
+{
 	return (q & bit((unsigned int)size_in_bits(t) - 1)) != 0;
+}
-static inline uint64_t
+INLINE_FUNC uint64_t
 value_bits(unsigned bitsize)
+{
 	lint_assert(bitsize > 0);
 	/* for long double (80 or 128), double _Complex (128) */
 	/*
 	 * XXX: double _Complex does not have 128 bits of precision,
 	 * therefore it should never be necessary to query the value bits
 	 * of such a type; see d_c99_complex_split.c to trigger this case.
 	 */
 	if (bitsize >= 64)
 		return ~((uint64_t)0);
 	return ~(~(uint64_t)0 << bitsize);
+}
 /* C99 6.7.8p7 */
-static inline bool
+INLINE_FUNC bool
 is_struct_or_union(tspec_t t)
+{
 	return t == STRUCT || t == UNION;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.392 2021/11/01 19:10:07 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.393 2021/11/01 19:48:51 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,27 +27,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.392 2021/11/01 19:10:07 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.393 2021/11/01 19:48:51 rillig Exp $");
 #endif
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 static	tnode_t	*build_integer_constant(tspec_t, int64_t);
 @@ -3455,27 +3455,27 @@ build_sizeof(const type_t *tp)
  * Create a constant node for offsetof.
  */
 /* ARGSUSED */ /* See implementation comments. */
 tnode_t *
 build_offsetof(const type_t *tp, const sym_t *sym)
+{
 	unsigned int offset_in_bytes;
 	tnode_t *tn;
 	if (!is_struct_or_union(tp->t_tspec))
 		/* unacceptable operand of '%s' */
 		error(111, "offsetof");
-	// XXX: wrong size, no checking for sym fixme
+	/* XXX: wrong size, no checking for sym fixme */
 	offset_in_bytes = type_size_in_bits(tp) / CHAR_SIZE;
 	tn = build_integer_constant(SIZEOF_TSPEC, offset_in_bytes);
 	tn->tn_system_dependent = true;
 	return tn;
+}
 unsigned int
 type_size_in_bits(const type_t *tp)
+{
 	unsigned int elem, elsz;
 	bool	flex;
 	elem = 1;
 @@ -3925,27 +3925,27 @@ expr(tnode_t *tn, bool vctx, bool tctx,
 		 * printed
 		 */
 		if (tn->tn_op != COMMA && !vctx && !tctx)
 			check_null_effect(tn);
+	}
 	debug_node(tn);
 	/* free the tree memory */
 	if (dofreeblk)
 		expr_free_all();
+}
 static bool
-has_side_effect(const tnode_t *tn) // NOLINT(misc-no-recursion)
+has_side_effect(const tnode_t *tn) /* NOLINT(misc-no-recursion) */
+{
 	op_t op = tn->tn_op;
 	if (modtab[op].m_has_side_effect)
 		return true;
 	if (op == CVT && tn->tn_type->t_tspec == VOID)
 		return has_side_effect(tn->tn_left);
 	/* XXX: Why not has_side_effect(tn->tn_left) as well? */
 	if (op == LOGAND || op == LOGOR)
 		return has_side_effect(tn->tn_right);

 @@ -1,14 +1,14 @@
-/* $NetBSD: lint2.h,v 1.19 2021/08/29 10:13:02 rillig Exp $ */
+/* $NetBSD: lint2.h,v 1.20 2021/11/01 19:48:51 rillig Exp $ */
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -176,18 +176,18 @@ typedef	struct hte {
 	sym_t	*h_syms;	/* declarations and definitions */
 	sym_t	**h_lsym;	/* points to s_next of last decl./def. */
 	fcall_t	*h_calls;	/* function calls */
 	fcall_t	**h_lcall;	/* points to f_next of last call */
 	usym_t	*h_usyms;	/* usage info */
 	usym_t	**h_lusym;	/* points to u_next of last usage info */
 	struct	hte *h_link;	/* next hte with same hash function */
 	struct  hte *h_hte;	/* pointer to other htes (for renames) */
 } hte_t;
 #include "externs2.h"
 /* maps type indices into pointers to type structs */
-static inline type_t *
+INLINE_FUNC type_t *
 TP(unsigned short type_id) {
 	/* force sequence point for newly parsed type_id */
 	return tlst[type_id];
+}