aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/genksyms/parse.y
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-01-21 22:59:18 -0500
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-01-21 22:59:18 -0500
commit25572364a5b88da2df1a862858bd5d6abf51c103 (patch)
treeb7287463916d77c22acc2ceb13208b72263136ea /scripts/genksyms/parse.y
parent9586fcf5c69405c54718e65367b55fe10391da4c (diff)
parent83d09ad4b950651a95d37697f1493c00d888d0db (diff)
downloadlinux-yocto-25572364a5b88da2df1a862858bd5d6abf51c103.tar.gz
linux-yocto-25572364a5b88da2df1a862858bd5d6abf51c103.tar.bz2
linux-yocto-25572364a5b88da2df1a862858bd5d6abf51c103.zip
Merge branch 'master-next'
Diffstat (limited to 'scripts/genksyms/parse.y')
-rw-r--r--scripts/genksyms/parse.y7
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/genksyms/parse.y b/scripts/genksyms/parse.y
index e22b42245bcc..8e9b5e69e8f0 100644
--- a/scripts/genksyms/parse.y
+++ b/scripts/genksyms/parse.y
@@ -80,6 +80,7 @@ static void record_compound(struct string_list **keyw,
%token SHORT_KEYW
%token SIGNED_KEYW
%token STATIC_KEYW
+%token STATIC_ASSERT_KEYW
%token STRUCT_KEYW
%token TYPEDEF_KEYW
%token UNION_KEYW
@@ -97,6 +98,7 @@ static void record_compound(struct string_list **keyw,
%token BRACE_PHRASE
%token BRACKET_PHRASE
%token EXPRESSION_PHRASE
+%token STATIC_ASSERT_PHRASE
%token CHAR
%token DOTS
@@ -130,6 +132,7 @@ declaration1:
| function_definition
| asm_definition
| export_definition
+ | static_assert
| error ';' { $$ = $2; }
| error '}' { $$ = $2; }
;
@@ -493,6 +496,10 @@ export_definition:
{ export_symbol((*$3)->string); $$ = $5; }
;
+/* Ignore any module scoped _Static_assert(...) */
+static_assert:
+ STATIC_ASSERT_PHRASE ';' { $$ = $2; }
+ ;
%%