diff options
author | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-11 21:27:24 -0800 |
---|---|---|
committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-11 21:27:24 -0800 |
commit | e40f4ee0112e6c9b0a16fb12ebd7bbcabc9b844a (patch) | |
tree | 7197d3389bee18dccc349f09a8c69711aad29a06 /kconfig/zconf.l | |
parent | 265503461b24eba2c946d6e70c760e530eaba170 (diff) | |
download | crosstool-ng-e40f4ee0112e6c9b0a16fb12ebd7bbcabc9b844a.tar.gz crosstool-ng-e40f4ee0112e6c9b0a16fb12ebd7bbcabc9b844a.tar.bz2 crosstool-ng-e40f4ee0112e6c9b0a16fb12ebd7bbcabc9b844a.zip |
kconfig: Add updates from linux-4.3 and 4.4
Add updates from the following merges:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/scripts/kconfig?id=605e9710fb5fef0dd2bb49d7b75e46601df62112
and
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/scripts/kconfig?id=152813e6e4bbb5f017e33eba7eb01bbda4b389b8
that apply to crosstool-ng.
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Diffstat (limited to 'kconfig/zconf.l')
-rw-r--r-- | kconfig/zconf.l | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/kconfig/zconf.l b/kconfig/zconf.l index 200a3fe3..c410d257 100644 --- a/kconfig/zconf.l +++ b/kconfig/zconf.l @@ -66,9 +66,16 @@ static void alloc_string(const char *str, int size) memcpy(text, str, size); text[size] = 0; } + +static void warn_ignored_character(char chr) +{ + fprintf(stderr, + "%s:%d:warning: ignoring unsupported character '%c'\n", + zconf_curname(), zconf_lineno(), chr); +} %} -n [A-Za-z0-9_] +n [A-Za-z0-9_-] %% int str = 0; @@ -106,7 +113,7 @@ n [A-Za-z0-9_] zconflval.string = text; return T_WORD; } - . + . warn_ignored_character(*yytext); \n { BEGIN(INITIAL); current_file->lineno++; @@ -132,8 +139,7 @@ n [A-Za-z0-9_] BEGIN(STRING); } \n BEGIN(INITIAL); current_file->lineno++; return T_EOL; - --- /* ignore */ - ({n}|[-/.])+ { + ({n}|[/.])+ { const struct kconf_id *id = kconf_id_lookup(yytext, yyleng); if (id && id->flags & TF_PARAM) { zconflval.id = id; @@ -146,11 +152,7 @@ n [A-Za-z0-9_] #.* /* comment */ \\\n current_file->lineno++; [[:blank:]]+ - . { - fprintf(stderr, - "%s:%d:warning: ignoring unsupported character '%c'\n", - zconf_curname(), zconf_lineno(), *yytext); - } + . warn_ignored_character(*yytext); <<EOF>> { BEGIN(INITIAL); } |