aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@neptun.(none)>2007-09-26 14:15:39 -0400
committerSam Ravnborg <sam@neptun.(none)>2007-10-12 15:20:32 -0400
commit14f31562dbda93500fdf74b8158248fde2d556bb (patch)
treec21d78515d8248079f1830705b9c13ccbef5d8e8
parent247537b9a270b52cc0375adcb0fb2605a160cba5 (diff)
kbuild: update _shipped files for kconfig syntax cleanup
Update _shipped files so regular user does not need to have bison/flex/gperf installed. Code changes were contained in previous commit. Used following program versions (on fedora): bison (GNU Bison) 2.3 flex 2.5.33 GNU gperf 3.0.2 Cc: Adrian Bunk <bunk@kernel.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--scripts/kconfig/lex.zconf.c_shipped25
-rw-r--r--scripts/kconfig/zconf.hash.c_shipped220
-rw-r--r--scripts/kconfig/zconf.tab.c_shipped1406
3 files changed, 897 insertions, 754 deletions
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
index 0fdc9049296f..a065d5a57c01 100644
--- a/scripts/kconfig/lex.zconf.c_shipped
+++ b/scripts/kconfig/lex.zconf.c_shipped
@@ -5,6 +5,25 @@
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
@@ -33,7 +52,7 @@
33#if __STDC_VERSION__ >= 199901L 52#if __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.
37 */ 56 */
38#ifndef __STDC_LIMIT_MACROS 57#ifndef __STDC_LIMIT_MACROS
39#define __STDC_LIMIT_MACROS 1 58#define __STDC_LIMIT_MACROS 1
@@ -335,7 +354,7 @@ void zconffree (void * );
335 354
336/* Begin user sect3 */ 355/* Begin user sect3 */
337 356
338#define zconfwrap() 1 357#define zconfwrap(n) 1
339#define YY_SKIP_YYWRAP 358#define YY_SKIP_YYWRAP
340 359
341typedef unsigned char YY_CHAR; 360typedef unsigned char YY_CHAR;
@@ -1983,7 +2002,7 @@ YY_BUFFER_STATE zconf_scan_buffer (char * base, yy_size_t size )
1983 2002
1984/** Setup the input buffer state to scan a string. The next call to zconflex() will 2003/** Setup the input buffer state to scan a string. The next call to zconflex() will
1985 * scan from a @e copy of @a str. 2004 * scan from a @e copy of @a str.
1986 * @param yystr a NUL-terminated string to scan 2005 * @param str a NUL-terminated string to scan
1987 * 2006 *
1988 * @return the newly allocated buffer state object. 2007 * @return the newly allocated buffer state object.
1989 * @note If you want to scan bytes that may contain NUL values, then use 2008 * @note If you want to scan bytes that may contain NUL values, then use
diff --git a/scripts/kconfig/zconf.hash.c_shipped b/scripts/kconfig/zconf.hash.c_shipped
index 47c8b5babf34..ab28b18153a7 100644
--- a/scripts/kconfig/zconf.hash.c_shipped
+++ b/scripts/kconfig/zconf.hash.c_shipped
@@ -1,4 +1,4 @@
1/* ANSI-C code produced by gperf version 3.0.1 */ 1/* ANSI-C code produced by gperf version 3.0.2 */
2/* Command-line: gperf */ 2/* Command-line: gperf */
3/* Computed positions: -k'1,3' */ 3/* Computed positions: -k'1,3' */
4 4
@@ -30,7 +30,7 @@
30#endif 30#endif
31 31
32struct kconf_id; 32struct kconf_id;
33/* maximum key range = 45, duplicates = 0 */ 33/* maximum key range = 47, duplicates = 0 */
34 34
35#ifdef __GNUC__ 35#ifdef __GNUC__
36__inline 36__inline
@@ -44,32 +44,32 @@ kconf_id_hash (register const char *str, register unsigned int len)
44{ 44{
45 static unsigned char asso_values[] = 45 static unsigned char asso_values[] =
46 { 46 {
47 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
48 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
49 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 49 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
50 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 50 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
51 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 51 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
52 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 52 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
53 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 53 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
54 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 54 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
55 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 55 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
56 47, 47, 47, 47, 47, 47, 47, 25, 30, 15, 56 49, 49, 49, 49, 49, 49, 49, 18, 11, 5,
57 0, 15, 0, 47, 5, 15, 47, 47, 30, 20, 57 0, 0, 5, 49, 5, 20, 49, 49, 5, 20,
58 5, 0, 25, 15, 0, 0, 10, 35, 47, 47, 58 5, 0, 30, 49, 0, 15, 0, 10, 49, 49,
59 5, 47, 47, 47, 47, 47, 47, 47, 47, 47, 59 25, 49, 49, 49, 49, 49, 49, 49, 49, 49,
60 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 60 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
61 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 61 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
62 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 62 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
63 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 63 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
64 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 64 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
65 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 65 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
66 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 66 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
67 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 67 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
68 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 68 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
69 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 69 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
70 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 70 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
71 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 71 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
72 47, 47, 47, 47, 47, 47 72 49, 49, 49, 49, 49, 49
73 }; 73 };
74 register int hval = len; 74 register int hval = len;
75 75
@@ -89,74 +89,70 @@ kconf_id_hash (register const char *str, register unsigned int len)
89struct kconf_id_strings_t 89struct kconf_id_strings_t
90 { 90 {
91 char kconf_id_strings_str2[sizeof("on")]; 91 char kconf_id_strings_str2[sizeof("on")];
92 char kconf_id_strings_str6[sizeof("string")]; 92 char kconf_id_strings_str5[sizeof("endif")];