On Wed, 17 Feb 2021 16:02:15 GMT Mark Johnston <[email protected]> wrote:
> The branch main has been updated by markj: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=8ba333e02eaa59337a4e1d5534d4e894344c8226 > > commit 8ba333e02eaa59337a4e1d5534d4e894344c8226 > Author: Mark Johnston <[email protected]> > AuthorDate: 2021-02-17 15:49:38 +0000 > Commit: Mark Johnston <[email protected]> > CommitDate: 2021-02-17 15:57:19 +0000 > > libdtrace: Stop relying on lex compatibility > > It does not appear to be required, and as of commit 6b7e592c215f > ("lex: Do not let input() return 0 when end-of-file is reached") it > causes input to return 0 instead of EOF when end-of-input is reached. > > PR: 253440 > MFC after: 3 days > Sponsored by: The FreeBSD Foundation > --- > cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h | 2 +- > cddl/lib/libdtrace/Makefile | 2 -- > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h > b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h index > f2c60a2b07d4..b3f69bb6329d 100644 --- > a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h +++ > b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h @@ -717,7 +717,7 @@ > extern > dt_pcb_t *yypcb; /* pointer to current parser control block */ > extern > char yyintprefix; /* int token prefix for macros (+/-) */ extern char > yyintsuffix[4]; /* int token suffix ([uUlL]*) */ extern int > yyintdecimal; > /* int token is decimal (1) or octal/hex (0) */ -extern char yytext[]; > /* lex input buffer */ +extern char *yytext; /* lex input buffer */ > extern int yylineno; /* lex line number */ > extern int yydebug; /* lex debugging */ > extern dt_node_t *yypragma; /* lex token list for control lines */ > diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile > index efd73751e2c0..45ca1692cf48 100644 > --- a/cddl/lib/libdtrace/Makefile > +++ b/cddl/lib/libdtrace/Makefile > @@ -129,8 +129,6 @@ SRCS+= dis_tables.c > DSRCS+= regs_x86.d > .endif > > -LFLAGS+=-l > - > YFLAGS+=-d > > LIBADD= ctf elf proc pthread rtld_db > _______________________________________________ > [email protected] mailing list > https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main > To unsubscribe, send any mail to > "[email protected]" This commit breaks buildworld (also breask starting from scratch/clean /usr/obj): [...] -MD -MF.depend.arc_os.pico -MTarc_os.pico -std=iso9899:1999 -Wno-format-zero-length -fstack-protector-strong -Wsystem-headers -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -Wno-unknown-pragmas -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-unused-local-typedef -Wno-address-of-packed-member -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Qunused-arguments -c /usr/src/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c -o arc_os.pico --- all_subdir_cddl/lib/libdtrace --- --- dt_names.o --- --- dt_lex.o --- In file included from /usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l:38: /usr/src/cddl/lib/libdtrace/../../../cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h:720:14: error: redeclaration of 'yytext' with a different type: 'char *' vs 'char [8192]' extern char *yytext; /* lex input buffer */ ^ dt_lex.c:1075:6: note: previous definition is here char yytext[YYLMAX]; ^ 1 error generated. *** [dt_lex.o] Error code 1 make[5]: stopped in /usr/src/cddl/lib/libdtrace --- all_subdir_cddl/lib/libzpool ---
pgpq3Z_gD2N9s.pgp
Description: OpenPGP digital signature
