d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

contrib/flex: Drop local __dead2 patch

Browse Source 
Upstream flex has added a yynoreturn, so this diff is no longer needed.
Partially reverts r181269. Also regenerate the pre-generated files that
are used for bootstrapping.

Reviewed By:	jkim

Differential Revision: https://reviews.freebsd.org/D29679
This commit is contained in:
Alex Richardson 2021-04-20 00:05:30 +01:00
parent ba1182e263
commit bbd421cdf6
4 changed files with 226 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/flex/src/flex.skl
View File

@ -216,12 +216,6 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]],
/* First, we deal with platform-specific or compiler-specific issues. */ /* First, we deal with platform-specific or compiler-specific issues. */
#if defined(__FreeBSD__)
#include <sys/cdefs.h>
#else
#define __dead2
#endif
/* begin standard C headers. */ /* begin standard C headers. */
%if-c-only %if-c-only
#include <stdio.h> #include <stdio.h>
@ -653,7 +647,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
static yy_state_type yy_get_previous_state ( M4_YY_PROTO_ONLY_ARG ); static yy_state_type yy_get_previous_state ( M4_YY_PROTO_ONLY_ARG );
static yy_state_type yy_try_NUL_trans ( yy_state_type current_state M4_YY_PROTO_LAST_ARG); static yy_state_type yy_try_NUL_trans ( yy_state_type current_state M4_YY_PROTO_LAST_ARG);
static int yy_get_next_buffer ( M4_YY_PROTO_ONLY_ARG ); static int yy_get_next_buffer ( M4_YY_PROTO_ONLY_ARG );
static void yynoreturn yy_fatal_error ( const char* msg M4_YY_PROTO_LAST_ARG ) __dead2; static void yynoreturn yy_fatal_error ( const char* msg M4_YY_PROTO_LAST_ARG );
]]) ]])
%endif %endif

414
tools/build/bootstrap-m4/inittokenizer.c
View File

File diff suppressed because it is too large Load Diff

16
usr.bin/lex/initscan.c
View File

@ -15,12 +15,6 @@
/* First, we deal with platform-specific or compiler-specific issues. */ /* First, we deal with platform-specific or compiler-specific issues. */
#if defined(__FreeBSD__)
#include <sys/cdefs.h>
#else
#define __dead2
#endif
/* begin standard C headers. */ /* begin standard C headers. */
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -348,7 +342,7 @@ extern char *yytext;
static yy_state_type yy_get_previous_state ( void ); static yy_state_type yy_get_previous_state ( void );
static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); static yy_state_type yy_try_NUL_trans ( yy_state_type current_state );
static int yy_get_next_buffer ( void ); static int yy_get_next_buffer ( void );
static void yynoreturn yy_fatal_error ( const char* msg ) __dead2; static void yynoreturn yy_fatal_error ( const char* msg );
/* Done after the current pattern has been matched and before the /* Done after the current pattern has been matched and before the
* corresponding action - sets up yytext. * corresponding action - sets up yytext.
@ -1971,9 +1965,9 @@ extern int yylval;
if (!indented_code) line_directive_out(NULL, 0);\ if (!indented_code) line_directive_out(NULL, 0);\
} while (0) } while (0)
#line 1974 "<stdout>" #line 1968 "<stdout>"
#line 1976 "<stdout>" #line 1970 "<stdout>"
#define INITIAL 0 #define INITIAL 0
#define SECT2 1 #define SECT2 1
@ -2239,7 +2233,7 @@ YY_DECL
char nmdef[MAXLINE]; char nmdef[MAXLINE];
#line 2242 "<stdout>" #line 2236 "<stdout>"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{ {
@ -4140,7 +4134,7 @@ YY_RULE_SETUP
#line 1014 "scan.l" #line 1014 "scan.l"
YY_FATAL_ERROR( "flex scanner jammed" ); YY_FATAL_ERROR( "flex scanner jammed" );
YY_BREAK YY_BREAK
#line 4143 "<stdout>" #line 4137 "<stdout>"
case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(SECT2): case YY_STATE_EOF(SECT2):
case YY_STATE_EOF(CODEBLOCK): case YY_STATE_EOF(CODEBLOCK):

8
usr.bin/lex/initskel.c
View File

@ -446,12 +446,6 @@ const char *skel[] = {
"", "",
"/* First, we deal with platform-specific or compiler-specific issues. */", "/* First, we deal with platform-specific or compiler-specific issues. */",
"", "",
"#if defined(__FreeBSD__)",
"#include <sys/cdefs.h>",
"#else",
"#define __dead2",
"#endif",
"",
"/* begin standard C headers. */", "/* begin standard C headers. */",
"%if-c-only", "%if-c-only",
"#include <stdio.h>", "#include <stdio.h>",
@ -943,7 +937,7 @@ const char *skel[] = {
"static yy_state_type yy_get_previous_state ( M4_YY_PROTO_ONLY_ARG );", "static yy_state_type yy_get_previous_state ( M4_YY_PROTO_ONLY_ARG );",
"static yy_state_type yy_try_NUL_trans ( yy_state_type current_state M4_YY_PROTO_LAST_ARG);", "static yy_state_type yy_try_NUL_trans ( yy_state_type current_state M4_YY_PROTO_LAST_ARG);",
"static int yy_get_next_buffer ( M4_YY_PROTO_ONLY_ARG );", "static int yy_get_next_buffer ( M4_YY_PROTO_ONLY_ARG );",
"static void yynoreturn yy_fatal_error ( const char* msg M4_YY_PROTO_LAST_ARG ) __dead2;", "static void yynoreturn yy_fatal_error ( const char* msg M4_YY_PROTO_LAST_ARG );",
"]])", "]])",
"", "",
"%endif", "%endif",