Skip to content

L
linux
Commit e811603f authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes 

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  kbuild: scripts/ver_linux: don't set PATH
  Kconfig/init: change help text to match default value
  kbuild: genksyms: Include extern information in dumps
  kbuild: genksyms parser: fix the __attribute__ rule
  kbuild: scripts/genksyms/lex.l: add %option noinput
  kconfig: scripts/kconfig/zconf.l: add %option noinput
  kbuild: fix O=... build of um
parents b17b3d47 48a61569
Expand all Show whitespace changes
Inline Side-by-side
Showing with 238 additions and 137 deletions
Makefile
View file @ e811603f
...@@ -930,7 +930,7 @@ ifneq ($(KBUILD_SRC),) ...@@ -930,7 +930,7 @@ ifneq ($(KBUILD_SRC),)
/bin/false; \ /bin/false; \
fi; fi;
$(Q)if [ ! -d include2 ]; then mkdir -p include2; fi; $(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;
$(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/system.h ]; then \ $(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/errno.h ]; then \
ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \
fi fi
endif endif
......
init/Kconfig
View file @ e811603f
...@@ -522,7 +522,7 @@ config CC_OPTIMIZE_FOR_SIZE ...@@ -522,7 +522,7 @@ config CC_OPTIMIZE_FOR_SIZE
Enabling this option will pass "-Os" instead of "-O2" to gcc Enabling this option will pass "-Os" instead of "-O2" to gcc
resulting in a smaller kernel. resulting in a smaller kernel.
If unsure, say N. If unsure, say Y.
config SYSCTL config SYSCTL
bool bool
......
scripts/genksyms/genksyms.c
View file @ e811603f
...@@ -545,6 +545,8 @@ int main(int argc, char **argv) ...@@ -545,6 +545,8 @@ int main(int argc, char **argv)
} }
fputs(sym->name, dumpfile); fputs(sym->name, dumpfile);
putc(' ', dumpfile); putc(' ', dumpfile);
if (sym->is_extern)
fputs("extern ", dumpfile);
print_list(dumpfile, sym->defn); print_list(dumpfile, sym->defn);
putc('\n', dumpfile); putc('\n', dumpfile);
......
scripts/genksyms/lex.c_shipped
View file @ e811603f
...@@ -6,10 +6,19 @@ ...@@ -6,10 +6,19 @@
/* A lexical scanner generated by flex */ /* A lexical scanner generated by flex */
/* %not-for-header */
/* %if-c-only */
/* %if-not-reentrant */
/* %endif */
/* %endif */
/* %ok-for-header */
#define FLEX_SCANNER #define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5 #define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 33 #define YY_FLEX_SUBMINOR_VERSION 35
#if YY_FLEX_SUBMINOR_VERSION > 0 #if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA #define FLEX_BETA
#endif #endif
...@@ -47,7 +56,7 @@ ...@@ -47,7 +56,7 @@
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
#if __STDC_VERSION__ >= 199901L #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types. * if you want the limit (max/min) macros for int types.
...@@ -70,7 +79,6 @@ typedef int flex_int32_t; ...@@ -70,7 +79,6 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t; typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t; typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t; typedef unsigned int flex_uint32_t;
#endif /* ! C99 */
/* Limits of integral types. */ /* Limits of integral types. */
#ifndef INT8_MIN #ifndef INT8_MIN
...@@ -101,6 +109,8 @@ typedef unsigned int flex_uint32_t; ...@@ -101,6 +109,8 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U) #define UINT32_MAX (4294967295U)
#endif #endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */ #endif /* ! FLEXINT_H */
/* %endif */ /* %endif */
...@@ -115,11 +125,12 @@ typedef unsigned int flex_uint32_t; ...@@ -115,11 +125,12 @@ typedef unsigned int flex_uint32_t;
#else /* ! __cplusplus */ #else /* ! __cplusplus */
#if __STDC__ /* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST #define YY_USE_CONST
#endif /* __STDC__ */ #endif /* defined (__STDC__) */
#endif /* ! __cplusplus */ #endif /* ! __cplusplus */
#ifdef YY_USE_CONST #ifdef YY_USE_CONST
...@@ -218,14 +229,9 @@ extern FILE *yyin, *yyout; ...@@ -218,14 +229,9 @@ extern FILE *yyin, *yyout;
#define unput(c) yyunput( c, (yytext_ptr) ) #define unput(c) yyunput( c, (yytext_ptr) )
/* The following is because we cannot portably get our hands on size_t
* (without autoconf's help, which isn't available because we want
* flex-generated scanners to compile on their own).
*/
#ifndef YY_TYPEDEF_YY_SIZE_T #ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T #define YY_TYPEDEF_YY_SIZE_T
typedef unsigned int yy_size_t; typedef size_t yy_size_t;
#endif #endif
#ifndef YY_STRUCT_YY_BUFFER_STATE #ifndef YY_STRUCT_YY_BUFFER_STATE
...@@ -401,7 +407,7 @@ void yyfree (void * ); ...@@ -401,7 +407,7 @@ void yyfree (void * );
/* %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here */ /* %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here */
/* Begin user sect3 */ /* Begin user sect3 */
#define yywrap() 1 #define yywrap(n) 1
#define YY_SKIP_YYWRAP #define YY_SKIP_YYWRAP
#define FLEX_DEBUG #define FLEX_DEBUG
...@@ -613,8 +619,8 @@ int yy_flex_debug = 1; ...@@ -613,8 +619,8 @@ int yy_flex_debug = 1;
static yyconst flex_int16_t yy_rule_linenum[13] = static yyconst flex_int16_t yy_rule_linenum[13] =
{ 0, { 0,
69, 70, 71, 74, 77, 78, 79, 85, 86, 87, 71, 72, 73, 76, 79, 80, 81, 87, 88, 89,
89, 92 91, 94
} ; } ;
/* The intent behind this definition is that it'll catch /* The intent behind this definition is that it'll catch
...@@ -665,7 +671,8 @@ char *yytext; ...@@ -665,7 +671,8 @@ char *yytext;
quite so pedantic. */ quite so pedantic. */
/* We don't do multiple input files. */ /* We don't do multiple input files. */
#line 669 "scripts/genksyms/lex.c" #define YY_NO_INPUT 1
#line 676 "scripts/genksyms/lex.c"
#define INITIAL 0 #define INITIAL 0
#define V2_TOKENS 1 #define V2_TOKENS 1
...@@ -695,9 +702,39 @@ static int yy_init_globals (void ); ...@@ -695,9 +702,39 @@ static int yy_init_globals (void );
/* %endif */ /* %endif */
/* %if-reentrant */ /* %if-reentrant */
/* %endif */ /* %endif */
/* %endif End reentrant structures and macros. */
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
int yylex_destroy (void );
int yyget_debug (void );
void yyset_debug (int debug_flag );
YY_EXTRA_TYPE yyget_extra (void );
void yyset_extra (YY_EXTRA_TYPE user_defined );
FILE *yyget_in (void );
void yyset_in (FILE * in_str );
FILE *yyget_out (void );
void yyset_out (FILE * out_str );
int yyget_leng (void );
char *yyget_text (void );
int yyget_lineno (void );
void yyset_lineno (int line_number );
/* %if-bison-bridge */ /* %if-bison-bridge */
/* %endif */ /* %endif */
/* %endif End reentrant structures and macros. */
/* Macros after this point can all be overridden by user definitions in /* Macros after this point can all be overridden by user definitions in
* section 1. * section 1.
...@@ -756,7 +793,7 @@ static int input (void ); ...@@ -756,7 +793,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's, /* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite(). * we now use fwrite().
*/ */
#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) #define ECHO fwrite( yytext, yyleng, 1, yyout )
/* %endif */ /* %endif */
/* %if-c++-only C++ definition */ /* %if-c++-only C++ definition */
/* %endif */ /* %endif */
...@@ -881,12 +918,12 @@ YY_DECL ...@@ -881,12 +918,12 @@ YY_DECL
register int yy_act; register int yy_act;
/* %% [7.0] user's declarations go here */ /* %% [7.0] user's declarations go here */
#line 65 "scripts/genksyms/lex.l" #line 67 "scripts/genksyms/lex.l"
/* Keep track of our location in the original source files. */ /* Keep track of our location in the original source files. */
#line 890 "scripts/genksyms/lex.c" #line 927 "scripts/genksyms/lex.c"
if ( !(yy_init) ) if ( !(yy_init) )
{ {
...@@ -1004,42 +1041,42 @@ do_action: /* This label is used only to access EOF actions. */ ...@@ -1004,42 +1041,42 @@ do_action: /* This label is used only to access EOF actions. */
case 1: case 1:
/* rule 1 can match eol */ /* rule 1 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 69 "scripts/genksyms/lex.l" #line 71 "scripts/genksyms/lex.l"
return FILENAME; return FILENAME;
YY_BREAK YY_BREAK
case 2: case 2:
/* rule 2 can match eol */ /* rule 2 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 70 "scripts/genksyms/lex.l" #line 72 "scripts/genksyms/lex.l"
cur_line++; cur_line++;
YY_BREAK YY_BREAK
case 3: case 3:
/* rule 3 can match eol */ /* rule 3 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 71 "scripts/genksyms/lex.l" #line 73 "scripts/genksyms/lex.l"
cur_line++; cur_line++;
YY_BREAK YY_BREAK
/* Ignore all other whitespace. */ /* Ignore all other whitespace. */
case 4: case 4:
YY_RULE_SETUP YY_RULE_SETUP
#line 74 "scripts/genksyms/lex.l" #line 76 "scripts/genksyms/lex.l"
; ;
YY_BREAK YY_BREAK
case 5: case 5:
/* rule 5 can match eol */ /* rule 5 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 77 "scripts/genksyms/lex.l" #line 79 "scripts/genksyms/lex.l"
return STRING; return STRING;
YY_BREAK YY_BREAK
case 6: case 6:
/* rule 6 can match eol */ /* rule 6 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 78 "scripts/genksyms/lex.l" #line 80 "scripts/genksyms/lex.l"
return CHAR; return CHAR;
YY_BREAK YY_BREAK
case 7: case 7:
YY_RULE_SETUP YY_RULE_SETUP
#line 79 "scripts/genksyms/lex.l" #line 81 "scripts/genksyms/lex.l"
return IDENT; return IDENT;
YY_BREAK YY_BREAK
/* The Pedant requires that the other C multi-character tokens be /* The Pedant requires that the other C multi-character tokens be
...@@ -1048,36 +1085,36 @@ return IDENT; ...@@ -1048,36 +1085,36 @@ return IDENT;
around them properly. */ around them properly. */
case 8: case 8:
YY_RULE_SETUP YY_RULE_SETUP
#line 85 "scripts/genksyms/lex.l" #line 87 "scripts/genksyms/lex.l"
return OTHER; return OTHER;
YY_BREAK YY_BREAK
case 9: case 9:
YY_RULE_SETUP YY_RULE_SETUP
#line 86 "scripts/genksyms/lex.l" #line 88 "scripts/genksyms/lex.l"
return INT; return INT;
YY_BREAK YY_BREAK
case 10: case 10:
YY_RULE_SETUP YY_RULE_SETUP
#line 87 "scripts/genksyms/lex.l" #line 89 "scripts/genksyms/lex.l"
return REAL; return REAL;
YY_BREAK YY_BREAK
case 11: case 11:
YY_RULE_SETUP YY_RULE_SETUP
#line 89 "scripts/genksyms/lex.l" #line 91 "scripts/genksyms/lex.l"
return DOTS; return DOTS;
YY_BREAK YY_BREAK
/* All other tokens are single characters. */ /* All other tokens are single characters. */
case 12: case 12:
YY_RULE_SETUP YY_RULE_SETUP
#line 92 "scripts/genksyms/lex.l" #line 94 "scripts/genksyms/lex.l"
return yytext[0]; return yytext[0];
YY_BREAK YY_BREAK
case 13: case 13:
YY_RULE_SETUP YY_RULE_SETUP
#line 95 "scripts/genksyms/lex.l" #line 97 "scripts/genksyms/lex.l"
ECHO; ECHO;
YY_BREAK YY_BREAK
#line 1081 "scripts/genksyms/lex.c" #line 1118 "scripts/genksyms/lex.c"
case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(V2_TOKENS): case YY_STATE_EOF(V2_TOKENS):
yyterminate(); yyterminate();
...@@ -1346,6 +1383,14 @@ static int yy_get_next_buffer (void) ...@@ -1346,6 +1383,14 @@ static int yy_get_next_buffer (void)
else else
ret_val = EOB_ACT_CONTINUE_SCAN; ret_val = EOB_ACT_CONTINUE_SCAN;
if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
/* Extend the array by 50%, plus the number we really need. */
yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
}
(yy_n_chars) += number_to_move; (yy_n_chars) += number_to_move;
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
...@@ -1851,6 +1896,8 @@ static void yyensure_buffer_stack (void) ...@@ -1851,6 +1896,8 @@ static void yyensure_buffer_stack (void)
(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
(num_to_alloc * sizeof(struct yy_buffer_state*) (num_to_alloc * sizeof(struct yy_buffer_state*)
); );
if ( ! (yy_buffer_stack) )
YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
...@@ -1869,6 +1916,8 @@ static void yyensure_buffer_stack (void) ...@@ -1869,6 +1916,8 @@ static void yyensure_buffer_stack (void)
((yy_buffer_stack), ((yy_buffer_stack),
num_to_alloc * sizeof(struct yy_buffer_state*) num_to_alloc * sizeof(struct yy_buffer_state*)
); );
if ( ! (yy_buffer_stack) )
YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
/* zero only the new slots.*/ /* zero only the new slots.*/
memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); 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,7 +2141,7 @@ void yyset_debug (int bdebug )
/* %if-reentrant */ /* %if-reentrant */
/* %if-bison-bridge */ /* %if-bison-bridge */
/* %endif */ /* %endif */
/* %endif */ /* %endif if-c-only */
/* %if-c-only */ /* %if-c-only */
static int yy_init_globals (void) static int yy_init_globals (void)
...@@ -2124,13 +2173,9 @@ static int yy_init_globals (void) ...@@ -2124,13 +2173,9 @@ static int yy_init_globals (void)
} }
/* %endif */ /* %endif */
/* %if-c-or-c++ */ /* %if-c-only SNIP! this currently causes conflicts with the c++ scanner */
/* %if-c-only */
/* yylex_destroy is for both reentrant and non-reentrant scanners. */ /* yylex_destroy is for both reentrant and non-reentrant scanners. */
int yylex_destroy (void) int yylex_destroy (void)
/* %endif */
/* %if-c++-only */
/* %endif */
{ {
/* Pop the buffer stack, destroying each element. */ /* Pop the buffer stack, destroying each element. */
...@@ -2144,11 +2189,6 @@ int yylex_destroy (void) ...@@ -2144,11 +2189,6 @@ int yylex_destroy (void)
yyfree((yy_buffer_stack) ); yyfree((yy_buffer_stack) );
(yy_buffer_stack) = NULL; (yy_buffer_stack) = NULL;
/* %if-c++-only */
/* %endif */
/* %if-c-only */
/* Reset the globals. This is important in a non-reentrant scanner so the next time /* Reset the globals. This is important in a non-reentrant scanner so the next time
* yylex() is called, initialization will occur. */ * yylex() is called, initialization will occur. */
yy_init_globals( ); yy_init_globals( );
...@@ -2156,7 +2196,6 @@ int yylex_destroy (void) ...@@ -2156,7 +2196,6 @@ int yylex_destroy (void)
/* %if-reentrant */ /* %if-reentrant */
/* %endif */ /* %endif */
return 0; return 0;
/* %endif */
} }
/* %endif */ /* %endif */
...@@ -2213,7 +2252,7 @@ void yyfree (void * ptr ) ...@@ -2213,7 +2252,7 @@ void yyfree (void * ptr )
/* %ok-for-header */ /* %ok-for-header */
#line 95 "scripts/genksyms/lex.l" #line 97 "scripts/genksyms/lex.l"
......
scripts/genksyms/lex.l
View file @ e811603f
...@@ -62,6 +62,8 @@ MC_TOKEN ([~%^&*+=|<>/-]=)|(&&)|("||")|(->)|(<<)|(>>) ...@@ -62,6 +62,8 @@ MC_TOKEN ([~%^&*+=|<>/-]=)|(&&)|("||")|(->)|(<<)|(>>)
/* We don't do multiple input files. */ /* We don't do multiple input files. */
%option noyywrap %option noyywrap
%option noinput
%% %%
......
scripts/genksyms/parse.c_shipped
View file @ e811603f
This diff is collapsed.
scripts/genksyms/parse.y
View file @ e811603f
...@@ -446,7 +446,7 @@ member_bitfield_declarator: ...@@ -446,7 +446,7 @@ member_bitfield_declarator:
attribute_opt: attribute_opt:
/* empty */ { $$ = NULL; } /* empty */ { $$ = NULL; }
| ATTRIBUTE_PHRASE | attribute_opt ATTRIBUTE_PHRASE
; ;
asm_definition: asm_definition:
......
scripts/kconfig/lex.zconf.c_shipped
View file @ e811603f
...@@ -5,10 +5,29 @@ ...@@ -5,10 +5,29 @@
/* A lexical scanner generated by flex */ /* A lexical scanner generated by flex */
#define yy_create_buffer zconf_create_buffer
#define yy_delete_buffer zconf_delete_buffer
#define yy_flex_debug zconf_flex_debug
#define yy_init_buffer zconf_init_buffer
#define yy_flush_buffer zconf_flush_buffer
#define yy_load_buffer_state zconf_load_buffer_state
#define yy_switch_to_buffer zconf_switch_to_buffer
#define yyin zconfin
#define yyleng zconfleng
#define yylex zconflex
#define yylineno zconflineno
#define yyout zconfout
#define yyrestart zconfrestart
#define yytext zconftext
#define yywrap zconfwrap
#define yyalloc zconfalloc
#define yyrealloc zconfrealloc
#define yyfree zconffree
#define FLEX_SCANNER #define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5 #define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 33 #define YY_FLEX_SUBMINOR_VERSION 35
#if YY_FLEX_SUBMINOR_VERSION > 0 #if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA #define FLEX_BETA
#endif #endif
...@@ -30,7 +49,7 @@ ...@@ -30,7 +49,7 @@
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
#if __STDC_VERSION__ >= 199901L #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types. * if you want the limit (max/min) macros for int types.
...@@ -53,7 +72,6 @@ typedef int flex_int32_t; ...@@ -53,7 +72,6 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t; typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t; typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t; typedef unsigned int flex_uint32_t;
#endif /* ! C99 */
/* Limits of integral types. */ /* Limits of integral types. */
#ifndef INT8_MIN #ifndef INT8_MIN
...@@ -84,6 +102,8 @@ typedef unsigned int flex_uint32_t; ...@@ -84,6 +102,8 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U) #define UINT32_MAX (4294967295U)
#endif #endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */ #endif /* ! FLEXINT_H */
#ifdef __cplusplus #ifdef __cplusplus
...@@ -93,11 +113,12 @@ typedef unsigned int flex_uint32_t; ...@@ -93,11 +113,12 @@ typedef unsigned int flex_uint32_t;
#else /* ! __cplusplus */ #else /* ! __cplusplus */
#if __STDC__ /* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST #define YY_USE_CONST
#endif /* __STDC__ */ #endif /* defined (__STDC__) */
#endif /* ! __cplusplus */ #endif /* ! __cplusplus */
#ifdef YY_USE_CONST #ifdef YY_USE_CONST
...@@ -177,14 +198,9 @@ extern FILE *zconfin, *zconfout; ...@@ -177,14 +198,9 @@ extern FILE *zconfin, *zconfout;
#define unput(c) yyunput( c, (yytext_ptr) ) #define unput(c) yyunput( c, (yytext_ptr) )
/* The following is because we cannot portably get our hands on size_t
* (without autoconf's help, which isn't available because we want
* flex-generated scanners to compile on their own).
*/
#ifndef YY_TYPEDEF_YY_SIZE_T #ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T #define YY_TYPEDEF_YY_SIZE_T
typedef unsigned int yy_size_t; typedef size_t yy_size_t;
#endif #endif
#ifndef YY_STRUCT_YY_BUFFER_STATE #ifndef YY_STRUCT_YY_BUFFER_STATE
...@@ -335,7 +351,7 @@ void zconffree (void * ); ...@@ -335,7 +351,7 @@ void zconffree (void * );
/* Begin user sect3 */ /* Begin user sect3 */
#define zconfwrap() 1 #define zconfwrap(n) 1
#define YY_SKIP_YYWRAP #define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR; typedef unsigned char YY_CHAR;
...@@ -748,6 +764,7 @@ int zconf_flex_debug = 0; ...@@ -748,6 +764,7 @@ int zconf_flex_debug = 0;
#define YY_MORE_ADJ 0 #define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET #define YY_RESTORE_YY_MORE_OFFSET
char *zconftext; char *zconftext;
#define YY_NO_INPUT 1
/* /*
* Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
...@@ -834,6 +851,35 @@ void alloc_string(const char *str, int size) ...@@ -834,6 +851,35 @@ void alloc_string(const char *str, int size)
static int yy_init_globals (void ); static int yy_init_globals (void );
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
int zconflex_destroy (void );
int zconfget_debug (void );
void zconfset_debug (int debug_flag );
YY_EXTRA_TYPE zconfget_extra (void );
void zconfset_extra (YY_EXTRA_TYPE user_defined );
FILE *zconfget_in (void );
void zconfset_in (FILE * in_str );
FILE *zconfget_out (void );
void zconfset_out (FILE * out_str );
int zconfget_leng (void );
char *zconfget_text (void );
int zconfget_lineno (void );
void zconfset_lineno (int line_number );
/* Macros after this point can all be overridden by user definitions in /* Macros after this point can all be overridden by user definitions in
* section 1. * section 1.
*/ */
...@@ -876,7 +922,7 @@ static int input (void ); ...@@ -876,7 +922,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's, /* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite(). * we now use fwrite().
*/ */
#define ECHO (void) fwrite( zconftext, zconfleng, 1, zconfout ) #define ECHO fwrite( zconftext, zconfleng, 1, zconfout )
#endif #endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, /* 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,6 +1586,14 @@ static int yy_get_next_buffer (void)
else else
ret_val = EOB_ACT_CONTINUE_SCAN; ret_val = EOB_ACT_CONTINUE_SCAN;
if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
/* Extend the array by 50%, plus the number we really need. */
yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) zconfrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
}
(yy_n_chars) += number_to_move; (yy_n_chars) += number_to_move;
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
...@@ -1926,6 +1980,8 @@ static void zconfensure_buffer_stack (void) ...@@ -1926,6 +1980,8 @@ static void zconfensure_buffer_stack (void)
(yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc (yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc
(num_to_alloc * sizeof(struct yy_buffer_state*) (num_to_alloc * sizeof(struct yy_buffer_state*)
); );
if ( ! (yy_buffer_stack) )
YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" );
memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
...@@ -1944,6 +2000,8 @@ static void zconfensure_buffer_stack (void) ...@@ -1944,6 +2000,8 @@ static void zconfensure_buffer_stack (void)
((yy_buffer_stack), ((yy_buffer_stack),
num_to_alloc * sizeof(struct yy_buffer_state*) num_to_alloc * sizeof(struct yy_buffer_state*)
); );
if ( ! (yy_buffer_stack) )
YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" );
/* zero only the new slots.*/ /* zero only the new slots.*/
memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
......
scripts/kconfig/zconf.l
View file @ e811603f
%option backup nostdinit noyywrap never-interactive full ecs %option backup nostdinit noyywrap never-interactive full ecs
%option 8bit backup nodefault perf-report perf-report %option 8bit backup nodefault perf-report perf-report
%option noinput
%x COMMAND HELP STRING PARAM %x COMMAND HELP STRING PARAM
%{ %{
/* /*
......
scripts/ver_linux
View file @ e811603f
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
# /bin /sbin /usr/bin /usr/sbin /usr/local/bin, but it may # /bin /sbin /usr/bin /usr/sbin /usr/local/bin, but it may
# differ on your system. # differ on your system.
# #
PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:$PATH
echo 'If some fields are empty or look unusual you may have an old version.' echo 'If some fields are empty or look unusual you may have an old version.'
echo 'Compare to the current minimal requirements in Documentation/Changes.' echo 'Compare to the current minimal requirements in Documentation/Changes.'
echo ' ' echo ' '
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7