diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-02-03 09:18:42 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-02-03 09:18:42 -0500 |
| commit | f5fab57dc99eeb01bf09a4262cb4bab786ccffb2 (patch) | |
| tree | 9522c233421d8a55033868d9084f113bdc6ccc7e /scripts | |
| parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) | |
| parent | c8a3e6a866f91f82b4d04809aa30de2f4d928756 (diff) | |
Merge branch 'devicetree/dtc' into devicetree/next
Branch to upgrade DTC toolchain to version 1.4.0
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/dtc/dtc-parser.tab.c_shipped | 469 | ||||
| -rw-r--r-- | scripts/dtc/dtc-parser.tab.h_shipped | 36 | ||||
| -rw-r--r-- | scripts/dtc/dtc.c | 119 | ||||
| -rw-r--r-- | scripts/dtc/dtc.h | 1 | ||||
| -rw-r--r-- | scripts/dtc/srcpos.c | 6 | ||||
| -rwxr-xr-x | scripts/dtc/update-dtc-source.sh | 54 | ||||
| -rw-r--r-- | scripts/dtc/util.c | 141 | ||||
| -rw-r--r-- | scripts/dtc/util.h | 107 | ||||
| -rw-r--r-- | scripts/dtc/version_gen.h | 2 |
9 files changed, 570 insertions, 365 deletions
diff --git a/scripts/dtc/dtc-parser.tab.c_shipped b/scripts/dtc/dtc-parser.tab.c_shipped index ee1d8c3042fb..c8769d550cfb 100644 --- a/scripts/dtc/dtc-parser.tab.c_shipped +++ b/scripts/dtc/dtc-parser.tab.c_shipped | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | /* A Bison parser, made by GNU Bison 2.5. */ | 1 | /* A Bison parser, made by GNU Bison 2.7.12-4996. */ |
| 2 | 2 | ||
| 3 | /* Bison implementation for Yacc-like parsers in C | 3 | /* Bison implementation for Yacc-like parsers in C |
| 4 | 4 | ||
| 5 | Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. | 5 | Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. |
| 6 | 6 | ||
| 7 | This program is free software: you can redistribute it and/or modify | 7 | This program is free software: you can redistribute it and/or modify |
| 8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
| @@ -44,7 +44,7 @@ | |||
| 44 | #define YYBISON 1 | 44 | #define YYBISON 1 |
| 45 | 45 | ||
| 46 | /* Bison version. */ | 46 | /* Bison version. */ |
| 47 | #define YYBISON_VERSION "2.5" | 47 | #define YYBISON_VERSION "2.7.12-4996" |
| 48 | 48 | ||
| 49 | /* Skeleton name. */ | 49 | /* Skeleton name. */ |
| 50 | #define YYSKELETON_NAME "yacc.c" | 50 | #define YYSKELETON_NAME "yacc.c" |
| @@ -58,14 +58,11 @@ | |||
| 58 | /* Pull parsers. */ | 58 | /* Pull parsers. */ |
| 59 | #define YYPULL 1 | 59 | #define YYPULL 1 |
| 60 | 60 | ||
| 61 | /* Using locations. */ | ||
| 62 | #define YYLSP_NEEDED 0 | ||
| 63 | 61 | ||
| 64 | 62 | ||
| 65 | 63 | ||
| 66 | /* Copy the first part of user declarations. */ | 64 | /* Copy the first part of user declarations. */ |
| 67 | 65 | /* Line 371 of yacc.c */ | |
| 68 | /* Line 268 of yacc.c */ | ||
| 69 | #line 21 "dtc-parser.y" | 66 | #line 21 "dtc-parser.y" |
| 70 | 67 | ||
| 71 | #include <stdio.h> | 68 | #include <stdio.h> |
| @@ -85,14 +82,16 @@ extern int treesource_error; | |||
| 85 | static unsigned long long eval_literal(const char *s, int base, int bits); | 82 | static unsigned long long eval_literal(const char *s, int base, int bits); |
| 86 | static unsigned char eval_char_literal(const char *s); | 83 | static unsigned char eval_char_literal(const char *s); |
| 87 | 84 | ||
| 85 | /* Line 371 of yacc.c */ | ||
| 86 | #line 87 "dtc-parser.tab.c" | ||
| 88 | 87 | ||
| 89 | /* Line 268 of yacc.c */ | 88 | # ifndef YY_NULL |
| 90 | #line 91 "dtc-parser.tab.c" | 89 | # if defined __cplusplus && 201103L <= __cplusplus |
| 91 | 90 | # define YY_NULL nullptr | |
| 92 | /* Enabling traces. */ | 91 | # else |
| 93 | #ifndef YYDEBUG | 92 | # define YY_NULL 0 |
| 94 | # define YYDEBUG 0 | 93 | # endif |
| 95 | #endif | 94 | # endif |
| 96 | 95 | ||
| 97 | /* Enabling verbose error messages. */ | 96 | /* Enabling verbose error messages. */ |
| 98 | #ifdef YYERROR_VERBOSE | 97 | #ifdef YYERROR_VERBOSE |
| @@ -102,11 +101,17 @@ static unsigned char eval_char_literal(const char *s); | |||
| 102 | # define YYERROR_VERBOSE 0 | 101 | # define YYERROR_VERBOSE 0 |
| 103 | #endif | 102 | #endif |
| 104 | 103 | ||
| 105 | /* Enabling the token table. */ | 104 | /* In a future release of Bison, this section will be replaced |
| 106 | #ifndef YYTOKEN_TABLE | 105 | by #include "dtc-parser.tab.h". */ |
| 107 | # define YYTOKEN_TABLE 0 | 106 | #ifndef YY_YY_DTC_PARSER_TAB_H_INCLUDED |
| 107 | # define YY_YY_DTC_PARSER_TAB_H_INCLUDED | ||
| 108 | /* Enabling traces. */ | ||
| 109 | #ifndef YYDEBUG | ||
| 110 | # define YYDEBUG 0 | ||
| 111 | #endif | ||
| 112 | #if YYDEBUG | ||
| 113 | extern int yydebug; | ||
| 108 | #endif | 114 | #endif |
| 109 | |||
| 110 | 115 | ||
| 111 | /* Tokens. */ | 116 | /* Tokens. */ |
| 112 | #ifndef YYTOKENTYPE | 117 | #ifndef YYTOKENTYPE |
| @@ -140,12 +145,10 @@ static unsigned char eval_char_literal(const char *s); | |||
| 140 | #endif | 145 | #endif |
| 141 | 146 | ||
| 142 | 147 | ||
| 143 | |||
| 144 | #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED | 148 | #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED |
| 145 | typedef union YYSTYPE | 149 | typedef union YYSTYPE |
| 146 | { | 150 | { |
| 147 | 151 | /* Line 387 of yacc.c */ | |
| 148 | /* Line 293 of yacc.c */ | ||
| 149 | #line 40 "dtc-parser.y" | 152 | #line 40 "dtc-parser.y" |
| 150 | 153 | ||
| 151 | char *propnodename; | 154 | char *propnodename; |
| @@ -168,21 +171,36 @@ typedef union YYSTYPE | |||
| 168 | uint64_t integer; | 171 | uint64_t integer; |
| 169 | 172 | ||
| 170 | 173 | ||
| 171 | 174 | /* Line 387 of yacc.c */ | |
| 172 | /* Line 293 of yacc.c */ | 175 | #line 176 "dtc-parser.tab.c" |
| 173 | #line 174 "dtc-parser.tab.c" | ||
| 174 | } YYSTYPE; | 176 | } YYSTYPE; |
| 175 | # define YYSTYPE_IS_TRIVIAL 1 | 177 | # define YYSTYPE_IS_TRIVIAL 1 |
| 176 | # define yystype YYSTYPE /* obsolescent; will be withdrawn */ | 178 | # define yystype YYSTYPE /* obsolescent; will be withdrawn */ |
| 177 | # define YYSTYPE_IS_DECLARED 1 | 179 | # define YYSTYPE_IS_DECLARED 1 |
| 178 | #endif | 180 | #endif |
| 179 | 181 | ||
| 182 | extern YYSTYPE yylval; | ||
| 180 | 183 | ||
| 181 | /* Copy the second part of user declarations. */ | 184 | #ifdef YYPARSE_PARAM |
| 185 | #if defined __STDC__ || defined __cplusplus | ||
| 186 | int yyparse (void *YYPARSE_PARAM); | ||
| 187 | #else | ||
| 188 | int yyparse (); | ||
| 189 | #endif | ||
| 190 | #else /* ! YYPARSE_PARAM */ | ||
| 191 | #if defined __STDC__ || defined __cplusplus | ||
| 192 | int yyparse (void); | ||
| 193 | #else | ||
| 194 | int yyparse (); | ||
| 195 | #endif | ||
| 196 | #endif /* ! YYPARSE_PARAM */ | ||
| 182 | 197 | ||
| 198 | #endif /* !YY_YY_DTC_PARSER_TAB_H_INCLUDED */ | ||
| 183 | 199 | ||
| 184 | /* Line 343 of yacc.c */ | 200 | /* Copy the second part of user declarations. */ |
| 185 | #line 186 "dtc-parser.tab.c" | 201 | |
| 202 | /* Line 390 of yacc.c */ | ||
| 203 | #line 204 "dtc-parser.tab.c" | ||
| 186 | 204 | ||
| 187 | #ifdef short | 205 | #ifdef short |
| 188 | # undef short | 206 | # undef short |
| @@ -235,24 +253,33 @@ typedef short int yytype_int16; | |||
| 235 | # if defined YYENABLE_NLS && YYENABLE_NLS | 253 | # if defined YYENABLE_NLS && YYENABLE_NLS |
| 236 | # if ENABLE_NLS | 254 | # if ENABLE_NLS |
| 237 | # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ | 255 | # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ |
| 238 | # define YY_(msgid) dgettext ("bison-runtime", msgid) | 256 | # define YY_(Msgid) dgettext ("bison-runtime", Msgid) |
| 239 | # endif | 257 | # endif |
| 240 | # endif | 258 | # endif |
| 241 | # ifndef YY_ | 259 | # ifndef YY_ |
| 242 | # define YY_(msgid) msgid | 260 | # define YY_(Msgid) Msgid |
| 261 | # endif | ||
| 262 | #endif | ||
| 263 | |||
| 264 | #ifndef __attribute__ | ||
| 265 | /* This feature is available in gcc versions 2.5 and later. */ | ||
| 266 | # if (! defined __GNUC__ || __GNUC__ < 2 \ | ||
| 267 | || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) | ||
| 268 | # define __attribute__(Spec) /* empty */ | ||
| 243 | # endif | 269 | # endif |
| 244 | #endif | 270 | #endif |
| 245 | 271 | ||
| 246 | /* Suppress unused-variable warnings by "using" E. */ | 272 | /* Suppress unused-variable warnings by "using" E. */ |
| 247 | #if ! defined lint || defined __GNUC__ | 273 | #if ! defined lint || defined __GNUC__ |
| 248 | # define YYUSE(e) ((void) (e)) | 274 | # define YYUSE(E) ((void) (E)) |
| 249 | #else | 275 | #else |
