diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.fwinst | 4 | ||||
| -rw-r--r-- | scripts/genksyms/genksyms.c | 2 | ||||
| -rw-r--r-- | scripts/genksyms/lex.c_shipped | 133 | ||||
| -rw-r--r-- | scripts/genksyms/lex.l | 2 | ||||
| -rw-r--r-- | scripts/genksyms/parse.c_shipped | 144 | ||||
| -rw-r--r-- | scripts/genksyms/parse.y | 2 | ||||
| -rw-r--r-- | scripts/kconfig/conf.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/confdata.c | 8 | ||||
| -rw-r--r-- | scripts/kconfig/lex.zconf.c_shipped | 86 | ||||
| -rw-r--r-- | scripts/kconfig/zconf.l | 1 | ||||
| -rwxr-xr-x | scripts/kernel-doc | 2 | ||||
| -rw-r--r-- | scripts/mod/modpost.c | 2 | ||||
| -rwxr-xr-x | scripts/patch-kernel | 3 | ||||
| -rwxr-xr-x | scripts/ver_linux | 1 |
14 files changed, 247 insertions, 145 deletions
diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst index f63a663de158..6bf8e87f1dcf 100644 --- a/scripts/Makefile.fwinst +++ b/scripts/Makefile.fwinst | |||
| @@ -50,8 +50,12 @@ PHONY += __fw_install __fw_modinst FORCE | |||
| 50 | .PHONY: $(PHONY) | 50 | .PHONY: $(PHONY) |
| 51 | 51 | ||
| 52 | __fw_install: $(installed-fw) | 52 | __fw_install: $(installed-fw) |
| 53 | |||
| 53 | __fw_modinst: $(installed-mod-fw) | 54 | __fw_modinst: $(installed-mod-fw) |
| 55 | @: | ||
| 56 | |||
| 54 | __fw_modbuild: $(addprefix $(obj)/,$(mod-fw)) | 57 | __fw_modbuild: $(addprefix $(obj)/,$(mod-fw)) |
| 58 | @: | ||
| 55 | 59 | ||
| 56 | FORCE: | 60 | FORCE: |
| 57 | 61 | ||
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c index 4f8a3007e457..c249274e005a 100644 --- a/scripts/genksyms/genksyms.c +++ b/scripts/genksyms/genksyms.c | |||
| @@ -545,6 +545,8 @@ int main(int argc, char **argv) | |||
| 545 | } | 545 | } |
| 546 | fputs(sym->name, dumpfile); | 546 | fputs(sym->name, dumpfile); |
| 547 | putc(' ', dumpfile); | 547 | putc(' ', dumpfile); |
| 548 | if (sym->is_extern) | ||
| 549 | fputs("extern ", dumpfile); | ||
| 548 | print_list(dumpfile, sym->defn); | 550 | print_list(dumpfile, sym->defn); |
| 549 | putc('\n', dumpfile); | 551 | putc('\n', dumpfile); |
| 550 | 552 | ||
diff --git a/scripts/genksyms/lex.c_shipped b/scripts/genksyms/lex.c_shipped index 2a176988d468..2ac23bcca5b5 100644 --- a/scripts/genksyms/lex.c_shipped +++ b/scripts/genksyms/lex.c_shipped | |||
| @@ -6,10 +6,19 @@ | |||
| 6 | 6 | ||
| 7 | /* A lexical scanner generated by flex */ | 7 | /* A lexical scanner generated by flex */ |
| 8 | 8 | ||
| 9 | /* %not-for-header */ | ||
| 10 | |||
| 11 | /* %if-c-only */ | ||
| 12 | /* %if-not-reentrant */ | ||
| 13 | |||
| 14 | /* %endif */ | ||
| 15 | /* %endif */ | ||
| 16 | /* %ok-for-header */ | ||
| 17 | |||
| 9 | #define FLEX_SCANNER | 18 | #define FLEX_SCANNER |
| 10 | #define YY_FLEX_MAJOR_VERSION 2 | 19 | #define YY_FLEX_MAJOR_VERSION 2 |
| 11 | #define YY_FLEX_MINOR_VERSION 5 | 20 | #define YY_FLEX_MINOR_VERSION 5 |
| 12 | #define YY_FLEX_SUBMINOR_VERSION 33 | 21 | #define YY_FLEX_SUBMINOR_VERSION 35 |
| 13 | #if YY_FLEX_SUBMINOR_VERSION > 0 | 22 | #if YY_FLEX_SUBMINOR_VERSION > 0 |
| 14 | #define FLEX_BETA | 23 | #define FLEX_BETA |
| 15 | #endif | 24 | #endif |
| @@ -47,7 +56,7 @@ | |||
| 47 | 56 | ||
| 48 | /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ | 57 | /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ |
| 49 | 58 | ||
| 50 | #if __STDC_VERSION__ >= 199901L | 59 | #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L |
| 51 | 60 | ||
| 52 | /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, | 61 | /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, |
| 53 | * if you want the limit (max/min) macros for int types. | 62 | * if you want the limit (max/min) macros for int types. |
| @@ -70,7 +79,6 @@ typedef int flex_int32_t; | |||
| 70 | typedef unsigned char flex_uint8_t; | 79 | typedef unsigned char flex_uint8_t; |
| 71 | typedef unsigned short int flex_uint16_t; | 80 | typedef unsigned short int flex_uint16_t; |
| 72 | typedef unsigned int flex_uint32_t; | 81 | typedef unsigned int flex_uint32_t; |
| 73 | #endif /* ! C99 */ | ||
| 74 | 82 | ||
| 75 | /* Limits of integral types. */ | 83 | /* Limits of integral types. */ |
| 76 | #ifndef INT8_MIN | 84 | #ifndef INT8_MIN |
| @@ -101,6 +109,8 @@ typedef unsigned int flex_uint32_t; | |||
| 101 | #define UINT32_MAX (4294967295U) | 109 | #define UINT32_MAX (4294967295U) |
| 102 | #endif | 110 | #endif |
| 103 | 111 | ||
| 112 | #endif /* ! C99 */ | ||
| 113 | |||
| 104 | #endif /* ! FLEXINT_H */ | 114 | #endif /* ! FLEXINT_H */ |
| 105 | 115 | ||
| 106 | /* %endif */ | 116 | /* %endif */ |
| @@ -115,11 +125,12 @@ typedef unsigned int flex_uint32_t; | |||
| 115 | 125 | ||
| 116 | #else /* ! __cplusplus */ | 126 | #else /* ! __cplusplus */ |
| 117 | 127 | ||
| 118 | #if __STDC__ | 128 | /* C99 requires __STDC__ to be defined as 1. */ |
| 129 | #if defined (__STDC__) | ||
| 119 | 130 | ||
| 120 | #define YY_USE_CONST | 131 | #define YY_USE_CONST |
| 121 | 132 | ||
| 122 | #endif /* __STDC__ */ | 133 | #endif /* defined (__STDC__) */ |
| 123 | #endif /* ! __cplusplus */ | 134 | #endif /* ! __cplusplus */ |
| 124 | 135 | ||
| 125 | #ifdef YY_USE_CONST | 136 | #ifdef YY_USE_CONST |
| @@ -218,14 +229,9 @@ extern FILE *yyin, *yyout; | |||
| 218 | 229 | ||
| 219 | #define unput(c) yyunput( c, (yytext_ptr) ) | 230 | #define unput(c) yyunput( c, (yytext_ptr) ) |
| 220 | 231 | ||
| 221 | /* The following is because we cannot portably get our hands on size_t | ||
| 222 | * (without autoconf's help, which isn't available because we want | ||
| 223 | * flex-generated scanners to compile on their own). | ||
| 224 | */ | ||
| 225 | |||
| 226 | #ifndef YY_TYPEDEF_YY_SIZE_T | 232 | #ifndef YY_TYPEDEF_YY_SIZE_T |
| 227 | #define YY_TYPEDEF_YY_SIZE_T | 233 | #define YY_TYPEDEF_YY_SIZE_T |
| 228 | typedef unsigned int yy_size_t; | 234 | typedef size_t yy_size_t; |
| 229 | #endif | 235 | #endif |
| 230 | 236 | ||
| 231 | #ifndef YY_STRUCT_YY_BUFFER_STATE | 237 | #ifndef YY_STRUCT_YY_BUFFER_STATE |
| @@ -401,7 +407,7 @@ void yyfree (void * ); | |||
| 401 | /* %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here */ | 407 | /* %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here */ |
| 402 | /* Begin user sect3 */ | 408 | /* Begin user sect3 */ |
| 403 | 409 | ||
| 404 | #define yywrap() 1 | 410 | #define yywrap(n) 1 |
| 405 | #define YY_SKIP_YYWRAP | 411 | #define YY_SKIP_YYWRAP |
| 406 | 412 | ||
| 407 | #define FLEX_DEBUG | 413 | #define FLEX_DEBUG |
| @@ -613,8 +619,8 @@ int yy_flex_debug = 1; | |||
| 613 | 619 | ||
| 614 | static yyconst flex_int16_t yy_rule_linenum[13] = | 620 | static yyconst flex_int16_t yy_rule_linenum[13] = |
| 615 | { 0, | 621 | { 0, |
| 616 | 69, 70, 71, 74, 77, 78, 79, 85, 86, 87, | 622 | 71, 72, 73, 76, 79, 80, 81, 87, 88, 89, |
| 617 | 89, 92 | 623 | 91, 94 |
| 618 | } ; | 624 | } ; |
| 619 | 625 | ||
| 620 | /* The intent behind this definition is that it'll catch | 626 | /* The intent behind this definition is that it'll catch |
| @@ -665,7 +671,8 @@ char *yytext; | |||
| 665 | quite so pedantic. */ | 671 | quite so pedantic. */ |
| 666 | 672 | ||
| 667 | /* We don't do multiple input files. */ | 673 | /* We don't do multiple input files. */ |
| 668 | #line 669 "scripts/genksyms/lex.c" | 674 | #define YY_NO_INPUT 1 |
| 675 | #line 676 "scripts/genksyms/lex.c" | ||
| 669 | 676 | ||
| 670 | #define INITIAL 0 | 677 | #define INITIAL 0 |
| 671 | #define V2_TOKENS 1 | 678 | #define V2_TOKENS 1 |
| @@ -695,9 +702,39 @@ static int yy_init_globals (void ); | |||
| 695 | /* %endif */ | 702 | /* %endif */ |
| 696 | /* %if-reentrant */ | 703 | /* %if-reentrant */ |
| 697 | /* %endif */ | 704 | /* %endif */ |
| 705 | /* %endif End reentrant structures and macros. */ | ||
| 706 | |||
| 707 | /* Accessor methods to globals. | ||
| 708 | These are made visible to non-reentrant scanners for convenience. */ | ||
| 709 | |||
| 710 | int yylex_destroy (void ); | ||
| 711 | |||
| 712 | int yyget_debug (void ); | ||
| 713 | |||
| 714 | void yyset_debug (int debug_flag ); | ||
| 715 | |||
| 716 | YY_EXTRA_TYPE yyget_extra (void ); | ||
| 717 | |||
| 718 | void yyset_extra (YY_EXTRA_TYPE user_defined ); | ||
| 719 | |||
| 720 | FILE *yyget_in (void ); | ||
| 721 | |||
| 722 | void yyset_in (FILE * in_str ); | ||
| 723 | |||
| 724 | FILE *yyget_out (void ); | ||
| 725 | |||
| 726 | void yyset_out (FILE * out_str ); | ||
| 727 | |||
| 728 | int yyget_leng (void ); | ||
| 729 | |||
| 730 | char *yyget_text (void ); | ||
| 731 | |||
| 732 | int yyget_lineno (void ); | ||
| 733 | |||
| 734 | void yyset_lineno (int line_number ); | ||
| 735 | |||
| 698 | /* %if-bison-bridge */ | 736 | /* %if-bison-bridge */ |
| 699 | /* %endif */ | 737 | /* %endif */ |
| 700 | /* %endif End reentrant structures and macros. */ | ||
| 701 | 738 | ||
| 702 | /* Macros after this point can all be overridden by user definitions in | 739 | /* Macros after this point can all be overridden by user definitions in |
| 703 | * section 1. | 740 | * section 1. |
| @@ -756,7 +793,7 @@ static int input (void ); | |||
| 756 | /* This used to be an fputs(), but since the string might contain NUL's, | 793 | /* This used to be an fputs(), but since the string might contain NUL's, |
| 757 | * we now use fwrite(). | 794 | * we now use fwrite(). |
| 758 | */ | 795 | */ |
| 759 | #define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) | 796 | #define ECHO fwrite( yytext, yyleng, 1, yyout ) |
| 760 | /* %endif */ | 797 | /* %endif */ |
| 761 | /* %if-c++-only C++ definition */ | 798 | /* %if-c++-only C++ definition */ |
| 762 | /* %endif */ | 799 | /* %endif */ |
| @@ -881,12 +918,12 @@ YY_DECL | |||
| 881 | register int yy_act; | 918 | register int yy_act; |
| 882 | 919 | ||
| 883 | /* %% [7.0] user's declarations go here */ | 920 | /* %% [7.0] user's declarations go here */ |
| 884 | #line 65 "scripts/genksyms/lex.l" | 921 | #line 67 "scripts/genksyms/lex.l" |
| 885 | 922 | ||
| 886 | 923 | ||
| 887 | 924 | ||
| 888 | /* Keep track of our location in the original source files. */ | 925 | /* Keep track of our location in the original source files. */ |
| 889 | #line 890 "scripts/genksyms/lex.c" | 926 | #line 927 "scripts/genksyms/lex.c" |
| 890 | 927 | ||
| 891 | if ( !(yy_init) ) | 928 | if ( !(yy_init) ) |
| 892 | { | 929 | { |
| @@ -1004,42 +1041,42 @@ do_action: /* This label is used only to access EOF actions. */ | |||
| 1004 | case 1: | 1041 | case 1: |
| 1005 | /* rule 1 can match eol */ | 1042 | /* rule 1 can match eol */ |
| 1006 | YY_RULE_SETUP | 1043 | YY_RULE_SETUP |
| 1007 | #line 69 "scripts/genksyms/lex.l" | 1044 | #line 71 "scripts/genksyms/lex.l" |
| 1008 | return FILENAME; | 1045 | return FILENAME; |
| 1009 | YY_BREAK | 1046 | YY_BREAK |
| 1010 | case 2: | 1047 | case 2: |
| 1011 | /* rule 2 can match eol */ | 1048 | /* rule 2 can match eol */ |
| 1012 | YY_RULE_SETUP | 1049 | YY_RULE_SETUP |
| 1013 | #line 70 "scripts/genksyms/lex.l" | 1050 | #line 72 "scripts/genksyms/lex.l" |
| 1014 | cur_line++; | 1051 | cur_line++; |
| 1015 | YY_BREAK | 1052 | YY_BREAK |
| 1016 | case 3: | 1053 | case 3: |
| 1017 | /* rule 3 can match eol */ | 1054 | /* rule 3 can match eol */ |
| 1018 | YY_RULE_SETUP | 1055 | YY_RULE_SETUP |
| 1019 | #line 71 "scripts/genksyms/lex.l" | 1056 | #line 73 "scripts/genksyms/lex.l" |
| 1020 | cur_line++; | 1057 | cur_line++; |
| 1021 | YY_BREAK | 1058 | YY_BREAK |
| 1022 | /* Ignore all other whitespace. */ | 1059 | /* Ignore all other whitespace. */ |
| 1023 | case 4: | 1060 | case 4: |
| 1024 | YY_RULE_SETUP | 1061 | YY_RULE_SETUP |
| 1025 | #line 74 "scripts/genksyms/lex.l" | 1062 | #line 76 "scripts/genksyms/lex.l" |
| 1026 | ; | 1063 | ; |
| 1027 | YY_BREAK | 1064 | YY_BREAK |
| 1028 | case 5: | 1065 | case 5: |
| 1029 | /* rule 5 can match eol */ | 1066 | /* rule 5 can match eol */ |
| 1030 | YY_RULE_SETUP | 1067 | YY_RULE_SETUP |
| 1031 | #line 77 "scripts/genksyms/lex.l" | 1068 | #line 79 "scripts/genksyms/lex.l" |
| 1032 | return STRING; | 1069 | return STRING; |
| 1033 | YY_BREAK | 1070 | YY_BREAK |
| 1034 | case 6: | 1071 | case 6: |
| 1035 | /* rule 6 can match eol */ | 1072 | /* rule 6 can match eol */ |
| 1036 | YY_RULE_SETUP | 1073 | YY_RULE_SETUP |
| 1037 | #line 78 "scripts/genksyms/lex.l" | 1074 | #line 80 "scripts/genksyms/lex.l" |
| 1038 | return CHAR; | 1075 | return CHAR; |
| 1039 | YY_BREAK | 1076 | YY_BREAK |
| 1040 | case 7: | 1077 | case 7: |
| 1041 | YY_RULE_SETUP | 1078 | YY_RULE_SETUP |
| 1042 | #line 79 "scripts/genksyms/lex.l" | 1079 | #line 81 "scripts/genksyms/lex.l" |
| 1043 | return IDENT; | 1080 | return IDENT; |
| 1044 | YY_BREAK | 1081 | YY_BREAK |
| 1045 | /* The Pedant requires that the other C multi-character tokens be | 1082 | /* The Pedant requires that the other C multi-character tokens be |
| @@ -1048,36 +1085,36 @@ return IDENT; | |||
| 1048 | around them properly. */ | 1085 | around them properly. */ |
| 1049 | case 8: | 1086 | case 8: |
| 1050 | YY_RULE_SETUP | 1087 | YY_RULE_SETUP |
| 1051 | #line 85 "scripts/genksyms/lex.l" | 1088 | #line 87 "scripts/genksyms/lex.l" |
| 1052 | return OTHER; | 1089 | return OTHER; |
| 1053 | YY_BREAK | 1090 | YY_BREAK |
| 1054 | case 9: | 1091 | case 9: |
| 1055 | YY_RULE_SETUP | 1092 | YY_RULE_SETUP |
| 1056 | #line 86 "scripts/genksyms/lex.l" | 1093 | #line 88 "scripts/genksyms/lex.l" |
| 1057 | return INT; | 1094 | return INT; |
| 1058 | YY_BREAK | 1095 | YY_BREAK |
| 1059 | case 10: | 1096 | case 10: |
| 1060 | YY_RULE_SETUP | 1097 | YY_RULE_SETUP |
| 1061 | #line 87 "scripts/genksyms/lex.l" | 1098 | #line 89 "scripts/genksyms/lex.l" |
| 1062 | return REAL; | 1099 | return REAL; |
| 1063 | YY_BREAK | 1100 | YY_BREAK |
| 1064 | case 11: | 1101 | case 11: |
| 1065 | YY_RULE_SETUP | 1102 | YY_RULE_SETUP |
| 1066 | #line 89 "scripts/genksyms/lex.l" | 1103 | #line 91 "scripts/genksyms/lex.l" |
| 1067 | return DOTS; | 1104 | return DOTS; |
| 1068 | YY_BREAK | 1105 | YY_BREAK |
| 1069 | /* All other tokens are single characters. */ | 1106 | /* All other tokens are single characters. */ |
| 1070 | case 12: | 1107 | case 12: |
| 1071 | YY_RULE_SETUP | 1108 | YY_RULE_SETUP |
| 1072 | #line 92 "scripts/genksyms/lex.l" | 1109 | #line 94 "scripts/genksyms/lex.l" |
| 1073 | return yytext[0]; | 1110 | return yytext[0]; |
| 1074 | YY_BREAK | 1111 | YY_BREAK |
| 1075 | case 13: | 1112 | case 13: |
| 1076 | YY_RULE_SETUP | 1113 | YY_RULE_SETUP |
| 1077 | #line 95 "scripts/genksyms/lex.l" | 1114 | #line 97 "scripts/genksyms/lex.l" |
| 1078 | ECHO; | 1115 | ECHO; |
| 1079 | YY_BREAK | 1116 | YY_BREAK |
| 1080 | #line 1081 "scripts/genksyms/lex.c" | 1117 | #line 1118 "scripts/genksyms/lex.c" |
| 1081 | case YY_STATE_EOF(INITIAL): | 1118 | case YY_STATE_EOF(INITIAL): |
| 1082 | case YY_STATE_EOF(V2_TOKENS): | 1119 | case YY_STATE_EOF(V2_TOKENS): |
| 1083 | yyterminate(); | 1120 | yyterminate(); |
| @@ -1346,6 +1383,14 @@ static int yy_get_next_buffer (void) | |||
| 1346 | else | 1383 | else |
| 1347 | ret_val = EOB_ACT_CONTINUE_SCAN; | 1384 | ret_val = EOB_ACT_CONTINUE_SCAN; |
| 1348 | 1385 | ||
| 1386 | if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { | ||
| 1387 | /* Extend the array by 50%, plus the number we really need. */ | ||
| 1388 | yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); | ||
| 1389 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); | ||
| 1390 | if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) | ||
| 1391 | YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); | ||
| 1392 | } | ||
| 1393 | |||
| 1349 | (yy_n_chars) += number_to_move; | 1394 | (yy_n_chars) += number_to_move; |
| 1350 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; | 1395 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; |
| 1351 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; | 1396 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; |
| @@ -1851,7 +1896,9 @@ static void yyensure_buffer_stack (void) | |||
| 1851 | (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc | 1896 | (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc |
| 1852 | (num_to_alloc * sizeof(struct yy_buffer_state*) | 1897 | (num_to_alloc * sizeof(struct yy_buffer_state*) |
| 1853 | ); | 1898 | ); |
| 1854 | 1899 | if ( ! (yy_buffer_stack) ) | |
| 1900 | YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); | ||
| 1901 | |||
| 1855 | memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); | 1902 | memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); |
| 1856 | 1903 | ||
| 1857 | (yy_buffer_stack_max) = num_to_alloc; | 1904 | (yy_buffer_stack_max) = num_to_alloc; |
| @@ -1869,6 +1916,8 @@ static void yyensure_buffer_stack (void) | |||
| 1869 | ((yy_buffer_stack), | 1916 | ((yy_buffer_stack), |
| 1870 | num_to_alloc * sizeof(struct yy_buffer_state*) | 1917 | num_to_alloc * sizeof(struct yy_buffer_state*) |
| 1871 | ); | 1918 | ); |
| 1919 | if ( ! (yy_buffer_stack) ) | ||
| 1920 | YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); | ||
| 1872 | 1921 | ||
| 1873 | /* zero only the new slots.*/ | 1922 | /* zero only the new slots.*/ |
| 1874 | memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); | 1923 | memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); |
| @@ -2092,7 +2141,7 @@ void yyset_debug (int bdebug ) | |||
| 2092 | /* %if-reentrant */ | 2141 | /* %if-reentrant */ |
| 2093 | /* %if-bison-bridge */ | 2142 | /* %if-bison-bridge */ |
| 2094 | /* %endif */ | 2143 | /* %endif */ |
| 2095 | /* %endif */ | 2144 | /* %endif if-c-only */ |
| 2096 | 2145 | ||
| 2097 | /* %if-c-only */ | 2146 | /* %if-c-only */ |
| 2098 | static int yy_init_globals (void) | 2147 | static int yy_init_globals (void) |
| @@ -2124,13 +2173,9 @@ static int yy_init_globals (void) | |||
| 2124 | } | 2173 | } |
| 2125 | /* %endif */ | 2174 | /* %endif */ |
| 2126 | 2175 | ||
| 2127 | /* %if-c-or-c++ */ | 2176 | /* %if-c-only SNIP! this currently causes conflicts with the c++ scanner */ |
| 2128 | /* %if-c-only */ | ||
| 2129 | /* yylex_destroy is for both reentrant and non-reentrant scanners. */ | 2177 | /* yylex_destroy is for both reentrant and non-reentrant scanners. */ |
| 2130 | int yylex_destroy (void) | 2178 | int yylex_destroy (void) |
| 2131 | /* %endif */ | ||
| 2132 | /* %if-c++-only */ | ||
| 2133 | /* %endif */ | ||
| 2134 | { | 2179 | { |
| 2135 | 2180 | ||
| 2136 | /* Pop the buffer stack, destroying each element. */ | 2181 | /* Pop the buffer stack, destroying each element. */ |
| @@ -2144,11 +2189,6 @@ int yylex_destroy (void) | |||
| 2144 | yyfree((yy_buffer_stack) ); | 2189 | yyfree((yy_buffer_stack) ); |
| 2145 | (yy_buffer_stack) = NULL; | 2190 | (yy_buffer_stack) = NULL; |
| 2146 | 2191 | ||
| 2147 | /* %if-c++-only */ | ||
| 2148 | /* %endif */ | ||
| 2149 | |||
| 2150 | /* %if-c-only */ | ||
| 2151 | |||
| 2152 | /* Reset the globals. This is important in a non-reentrant scanner so the next time | 2192 | /* Reset the globals. This is important in a non-reentrant scanner so the next time |
| 2153 | * yylex() is called, initialization will occur. */ | 2193 | * yylex() is called, initialization will occur. */ |
| 2154 | yy_init_globals( ); | 2194 | yy_init_globals( ); |
| @@ -2156,7 +2196,6 @@ int yylex_destroy (void) | |||
| 2156 | /* %if-reentrant */ | 2196 | /* %if-reentrant */ |
| 2157 | /* %endif */ | 2197 | /* %endif */ |
| 2158 | return 0; | 2198 | return 0; |
| 2159 | /* %endif */ | ||
| 2160 | } | 2199 | } |
| 2161 | /* %endif */ | 2200 | /* %endif */ |
| 2162 | 2201 | ||
| @@ -2213,7 +2252,7 @@ void yyfree (void * ptr ) | |||
| 2213 | 2252 | ||
| 2214 | /* %ok-for-header */ | 2253 | /* %ok-for-header */ |
| 2215 | 2254 | ||
| 2216 | #line 95 "scripts/genksyms/lex.l" | 2255 | #line 97 "scripts/genksyms/lex.l" |
| 2217 | 2256 | ||
| 2218 | 2257 | ||
| 2219 | 2258 | ||
diff --git a/scripts/genksyms/lex.l b/scripts/genksyms/lex.l index 5e544a06678b..fe50ff9dacd0 100644 --- a/scripts/genksyms/lex.l +++ b/scripts/genksyms/lex.l | |||
| @@ -62,6 +62,8 @@ MC_TOKEN ([~%^&*+=|<>/-]=)|(&&)|("||")|(->)|(<<)|(>>) | |||
| 62 | /* We don't do multiple input files. */ | 62 | /* We don't do multiple input files. */ |
| 63 | %option noyywrap | 63 | %option noyywrap |
| 64 | 64 | ||
| 65 | %option noinput | ||
| 66 | |||
| 65 | %% | 67 | %% |
| 66 | 68 | ||
| 67 | 69 | ||
diff --git a/scripts/genksyms/parse.c_shipped b/scripts/genksyms/parse.c_shipped index 3e6079f36b9f..eaee44e66a43 100644 --- a/scripts/genksyms/parse.c_shipped +++ b/scripts/genksyms/parse.c_shipped | |||
| @@ -504,7 +504,7 @@ static const yytype_uint16 yyprhs[] = | |||
| 504 | 239, 242, 245, 247, 248, 250, 252, 257, 262, 265, | 504 | 239, 242, 245, 247, 248, 250, 252, 257, 262, 265, |
| 505 | 269, 273, 277, 278, 280, 283, 287, 291, 292, 294, | 505 | 269, 273, 277, 278, 280, 283, 287, 291, 292, 294, |
| 506 | 296, 299, 303, 306, 307, 309, 311, 315, 318, 321, | 506 | 296, 299, 303, 306, 307, 309, 311, 315, 318, 321, |
| 507 | 323, 326, 327, 329, 332, 333, 335 | 507 | 323, 326, 327, 330, 333, 334, 336 |
| 508 | }; | 508 | }; |
| 509 | 509 | ||
| 510 | /* YYRHS -- A `-1'-separated list of the rules' RHS. */ | 510 | /* YYRHS -- A `-1'-separated list of the rules' RHS. */ |
| @@ -542,9 +542,9 @@ static const yytype_int8 yyrhs[] = | |||
| 542 | -1, -1, 89, -1, 90, -1, 89, 90, -1, 64, | 542 | -1, -1, 89, -1, 90, -1, 89, 90, -1, 64, |
| 543 | 91, 44, -1, 1, 44, -1, -1, 92, -1, 93, | 543 | 91, 44, -1, 1, 44, -1, -1, 92, -1, 93, |
| 544 | -1, 92, 46, 93, -1, 76, 95, -1, 37, 94, | 544 | -1, 92, 46, 93, -1, 76, 95, -1, 37, 94, |
| 545 | -1, 94, -1, 52, 34, -1, -1, 31, -1, 30, | 545 | -1, 94, -1, 52, 34, -1, -1, 95, 31, -1, |
| 546 | 44, -1, -1, 30, -1, 29, 47, 37, 49, 44, | 546 | 30, 44, -1, -1, 30, -1, 29, 47, 37, 49, |
| 547 | -1 | 547 | 44, -1 |
| 548 | }; | 548 | }; |
| 549 | 549 | ||
| 550 | /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ | 550 | /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ |
| @@ -647,7 +647,7 @@ static const yytype_uint8 yyr2[] = | |||
| 647 | 2, 2, 1, 0, 1, 1, 4, 4, 2, 3, | 647 | 2, 2, 1, 0, 1, 1, 4, 4, 2, 3, |
| 648 | 3, 3, 0, 1, 2, 3, 3, 0, 1, 1, | 648 | 3, 3, 0, 1, 2, 3, 3, 0, 1, 1, |
| 649 | 2, 3, 2, 0, 1, 1, 3, 2, 2, 1, | 649 | 2, 3, 2, 0, 1, 1, 3, 2, 2, 1, |
| 650 | 2, 0, 1, 2, 0, 1, 5 | 650 | 2, 0, 2, 2, 0, 1, 5 |
| 651 | }; | 651 | }; |
| 652 | 652 | ||
| 653 | /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state | 653 | /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state |
| @@ -667,9 +667,9 @@ static const yytype_uint8 yydefact[] = | |||
| 667 | 0, 66, 125, 101, 121, 71, 0, 7, 112, 106, | 667 | 0, 66, 125, 101, 121, 71, 0, 7, 112, 106, |
| 668 | 76, 77, 0, 0, 0, 121, 75, 0, 114, 115, | 668 | 76, 77, 0, 0, 0, 121, 75, 0, 114, 115, |
| 669 | 119, 105, 0, 110, 124, 0, 36, 0, 73, 72, | 669 | 119, 105, 0, 110, 124, 0, 36, 0, 73, 72, |
| 670 | 61, 20, 122, 102, 0, 93, 0, 84, 87, 88, | 670 | 61, 20, 102, 0, 93, 0, 84, 87, 88, 118, |
| 671 | 118, 0, 76, 0, 120, 74, 117, 80, 0, 111, | 671 | 0, 76, 0, 120, 74, 117, 80, 0, 111, 0, |
| 672 | 0, 35, 126, 0, 21, 103, 70, 94, 56, 0, | 672 | 35, 126, 122, 0, 21, 103, 70, 94, 56, 0, |
| 673 | 93, 90, 92, 69, 83, 0, 82, 81, 0, 0, | 673 | 93, 90, 92, 69, 83, 0, 82, 81, 0, 0, |
| 674 | 116, 104, 0, 95, 0, 91, 98, 0, 85, 89, | 674 | 116, 104, 0, 95, 0, 91, 98, 0, 85, 89, |
| 675 | 79, 78, 100, 99, 0, 0, 97, 96 | 675 | 79, 78, 100, 99, 0, 0, 97, 96 |
| @@ -680,44 +680,44 @@ static const yytype_int16 yydefgoto[] = | |||
| 680 | { | 680 | { |
| 681 | -1, 1, 2, 3, 35, 72, 55, 36, 64, 65, | 681 | -1, 1, 2, 3, 35, 72, 55, 36, 64, 65, |
| 682 | 66, 75, 38, 39, 40, 41, 42, 67, 86, 87, | 682 | 66, 75, 38, 39, 40, 41, 42, 67, 86, 87, |
| 683 | 43, 114, 69, 105, 106, 126, 127, 128, 129, 151, | 683 | 43, 114, 69, 105, 106, 125, 126, 127, 128, 151, |
| 684 | 152, 44, 144, 145, 54, 76, 77, 78, 107, 108, | 684 | 152, 44, 144, 145, 54, 76, 77, 78, 107, 108, |
| 685 | 109, 110, 123, 45, 94, 46 | 685 | 109, 110, 122, 45, 94, 46 |
| 686 | }; | 686 | }; |
| 687 | 687 | ||
| 688 | /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing | 688 | /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing |
| 689 | STATE-NUM. */ | 689 | STATE-NUM. */ |
| 690 | #define YYPACT_NINF -135 | 690 | #define YYPACT_NINF -134 |
| 691 | static const yytype_int16 yypact[] = | 691 | static const yytype_int16 yypact[] = |
| 692 | { | 692 | { |
| 693 | -135, 11, -135, 312, -135, -135, 24, -135, -135, -135, | 693 | -134, 16, -134, 312, -134, -134, 20, -134, -134, -134, |
| 694 | -135, -135, -23, -135, -2, -135, -135, -135, -135, -135, | 694 | -134, -134, -18, -134, -3, -134, -134, -134, -134, -134, |
| 695 | -135, -135, -135, -135, -17, -135, -11, -135, -135, -135, | 695 | -134, -134, -134, -134, -26, -134, -25, -134, -134, -134, |
| 696 | -3, 16, 26, -135, -135, -135, -135, 34, 482, -135, | 696 | -7, 5, 27, -134, -134, -134, -134, 46, 482, -134, |
| 697 | -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, | 697 | -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, |
| 698 | -8, -135, 22, 97, -135, 482, 22, -135, 482, 56, | 698 | -8, -134, 30, 97, -134, 482, 30, -134, 482, 7, |
| 699 | -135, -135, 12, 10, 50, 49, -135, 34, -13, 15, | 699 | -134, -134, 12, 10, 42, 55, -134, 46, -15, 15, |
| 700 | -135, -135, 482, -135, 47, -25, 51, 145, -135, -135, | 700 | -134, -134, 482, -134, 25, 26, 47, 145, -134, -134, |
| 701 | 34, -135, 356, 52, 71, 77, -135, 10, -135, -135, | 701 | 46, -134, 356, 39, 71, 77, -134, 10, -134, -134, |
| 702 | 34, -135, -135, -135, 68, -135, 193, -135, -135, -135, | 702 | 46, -134, -134, -134, -134, -134, 193, -134, -134, -134, |
| 703 | 48, -135, 6, 93, 37, 68, 18, 85, 84, -135, | 703 | 75, -134, 6, 95, 43, -134, 28, 86, 85, -134, |
| 704 | -135, -135, 87, -135, 102, 86, -135, 89, -135, -135, | 704 | -134, -134, 88, -134, 103, 87, -134, 91, -134, -134, |
| 705 | -135, -135, -135, 90, 88, 401, 94, 100, 101, -135, | 705 | -134, -134, -23, 90, 401, 94, 101, 102, -134, -134, |
| 706 | -135, 99, -135, 108, -135, -135, -135, -135, 230, -135, | 706 | 98, -134, 108, -134, -134, 109, -134, 230, -134, 26, |
| 707 | -25, -135, -135, 105, -135, -135, -135, -135, -135, 9, | 707 | -134, -134, -134, 134, -134, -134, -134, -134, -134, 9, |
| 708 | 42, -135, 28, -135, -135, 445, -135, -135, 119, 125, | 708 | 48, -134, 35, -134, -134, 445, -134, -134, 125, 126, |
| 709 | -135, -135, 126, -135, 128, -135, -135, 267, -135, -135, | 709 | -134, -134, 128, -134, 129, -134, -134, 267, -134, -134, |
| 710 | -135, -135, -135, -135, 129, 130, -135, -135 | 710 | -134, -134, -134, -134, 130, 131, -134, -134 |
| 711 | }; | 711 | }; |
| 712 | 712 | ||
| 713 | /* YYPGOTO[NTERM-NUM]. */ | 713 | /* YYPGOTO[NTERM-NUM]. */ |
| 714 | static const yytype_int16 yypgoto[] = | 714 | static const yytype_int16 yypgoto[] = |
| 715 | { | 715 | { |
| 716 | -135, -135, 179, -135, -135, -135, -135, -47, -135, -135, | 716 | -134, -134, 180, -134, -134, -134, -134, -33, -134, -134, |
| 717 | 91, 0, -58, -37, -135, -135, -135, -73, -135, -135, | 717 | 93, 0, -58, -37, -134, -134, -134, -73, -134, -134, |
| 718 | -48, -32, -135, -38, -135, -134, -135, -135, 29, -63, | 718 | -54, -32, -134, -81, -134, -133, -134, -134, 29, -50, |
| 719 | -135, -135, -135, -135, -20, -135, -135, 106, -135, -135, | 719 | -134, -134, -134, -134, -20, -134, -134, 110, -134, -134, |
| 720 | 45, 95, 82, -135, -135, -135 | 720 | 49, 96, 80, -134, -134, -134 |
| 721 | }; | 721 | }; |
| 722 | 722 | ||
| 723 | /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If | 723 | /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If |
| @@ -727,26 +727,26 @@ static const yytype_int16 yypgoto[] = | |||
| 727 | #define YYTABLE_NINF -109 | 727 | #define YYTABLE_NINF -109 |
| 728 | static const yytype_int16 yytable[] = | 728 | static const yytype_int16 yytable[] = |
| 729 | { | 729 | { |
| 730 | 82, 70, 104, 37, 159, 68, 57, 131, 79, 49, | 730 | 82, 70, 104, 37, 159, 68, 57, 130, 142, 88, |
| 731 | 162, 4, 100, 84, 50, 88, 101, 92, 10, 93, | 731 | 162, 52, 56, 84, 49, 92, 4, 93, 10, 50, |
| 732 | 52, 51, 102, 63, 71, 97, 56, 103, 20, 104, | 732 | 51, 132, 79, 134, 71, 53, 53, 143, 20, 104, |
| 733 | 85, 104, 73, 175, 53, 91, 81, 29, 125, 120, | 733 | 85, 104, 73, 120, 175, 91, 81, 29, 124, 97, |
| 734 | 53, 33, -93, 132, 58, 70, 147, 101, 95, 61, | 734 | 58, 33, -93, 131, 83, 70, 147, 101, 95, 61, |
| 735 | 163, 137, 150, 102, 63, 80, 149, 63, -93, 62, | 735 | 163, 150, 59, 102, 63, 80, 149, 63, -93, 62, |
| 736 | 63, 166, 96, 59, 133, 138, 135, 104, 47, 48, | 736 | 63, 136, 96, 100, 47, 48, 104, 101, 166, 98, |
| 737 | 60, 61, 80, 53, 132, 167, 150, 150, 101, 147, | 737 | 99, 60, 80, 102, 63, 137, 150, 150, 103, 124, |
| 738 | 125, 62, 63, 163, 102, 63, 164, 165, 70, 149, | 738 | 131, 53, 167, 61, 101, 147, 89, 70, 117, 163, |
| 739 | 63, 98, 99, 83, 89, 90, 111, 125, 74, 122, | 739 | 102, 63, 111, 62, 63, 149, 63, 124, 74, 164, |
| 740 | 103, 117, 7, 8, 9, 10, 11, 12, 13, 125, | 740 | 165, 90, 7, 8, 9, 10, 11, 12, 13, 124, |
| 741 | 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, | 741 | 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, |
| 742 | 118, 26, 27, 28, 29, 30, 119, 134, 33, 139, | 742 | 118, 26, 27, 28, 29, 30, 119, 103, 33, 133, |
| 743 | 140, 98, 92, 142, -22, 141, 154, 146, 34, 161, | 743 | 138, 139, 98, 92, -22, 141, 140, 154, 34, 146, |
| 744 | 143, -22, -107, 153, -22, -22, 112, 155, 156, -22, | 744 | 142, -22, -107, 153, -22, -22, 112, 156, 155, -22, |
| 745 | 7, 8, 9, 10, 11, 12, 13, 157, 15, 16, | 745 | 7, 8, 9, 10, 11, 12, 13, 157, 15, 16, |
| 746 | 17, 18, 19, 20, 21, 22, 23, 24, 170, 26, | 746 | 17, 18, 19, 20, 21, 22, 23, 24, 161, 26, |
| 747 | 27, 28, 29, 30, 171, 172, 33, 173, 176, 177, | 747 | 27, 28, 29, 30, 170, 171, 33, 172, 173, 176, |
| 748 | 5, 121, -22, 113, 169, 160, 34, 136, 0, -22, | 748 | 177, 5, -22, 121, 169, 135, 34, 113, 160, -22, |
| 749 | -108, 0, -22, -22, 124, 130, 0, -22, 7, 8, | 749 | -108, 0, -22, -22, 123, 0, 129, -22, 7, 8, |
| 750 | 9, 10, 11, 12, 13, 0, 15, 16, 17, 18, | 750 | 9, 10, 11, 12, 13, 0, 15, 16, 17, 18, |
| 751 | 19, 20, 21, 22, 23, 24, 0, 26, 27, 28, | 751 | 19, 20, 21, 22, 23, 24, 0, 26, 27, 28, |
| 752 | 29, 30, 0, 0, 33, 0, 0, 0, 0, -86, | 752 | 29, 30, 0, 0, 33, 0, 0, 0, 0, -86, |
| @@ -784,26 +784,26 @@ static const yytype_int16 yytable[] = | |||
| 784 | 784 | ||
| 785 | static const yytype_int16 yycheck[] = | 785 | static const yytype_int16 yycheck[] = |
| 786 | { | 786 | { |
| 787 | 58, 38, 75, 3, 138, 37, 26, 1, 55, 32, | 787 | 58, 38, 75, 3, 137, 37, 26, 1, 31, 63, |
| 788 | 1, 0, 37, 1, 37, 63, 41, 30, 8, 32, | 788 | 1, 37, 37, 1, 32, 30, 0, 32, 8, 37, |
| 789 | 37, 23, 47, 48, 32, 72, 37, 52, 18, 102, | 789 | 23, 102, 55, 104, 32, 51, 51, 50, 18, 102, |
| 790 | 62, 104, 52, 167, 51, 67, 56, 27, 96, 87, | 790 | 62, 104, 52, 87, 167, 67, 56, 27, 96, 72, |
| 791 | 51, 31, 33, 37, 47, 82, 37, 41, 33, 37, | 791 | 47, 31, 33, 37, 37, 82, 37, 41, 33, 37, |
| 792 | 41, 33, 125, 47, 48, 55, 47, 48, 49, 47, | 792 | 41, 124, 47, 47, 48, 55, 47, 48, 49, 47, |
| 793 | 48, 33, 47, 47, 102, 47, 104, 140, 44, 45, | 793 | 48, 33, 47, 37, 44, 45, 139, 41, 33, 44, |
| 794 | 44, 37, 72, 51, 37, 47, 149, 150, 41, 37, | 794 | 45, 44, 72, 47, 48, 47, 149, 150, 52, 137, |
| 795 | 138, 47, 48, 41, 47, 48, 149, 150, 125, 47, | 795 | 37, 51, 47, 37, 41, 37, 44, 124, 49, 41, |
| 796 | 48, 44, 45, 37, 44, 46, 45, 155, 1, 31, | 796 | 47, 48, 45, 47, 48, 47, 48, 155, 1, 149, |
| 797 | 52, 49, 5, 6, 7, 8, 9, 10, 11, 167, | 797 | 150, 46, 5, 6, 7, 8, 9, 10, 11, 167, |
| 798 | 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, | 798 | 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, |
| 799 | 49, 24, 25, 26, 27, 28, 49, 34, 31, 44, | 799 | 49, 24, 25, 26, 27, 28, 49, 52, 31, 34, |
| 800 | 46, 44, 30, 44, 37, 49, 36, 49, 41, 34, | 800 | 44, 46, 44, 30, 37, 44, 49, 36, 41, 49, |
| 801 | 50, 44, 45, 49, 47, 48, 1, 46, 49, 52, | 801 | 31, 44, 45, 49, 47, 48, 1, 49, 46, 52, |
| 802 | 5, 6, 7, 8, 9, 10, 11, 49, 13, 14, | 802 | 5, 6, 7, 8, 9, 10, 11, 49, 13, 14, |
| 803 | 15, 16, 17, 18, 19, 20, 21, 22, 49, 24, | 803 | 15, 16, 17, 18, 19, 20, 21, 22, 34, 24, |
| 804 | 25, 26, 27, 28, 49, 49, 31, 49, 49, 49, | 804 | 25, 26, 27, 28, 49, 49, 31, 49, 49, 49, |
| 805 | 1, 90, 37, 77, 155, 140, 41, 105, -1, 44, | 805 | 49, 1, 37, 90, 155, 105, 41, 77, 139, 44, |
| 806 | 45, -1, 47, 48, 1, 100, -1, 52, 5, 6, | 806 | 45, -1, 47, 48, 1, -1, 100, 52, 5, 6, |
| 807 | 7, 8, 9, 10, 11, -1, 13, 14, 15, 16, | 807 | 7, 8, 9, 10, 11, -1, 13, 14, 15, 16, |
| 808 | 17, 18, 19, 20, 21, 22, -1, 24, 25, 26, | 808 | 17, 18, 19, 20, 21, 22, -1, 24, 25, 26, |
| 809 | 27, 28, -1, -1, 31, -1, -1, -1, -1, 36, | 809 | 27, 28, -1, -1, 31, -1, -1, -1, -1, 36, |
| @@ -855,9 +855,9 @@ static const yytype_uint8 yystos[] = | |||
| 855 | 46, 74, 30, 32, 97, 33, 47, 60, 44, 45, | 855 | 46, 74, 30, 32, 97, 33, 47, 60, 44, 45, |
| 856 | 37, 41, 47, 52, 70, 76, 77, 91, 92, 93, | 856 | 37, 41, 47, 52, 70, 76, 77, 91, 92, 93, |
| 857 | 94, 45, 1, 90, 74, 48, 49, 49, 49, 49, | 857 | 94, 45, 1, 90, 74, 48, 49, 49, 49, 49, |
| 858 | 73, 63, 31, 95, 1, 65, 78, 79, 80, 81, | 858 | 73, 63, 95, 1, 65, 78, 79, 80, 81, 94, |
| 859 | 94, 1, 37, 76, 34, 76, 95, 33, 47, 44, | 859 | 1, 37, 76, 34, 76, 95, 33, 47, 44, 46, |
| 860 | 46, 49, 44, 50, 85, 86, 49, 37, 41, 47, | 860 | 49, 44, 31, 50, 85, 86, 49, 37, 41, 47, |
| 861 | 70, 82, 83, 49, 36, 46, 49, 49, 1, 78, | 861 | 70, 82, 83, 49, 36, 46, 49, 49, 1, 78, |
| 862 | 93, 34, 1, 41, 82, 82, 33, 47, 36, 81, | 862 | 93, 34, 1, 41, 82, 82, 33, 47, 36, 81, |
| 863 | 49, 49, 49, 49, 1, 78, 49, 49 | 863 | 49, 49, 49, 49, 1, 78, 49, 49 |
diff --git a/scripts/genksyms/parse.y b/scripts/genksyms/parse.y index 408cdf82b271..10d7dc724b6d 100644 --- a/scripts/genksyms/parse.y +++ b/scripts/genksyms/parse.y | |||
| @@ -446,7 +446,7 @@ member_bitfield_declarator: | |||
| 446 | 446 | ||
| 447 | attribute_opt: | 447 | attribute_opt: |
| 448 | /* empty */ { $$ = NULL; } | 448 | /* empty */ { $$ = NULL; } |
| 449 | | ATTRIBUTE_PHRASE | 449 | | attribute_opt ATTRIBUTE_PHRASE |
| 450 | ; | 450 | ; |
| 451 | 451 | ||
| 452 | asm_definition: | 452 | asm_definition: |
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 9fba838c7069..36b5eedcdc75 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
| @@ -596,7 +596,7 @@ int main(int ac, char **av) | |||
| 596 | break; | 596 | break; |
| 597 | } | 597 | } |
| 598 | 598 | ||
| 599 | if (conf_get_changed() && conf_write(NULL)) { | 599 | if (conf_write(NULL)) { |
| 600 | fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); | 600 | fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); |
| 601 | exit(1); | 601 | exit(1); |
| 602 | } | 602 | } |
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 07597611cc50..df6a188b9930 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c | |||
| @@ -222,10 +222,8 @@ load: | |||
| 222 | continue; | 222 | continue; |
| 223 | if (def == S_DEF_USER) { | 223 | if (def == S_DEF_USER) { |
| 224 | sym = sym_find(line + 9); | 224 | sym = sym_find(line + 9); |
| 225 | if (!sym) { | 225 | if (!sym) |
| 226 | conf_warning("trying to assign nonexistent symbol %s", line + 9); | ||
| 227 | break; | 226 | break; |
| 228 | } | ||
| 229 | } else { | 227 | } else { |
| 230 | sym = sym_lookup(line + 9, 0); | 228 | sym = sym_lookup(line + 9, 0); |
| 231 | if (sym->type == S_UNKNOWN) | 229 | if (sym->type == S_UNKNOWN) |
| @@ -261,10 +259,8 @@ load: | |||
| 261 | } | 259 | } |
| 262 | if (def == S_DEF_USER) { | 260 | if (def == S_DEF_USER) { |
| 263 | sym = sym_find(line + 7); | 261 | sym = sym_find(line + 7); |
| 264 | if (!sym) { | 262 | if (!sym) |
| 265 | conf_warning("trying to assign nonexistent symbol %s", line + 7); | ||
| 266 | break; | 263 | break; |
| 267 | } | ||
| 268 | } else { | 264 | } else { |
| 269 | sym = sym_lookup(line + 7, 0); | 265 | sym = sym_lookup(line + 7, 0); |
| 270 | if (sym->type == S_UNKNOWN) | 266 | if (sym->type == S_UNKNOWN) |
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped index 6a61cee4a32c..7342ce0a7780 100644 --- a/scripts/kconfig/lex.zconf.c_shipped +++ b/scripts/kconfig/lex.zconf.c_shipped | |||
| @@ -5,10 +5,29 @@ | |||
| 5 | 5 | ||
| 6 | /* A lexical scanner generated by flex */ | 6 | /* A lexical scanner generated by flex */ |
| 7 | 7 | ||
| 8 | #define yy_create_buffer zconf_create_buffer | ||
| 9 | #define yy_delete_buffer zconf_delete_buffer | ||
| 10 | #define yy_flex_debug zconf_flex_debug | ||
| 11 | #define yy_init_buffer zconf_init_buffer | ||
| 12 | #define yy_flush_buffer zconf_flush_buffer | ||
| 13 | #define yy_load_buffer_state zconf_load_buffer_state | ||
| 14 | #define yy_switch_to_buffer zconf_switch_to_buffer | ||
| 15 | #define yyin zconfin | ||
| 16 | #define yyleng zconfleng | ||
| 17 | #define yylex zconflex | ||
| 18 | #define yylineno zconflineno | ||
| 19 | #define yyout zconfout | ||
| 20 | #define yyrestart zconfrestart | ||
| 21 | #define yytext zconftext | ||
| 22 | #define yywrap zconfwrap | ||
| 23 | #define yyalloc zconfalloc | ||
| 24 | #define yyrealloc zconfrealloc | ||
| 25 | #define yyfree zconffree | ||
| 26 | |||
| 8 | #define FLEX_SCANNER | 27 | #define FLEX_SCANNER |
| 9 | #define YY_FLEX_MAJOR_VERSION 2 | 28 | #define YY_FLEX_MAJOR_VERSION 2 |
| 10 | #define YY_FLEX_MINOR_VERSION 5 | 29 | #define YY_FLEX_MINOR_VERSION 5 |
| 11 | #define YY_FLEX_SUBMINOR_VERSION 33 | 30 | #define YY_FLEX_SUBMINOR_VERSION 35 |
| 12 | #if YY_FLEX_SUBMINOR_VERSION > 0 | 31 | #if YY_FLEX_SUBMINOR_VERSION > 0 |
| 13 | #define FLEX_BETA | 32 | #define FLEX_BETA |
| 14 | #endif | 33 | #endif |
| @@ -30,7 +49,7 @@ | |||
| 30 | 49 | ||
| 31 | /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ | 50 | /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ |
| 32 | 51 | ||
| 33 | #if __STDC_VERSION__ >= 199901L | 52 | #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L |
| 34 | 53 | ||
| 35 | /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, | 54 | /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, |
| 36 | * if you want the limit (max/min) macros for int types. | 55 | * if you want the limit (max/min) macros for int types. |
| @@ -53,7 +72,6 @@ typedef int flex_int32_t; | |||
| 53 | typedef unsigned char flex_uint8_t; | 72 | typedef unsigned char flex_uint8_t; |
| 54 | typedef unsigned short int flex_uint16_t; | 73 | typedef unsigned short int flex_uint16_t; |
| 55 | typedef unsigned int flex_uint32_t; | 74 | typedef unsigned int flex_uint32_t; |
| 56 | #endif /* ! C99 */ | ||
| 57 | 75 | ||
| 58 | /* Limits of integral types. */ | 76 | /* Limits of integral types. */ |
| 59 | #ifndef INT8_MIN | 77 | #ifndef INT8_MIN |
| @@ -84,6 +102,8 @@ typedef unsigned int flex_uint32_t; | |||
| 84 | #define UINT32_MAX (4294967295U) | 102 | #define UINT32_MAX (4294967295U) |
| 85 | #endif | 103 | #endif |
| 86 | 104 | ||
| 105 | #endif /* ! C99 */ | ||
| 106 | |||
| 87 | #endif /* ! FLEXINT_H */ | 107 | #endif /* ! FLEXINT_H */ |
| 88 | 108 | ||
| 89 | #ifdef __cplusplus | 109 | #ifdef __cplusplus |
| @@ -93,11 +113,12 @@ typedef unsigned int flex_uint32_t; | |||
| 93 | 113 | ||
| 94 | #else /* ! __cplusplus */ | 114 | #else /* ! __cplusplus */ |
| 95 | 115 | ||
| 96 | #if __STDC__ | 116 | /* C99 requires __STDC__ to be defined as 1. */ |
| 117 | #if defined (__STDC__) | ||
| 97 | 118 | ||
| 98 | #define YY_USE_CONST | 119 | #define YY_USE_CONST |
| 99 | 120 | ||
| 100 | #endif /* __STDC__ */ | 121 | #endif /* defined (__STDC__) */ |
| 101 | #endif /* ! __cplusplus */ | 122 | #endif /* ! __cplusplus */ |
| 102 | 123 | ||
| 103 | #ifdef YY_USE_CONST | 124 | #ifdef YY_USE_CONST |
| @@ -177,14 +198,9 @@ extern FILE *zconfin, *zconfout; | |||
| 177 | 198 | ||
| 178 | #define unput(c) yyunput( c, (yytext_ptr) ) | 199 | #define unput(c) yyunput( c, (yytext_ptr) ) |
| 179 | 200 | ||
| 180 | /* The following is because we cannot portably get our hands on size_t | ||
| 181 | * (without autoconf's help, which isn't available because we want | ||
| 182 | * flex-generated scanners to compile on their own). | ||
| 183 | */ | ||
| 184 | |||
| 185 | #ifndef YY_TYPEDEF_YY_SIZE_T | 201 | #ifndef YY_TYPEDEF_YY_SIZE_T |
| 186 | #define YY_TYPEDEF_YY_SIZE_T | 202 | #define YY_TYPEDEF_YY_SIZE_T |
| 187 | typedef unsigned int yy_size_t; | 203 | typedef size_t yy_size_t; |
| 188 | #endif | 204 | #endif |
| 189 | 205 | ||
| 190 | #ifndef YY_STRUCT_YY_BUFFER_STATE | 206 | #ifndef YY_STRUCT_YY_BUFFER_STATE |
| @@ -335,7 +351,7 @@ void zconffree (void * ); | |||
| 335 | 351 | ||
| 336 | /* Begin user sect3 */ | 352 | /* Begin user sect3 */ |
| 337 | 353 | ||
| 338 | #define zconfwrap() 1 | 354 | #define zconfwrap(n) 1 |
| 339 | #define YY_SKIP_YYWRAP | 355 | #define YY_SKIP_YYWRAP |
| 340 | 356 | ||
| 341 | typedef unsigned char YY_CHAR; | 357 | typedef unsigned char YY_CHAR; |
| @@ -748,6 +764,7 @@ int zconf_flex_debug = 0; | |||
| 748 | #define YY_MORE_ADJ 0 | 764 | #define YY_MORE_ADJ 0 |
| 749 | #define YY_RESTORE_YY_MORE_OFFSET | 765 | #define YY_RESTORE_YY_MORE_OFFSET |
| 750 | char *zconftext; | 766 | char *zconftext; |
| 767 | #define YY_NO_INPUT 1 | ||
| 751 | 768 | ||
| 752 | /* | 769 | /* |
| 753 | * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> | 770 | * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> |
| @@ -834,6 +851,35 @@ void alloc_string(const char *str, int size) | |||
| 834 | 851 | ||
| 835 | static int yy_init_globals (void ); | 852 | static int yy_init_globals (void ); |
| 836 | 853 | ||
| 854 | /* Accessor methods to globals. | ||
| 855 | These are made visible to non-reentrant scanners for convenience. */ | ||
| 856 | |||
| 857 | int zconflex_destroy (void ); | ||
| 858 | |||
| 859 | int zconfget_debug (void ); | ||
| 860 | |||
| 861 | void zconfset_debug (int debug_flag ); | ||
| 862 | |||
| 863 | YY_EXTRA_TYPE zconfget_extra (void ); | ||
| 864 | |||
| 865 | void zconfset_extra (YY_EXTRA_TYPE user_defined ); | ||
| 866 | |||
| 867 | FILE *zconfget_in (void ); | ||
| 868 | |||
| 869 | void zconfset_in (FILE * in_str ); | ||
| 870 | |||
| 871 | FILE *zconfget_out (void ); | ||
| 872 | |||
| 873 | void zconfset_out (FILE * out_str ); | ||
| 874 | |||
| 875 | int zconfget_leng (void ); | ||
| 876 | |||
| 877 | char *zconfget_text (void ); | ||
| 878 | |||
| 879 | int zconfget_lineno (void ); | ||
| 880 | |||
| 881 | void zconfset_lineno (int line_number ); | ||
| 882 | |||
| 837 | /* Macros after this point can all be overridden by user definitions in | 883 | /* Macros after this point can all be overridden by user definitions in |
| 838 | * section 1. | 884 | * section 1. |
| 839 | */ | 885 | */ |
| @@ -876,7 +922,7 @@ static int input (void ); | |||
| 876 | /* This used to be an fputs(), but since the string might contain NUL's, | 922 | /* This used to be an fputs(), but since the string might contain NUL's, |
| 877 | * we now use fwrite(). | 923 | * we now use fwrite(). |
| 878 | */ | 924 | */ |
| 879 | #define ECHO (void) fwrite( zconftext, zconfleng, 1, zconfout ) | 925 | #define ECHO fwrite( zconftext, zconfleng, 1, zconfout ) |
| 880 | #endif | 926 | #endif |
| 881 | 927 | ||
| 882 | /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, | 928 | /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, |
| @@ -1540,6 +1586,14 @@ static int yy_get_next_buffer (void) | |||
| 1540 | else | 1586 | else |
| 1541 | ret_val = EOB_ACT_CONTINUE_SCAN; | 1587 | ret_val = EOB_ACT_CONTINUE_SCAN; |
| 1542 | 1588 | ||
| 1589 | if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { | ||
| 1590 | /* Extend the array by 50%, plus the number we really need. */ | ||
| 1591 | yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); | ||
| 1592 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) zconfrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); | ||
| 1593 | if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) | ||
| 1594 | YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); | ||
| 1595 | } | ||
| 1596 | |||
| 1543 | (yy_n_chars) += number_to_move; | 1597 | (yy_n_chars) += number_to_move; |
| 1544 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; | 1598 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; |
| 1545 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; | 1599 | YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; |
| @@ -1926,7 +1980,9 @@ static void zconfensure_buffer_stack (void) | |||
| 1926 | (yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc | 1980 | (yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc |
| 1927 | (num_to_alloc * sizeof(struct yy_buffer_state*) | 1981 | (num_to_alloc * sizeof(struct yy_buffer_state*) |
| 1928 | ); | 1982 | ); |
| 1929 | 1983 | if ( ! (yy_buffer_stack) ) | |
| 1984 | YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" ); | ||
| 1985 | |||
| 1930 | memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); | 1986 | memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); |
| 1931 | 1987 | ||
| 1932 | (yy_buffer_stack_max) = num_to_alloc; | 1988 | (yy_buffer_stack_max) = num_to_alloc; |
| @@ -1944,6 +2000,8 @@ static void zconfensure_buffer_stack (void) | |||
| 1944 | ((yy_buffer_stack), | 2000 | ((yy_buffer_stack), |
| 1945 | num_to_alloc * sizeof(struct yy_buffer_state*) | 2001 | num_to_alloc * sizeof(struct yy_buffer_state*) |
| 1946 | ); | 2002 | ); |
| 2003 | if ( ! (yy_buffer_stack) ) | ||
| 2004 | YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" ); | ||
| 1947 | 2005 | ||
| 1948 | /* zero only the new slots.*/ | 2006 | /* zero only the new slots.*/ |
| 1949 | memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); | 2007 | memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); |
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index 4cea5c85cd0a..5164ef7ce499 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | %option backup nostdinit noyywrap never-interactive full ecs | 1 | %option backup nostdinit noyywrap never-interactive full ecs |
| 2 | %option 8bit backup nodefault perf-report perf-report | 2 | %option 8bit backup nodefault perf-report perf-report |
| 3 | %option noinput | ||
| 3 | %x COMMAND HELP STRING PARAM | 4 | %x COMMAND HELP STRING PARAM |
| 4 | %{ | 5 | %{ |
| 5 | /* | 6 | /* |
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index d8f77e26081c..ff787e6ff8ed 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
| @@ -1403,7 +1403,7 @@ sub dump_struct($$) { | |||
| 1403 | my $members = $3; | 1403 | my $members = $3; |
| 1404 | 1404 | ||
| 1405 | # ignore embedded structs or unions | 1405 | # ignore embedded structs or unions |
| 1406 | $members =~ s/{.*?}//g; | 1406 | $members =~ s/{.*}//g; |
| 1407 | 1407 | ||
| 1408 | # ignore members marked private: | 1408 | # ignore members marked private: |
| 1409 | $members =~ s/\/\*.*?private:.*?public:.*?\*\///gos; | 1409 | $members =~ s/\/\*.*?private:.*?public:.*?\*\///gos; |
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 8f038e6d5f98..418cd7dbbc93 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
| @@ -1468,7 +1468,7 @@ static void section_rel(const char *modname, struct elf_info *elf, | |||
| 1468 | * marked __initdata will be discarded when the module has been intialized. | 1468 | * marked __initdata will be discarded when the module has been intialized. |
| 1469 | * Likewise for modules used built-in the sections marked __exit | 1469 | * Likewise for modules used built-in the sections marked __exit |
| 1470 | * are discarded because __exit marked function are supposed to be called | 1470 | * are discarded because __exit marked function are supposed to be called |
| 1471 | * only when a moduel is unloaded which never happes for built-in modules. | 1471 | * only when a module is unloaded which never happens for built-in modules. |
| 1472 | * The check_sec_ref() function traverses all relocation records | 1472 | * The check_sec_ref() function traverses all relocation records |
| 1473 | * to find all references to a section that reference a section that will | 1473 | * to find all references to a section that reference a section that will |
| 1474 | * be discarded and warns about it. | 1474 | * be discarded and warns about it. |
diff --git a/scripts/patch-kernel b/scripts/patch-kernel index ece46ef0ba54..46a59cae3a0a 100755 --- a/scripts/patch-kernel +++ b/scripts/patch-kernel | |||
| @@ -213,6 +213,7 @@ fi | |||
| 213 | if [ $stopvers != "default" ]; then | 213 | if [ $stopvers != "default" ]; then |
| 214 | STOPSUBLEVEL=`echo $stopvers | cut -d. -f3` | 214 | STOPSUBLEVEL=`echo $stopvers | cut -d. -f3` |
| 215 | STOPEXTRA=`echo $stopvers | cut -d. -f4` | 215 | STOPEXTRA=`echo $stopvers | cut -d. -f4` |
| 216 | STOPFULLVERSION=${stopvers%%.$STOPEXTRA} | ||
| 216 | #echo "#___STOPSUBLEVEL=/$STOPSUBLEVEL/, STOPEXTRA=/$STOPEXTRA/" | 217 | #echo "#___STOPSUBLEVEL=/$STOPSUBLEVEL/, STOPEXTRA=/$STOPEXTRA/" |
| 217 | else | 218 | else |
| 218 | STOPSUBLEVEL=9999 | 219 | STOPSUBLEVEL=9999 |
| @@ -249,7 +250,7 @@ while : # incrementing SUBLEVEL (s in v.p.s) | |||
| 249 | do | 250 | do |
| 250 | CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL" | 251 | CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL" |
| 251 | EXTRAVER= | 252 | EXTRAVER= |
| 252 | if [ $stopvers = $CURRENTFULLVERSION ]; then | 253 | if [ $STOPFULLVERSION = $CURRENTFULLVERSION ]; then |
| 253 | echo "Stopping at $CURRENTFULLVERSION base as requested." | 254 | echo "Stopping at $CURRENTFULLVERSION base as requested." |
| 254 | break | 255 | break |
| 255 | fi | 256 | fi |
diff --git a/scripts/ver_linux b/scripts/ver_linux index 7ac0e309be09..dbb3037f1346 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | # /bin /sbin /usr/bin /usr/sbin /usr/local/bin, but it may | 4 | # /bin /sbin /usr/bin /usr/sbin /usr/local/bin, but it may |
| 5 | # differ on your system. | 5 | # differ on your system. |
| 6 | # | 6 | # |
| 7 | PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:$PATH | ||
| 8 | echo 'If some fields are empty or look unusual you may have an old version.' | 7 | echo 'If some fields are empty or look unusual you may have an old version.' |
| 9 | echo 'Compare to the current minimal requirements in Documentation/Changes.' | 8 | echo 'Compare to the current minimal requirements in Documentation/Changes.' |
| 10 | echo ' ' | 9 | echo ' ' |
