Module Name:    src
Committed By:   christos
Date:           Wed Dec 15 15:20:51 UTC 2021

Modified Files:
        src/usr.bin/xlint/lint1: cgram.y lex.c

Log Message:
Add more attributes


To generate a diff of this commit:
cvs rdiff -u -r1.373 -r1.374 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.89 -r1.90 src/usr.bin/xlint/lint1/lex.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.373 src/usr.bin/xlint/lint1/cgram.y:1.374
--- src/usr.bin/xlint/lint1/cgram.y:1.373	Tue Dec 14 15:13:13 2021
+++ src/usr.bin/xlint/lint1/cgram.y	Wed Dec 15 10:20:51 2021
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.373 2021/12/14 20:13:13 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.374 2021/12/15 15:20:51 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.373 2021/12/14 20:13:13 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.374 2021/12/15 15:20:51 christos Exp $");
 #endif
 
 #include <limits.h>
@@ -226,6 +226,7 @@ anonymize(sym_t *s)
 %token			T_AT_CONSTRUCTOR
 %token			T_AT_DEPRECATED
 %token			T_AT_DESTRUCTOR
+%token			T_AT_DISABLE_SANITIZER_INSTRUMENTATION
 %token			T_AT_FALLTHROUGH
 %token			T_AT_FORMAT
 %token			T_AT_FORMAT_ARG
@@ -241,6 +242,8 @@ anonymize(sym_t *s)
 %token			T_AT_MAY_ALIAS
 %token			T_AT_MINBYTES
 %token			T_AT_MODE
+%token			T_AT_NO_SANITIZE
+%token			T_AT_NO_SANITIZE_THREAD
 %token			T_AT_NOINLINE
 %token			T_AT_NONNULL
 %token			T_AT_NONSTRING
@@ -2075,6 +2078,7 @@ gcc_attribute_spec:
 	| T_AT_DEPRECATED
 	| T_AT_DESTRUCTOR T_LPAREN constant_expr T_RPAREN
 	| T_AT_DESTRUCTOR
+	| T_AT_DISABLE_SANITIZER_INSTRUMENTATION
 	| T_AT_FALLTHROUGH {
 		fallthru(1);
 	  }
@@ -2086,6 +2090,8 @@ gcc_attribute_spec:
 	| T_AT_MALLOC
 	| T_AT_MAY_ALIAS
 	| T_AT_MODE T_LPAREN T_NAME T_RPAREN
+	| T_AT_NO_SANITIZE T_LPAREN T_NAME T_RPAREN
+	| T_AT_NO_SANITIZE_THREAD
 	| T_AT_NOINLINE
 	| T_AT_NONNULL T_LPAREN constant_expr_list_opt T_RPAREN
 	| T_AT_NONNULL

Index: src/usr.bin/xlint/lint1/lex.c
diff -u src/usr.bin/xlint/lint1/lex.c:1.89 src/usr.bin/xlint/lint1/lex.c:1.90
--- src/usr.bin/xlint/lint1/lex.c:1.89	Tue Dec 14 15:13:13 2021
+++ src/usr.bin/xlint/lint1/lex.c	Wed Dec 15 10:20:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.89 2021/12/14 20:13:13 christos Exp $ */
+/* $NetBSD: lex.c,v 1.90 2021/12/15 15:20:51 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: lex.c,v 1.89 2021/12/14 20:13:13 christos Exp $");
+__RCSID("$NetBSD: lex.c,v 1.90 2021/12/15 15:20:51 christos Exp $");
 #endif
 
 #include <ctype.h>
@@ -160,6 +160,8 @@ static	struct	kwtab {
 	kwdef_keyword(	"default",	T_DEFAULT),
 	kwdef_gcc_attr(	"deprecated",	T_AT_DEPRECATED),
 	kwdef_gcc_attr(	"destructor",	T_AT_DESTRUCTOR),
+	kwdef_gcc_attr(	"disable_sanitizer_instrumentation",
+	    T_AT_DISABLE_SANITIZER_INSTRUMENTATION),
 	kwdef_keyword(	"do",		T_DO),
 	kwdef_type(	"double",	DOUBLE,			0,0,0,0,1),
 	kwdef_keyword(	"else",		T_ELSE),
@@ -190,6 +192,8 @@ static	struct	kwtab {
 	kwdef_gcc_attr(	"mode",		T_AT_MODE),
 	kwdef_gcc_attr("no_instrument_function",
 					T_AT_NO_INSTRUMENT_FUNCTION),
+	kwdef_gcc_attr(	"no_sanitize",	T_AT_NO_SANITIZE),
+	kwdef_gcc_attr(	"no_sanitize_thread",	T_AT_NO_SANITIZE_THREAD),
 	kwdef_gcc_attr(	"noinline",	T_AT_NOINLINE),
 	kwdef_gcc_attr(	"nonnull",	T_AT_NONNULL),
 	kwdef_gcc_attr(	"nonstring",	T_AT_NONSTRING),

Reply via email to