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

Revert "contrib/flex: Drop local __dead2 patch"

Browse Source 
I missed the review comment to commit the changes separately, will
reland in multiple smaller commits.

Requested By:   jkim
This reverts commit bbd421cdf6.
This commit is contained in:
Alex Richardson 2021-04-21 10:48:12 +01:00
parent a3a02acde1
commit 3bca8d2b32
4 changed files with 220 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,6 +216,12 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]],
/* 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. */
%if-c-only
#include <stdio.h>
@ -647,7 +653,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_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 void yynoreturn yy_fatal_error ( const char* msg M4_YY_PROTO_LAST_ARG );
static void yynoreturn yy_fatal_error ( const char* msg M4_YY_PROTO_LAST_ARG ) __dead2;
]])
%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,6 +15,12 @@
/* 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. */
#include <stdio.h>
#include <string.h>
@ -342,7 +348,7 @@ extern char *yytext;
static yy_state_type yy_get_previous_state ( void );
static yy_state_type yy_try_NUL_trans ( yy_state_type current_state );
static int yy_get_next_buffer ( void );
static void yynoreturn yy_fatal_error ( const char* msg );
static void yynoreturn yy_fatal_error ( const char* msg ) __dead2;
/* Done after the current pattern has been matched and before the
* corresponding action - sets up yytext.
@ -1965,9 +1971,9 @@ extern int yylval;
if (!indented_code) line_directive_out(NULL, 0);\
} while (0)
#line 1968 "<stdout>"
#line 1974 "<stdout>"
#line 1970 "<stdout>"
#line 1976 "<stdout>"
#define INITIAL 0
#define SECT2 1
@ -2233,7 +2239,7 @@ YY_DECL
char nmdef[MAXLINE];
#line 2236 "<stdout>"
#line 2242 "<stdout>"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
@ -4134,7 +4140,7 @@ YY_RULE_SETUP
#line 1014 "scan.l"
YY_FATAL_ERROR( "flex scanner jammed" );
YY_BREAK
#line 4137 "<stdout>"
#line 4143 "<stdout>"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(SECT2):
case YY_STATE_EOF(CODEBLOCK):

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

@ -446,6 +446,12 @@ const char *skel[] = {
"",
"/* 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. */",
"%if-c-only",
"#include <stdio.h>",
@ -937,7 +943,7 @@ const char *skel[] = {
"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 int yy_get_next_buffer ( M4_YY_PROTO_ONLY_ARG );",
"static void yynoreturn yy_fatal_error ( const char* msg M4_YY_PROTO_LAST_ARG );",
"static void yynoreturn yy_fatal_error ( const char* msg M4_YY_PROTO_LAST_ARG ) __dead2;",
"]])",
"",
"%endif",