CVS commit: src/external/bsd/flex/bin
Module Name:src Committed By: mrg Date: Tue Feb 5 07:47:15 UTC 2019 Modified Files: src/external/bsd/flex/bin: Makefile Log Message: force -O1 (unless -O0 already present) on m68k with GCC 7. avoids a "too-far" reference in scan.c. was already close with GCC 6. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/bsd/flex/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/bin/Makefile diff -u src/external/bsd/flex/bin/Makefile:1.12 src/external/bsd/flex/bin/Makefile:1.13 --- src/external/bsd/flex/bin/Makefile:1.12 Sun Dec 23 16:27:17 2018 +++ src/external/bsd/flex/bin/Makefile Tue Feb 5 07:47:15 2019 @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.4 (Berkeley) 6/24/90 -# $NetBSD: Makefile,v 1.12 2018/12/23 16:27:17 christos Exp $ +# $NetBSD: Makefile,v 1.13 2019/02/05 07:47:15 mrg Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add @@ -71,4 +71,11 @@ scan.c: scan.l scan.o yylex.o: parse.h +# Ugh. Generates too large offsets with -O2. +.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc" +. if ${MACHINE_CPU} == "m68k" && empty(CFLAGS:M-O0) +COPTS.scan.c+=-O1 +. endif +.endif + .include
CVS commit: src/external/bsd/flex/bin
Module Name:src Committed By: plunky Date: Tue Mar 8 19:25:32 UTC 2011 Modified Files: src/external/bsd/flex/bin: Makefile Log Message: source files are scan.l and parse.y in particular, parse.y was being processed twice.. with one process leaving a y.tab.h file behind no need to explicitly add scan.c, parse.c and parse.h to CLEANFILES, the framework knows they are generated and will remove them To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/flex/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/bin/Makefile diff -u src/external/bsd/flex/bin/Makefile:1.8 src/external/bsd/flex/bin/Makefile:1.9 --- src/external/bsd/flex/bin/Makefile:1.8 Wed Apr 7 16:14:35 2010 +++ src/external/bsd/flex/bin/Makefile Tue Mar 8 19:25:32 2011 @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.4 (Berkeley) 6/24/90 -# $NetBSD: Makefile,v 1.8 2010/04/07 16:14:35 christos Exp $ +# $NetBSD: Makefile,v 1.9 2011/03/08 19:25:32 plunky Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add @@ -25,9 +25,9 @@ misc.c \ nfa.c \ options.c \ -parse.c \ +parse.y \ regex.c \ -scan.c \ +scan.l \ scanflags.c \ scanopt.c \ skel.c \ @@ -38,7 +38,7 @@ yylex.c YHEADER=1 -CLEANFILES+=scan.c skel.c parse.c parse.h +CLEANFILES+=skel.c INCS =FlexLexer.h INCSDIR=/usr/include/g++ LDADD+=-lm
CVS commit: src/external/bsd/flex/bin
Module Name:src Committed By: wiz Date: Wed Sep 15 06:52:33 UTC 2010 Modified Files: src/external/bsd/flex/bin: flex.1 Log Message: Add missing letter, from Ryo HAYASAKA in PR 43880. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/bin/flex.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/bin/flex.1 diff -u src/external/bsd/flex/bin/flex.1:1.2 src/external/bsd/flex/bin/flex.1:1.3 --- src/external/bsd/flex/bin/flex.1:1.2 Mon Oct 26 01:37:21 2009 +++ src/external/bsd/flex/bin/flex.1 Wed Sep 15 06:52:33 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: flex.1,v 1.2 2009/10/26 01:37:21 christos Exp $ +.\" $NetBSD: flex.1,v 1.3 2010/09/15 06:52:33 wiz Exp $ .\" .TH FLEX 1 "February 2008" "Version 2.5" .SH NAME @@ -2776,7 +2776,7 @@ name of C++ class. .TP .B \-\-header\-file=FILE -reate a C header file in addition to the scanner. +create a C header file in addition to the scanner. .TP .B \-\-tables\-file[=FILE] write tables to FILE.
CVS commit: src/external/bsd/flex/bin
Module Name:src Committed By: christos Date: Wed Apr 7 16:14:35 UTC 2010 Modified Files: src/external/bsd/flex/bin: Makefile Log Message: previous workaround not needed. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/flex/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/bin/Makefile diff -u src/external/bsd/flex/bin/Makefile:1.7 src/external/bsd/flex/bin/Makefile:1.8 --- src/external/bsd/flex/bin/Makefile:1.7 Wed Apr 7 04:56:49 2010 +++ src/external/bsd/flex/bin/Makefile Wed Apr 7 12:14:35 2010 @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.4 (Berkeley) 6/24/90 -# $NetBSD: Makefile,v 1.7 2010/04/07 08:56:49 tron Exp $ +# $NetBSD: Makefile,v 1.8 2010/04/07 16:14:35 christos Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add @@ -46,8 +46,6 @@ DPADD+=${LIBM} .endif -COPTS.scan.c+= -Wno-unused-label - MAN = flex.1 LINKS= ${BINDIR}/lex ${BINDIR}/flex \
CVS commit: src/external/bsd/flex/bin
Module Name:src Committed By: tron Date: Wed Apr 7 08:56:50 UTC 2010 Modified Files: src/external/bsd/flex/bin: Makefile Log Message: Ignore the unused label "find_rule" in the generated file "scan.c" to fix the build. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/flex/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/bin/Makefile diff -u src/external/bsd/flex/bin/Makefile:1.6 src/external/bsd/flex/bin/Makefile:1.7 --- src/external/bsd/flex/bin/Makefile:1.6 Sat Oct 31 23:36:29 2009 +++ src/external/bsd/flex/bin/Makefile Wed Apr 7 08:56:49 2010 @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.4 (Berkeley) 6/24/90 -# $NetBSD: Makefile,v 1.6 2009/10/31 23:36:29 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2010/04/07 08:56:49 tron Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add @@ -46,6 +46,8 @@ DPADD+=${LIBM} .endif +COPTS.scan.c+= -Wno-unused-label + MAN = flex.1 LINKS= ${BINDIR}/lex ${BINDIR}/flex \
CVS commit: src/external/bsd/flex/bin
Module Name:src Committed By: joerg Date: Sat Oct 31 23:36:29 UTC 2009 Modified Files: src/external/bsd/flex/bin: Makefile Log Message: Do not depend on the existance of /usr/lib/libm.a for the host tool case. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/bin/Makefile diff -u src/external/bsd/flex/bin/Makefile:1.5 src/external/bsd/flex/bin/Makefile:1.6 --- src/external/bsd/flex/bin/Makefile:1.5 Thu Oct 29 17:17:33 2009 +++ src/external/bsd/flex/bin/Makefile Sat Oct 31 23:36:29 2009 @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.4 (Berkeley) 6/24/90 -# $NetBSD: Makefile,v 1.5 2009/10/29 17:17:33 christos Exp $ +# $NetBSD: Makefile,v 1.6 2009/10/31 23:36:29 joerg Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add @@ -42,7 +42,9 @@ INCS =FlexLexer.h INCSDIR=/usr/include/g++ LDADD+=-lm +.ifndef HOSTPROG DPADD+=${LIBM} +.endif MAN = flex.1
CVS commit: src/external/bsd/flex/bin
Module Name:src Committed By: christos Date: Thu Oct 29 17:17:33 UTC 2009 Modified Files: src/external/bsd/flex/bin: Makefile Log Message: We can rebuild our yacc generated files now To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/bin/Makefile diff -u src/external/bsd/flex/bin/Makefile:1.4 src/external/bsd/flex/bin/Makefile:1.5 --- src/external/bsd/flex/bin/Makefile:1.4 Thu Oct 29 09:03:09 2009 +++ src/external/bsd/flex/bin/Makefile Thu Oct 29 13:17:33 2009 @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.4 (Berkeley) 6/24/90 -# $NetBSD: Makefile,v 1.4 2009/10/29 13:03:09 christos Exp $ +# $NetBSD: Makefile,v 1.5 2009/10/29 17:17:33 christos Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add @@ -37,10 +37,6 @@ tblcmp.c \ yylex.c -# Don't frob yacc files until we have a good bison -.y.c .y.h: - @true - YHEADER=1 CLEANFILES+=scan.c skel.c parse.c parse.h INCS =FlexLexer.h
CVS commit: src/external/bsd/flex/bin
Module Name:src Committed By: christos Date: Thu Oct 29 13:03:09 UTC 2009 Modified Files: src/external/bsd/flex/bin: Makefile Log Message: oops forgot to remove the PKG m4. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/bin/Makefile diff -u src/external/bsd/flex/bin/Makefile:1.3 src/external/bsd/flex/bin/Makefile:1.4 --- src/external/bsd/flex/bin/Makefile:1.3 Mon Oct 26 14:32:39 2009 +++ src/external/bsd/flex/bin/Makefile Thu Oct 29 09:03:09 2009 @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.4 (Berkeley) 6/24/90 -# $NetBSD: Makefile,v 1.3 2009/10/26 18:32:39 christos Exp $ +# $NetBSD: Makefile,v 1.4 2009/10/29 13:03:09 christos Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add @@ -47,8 +47,6 @@ INCSDIR=/usr/include/g++ LDADD+=-lm DPADD+=${LIBM} -# XXX: Fix m4. -TOOL_M4=/usr/pkg/bin/gm4 MAN = flex.1
CVS commit: src/external/bsd/flex/bin
Module Name:src Committed By: christos Date: Mon Oct 26 18:32:39 UTC 2009 Modified Files: src/external/bsd/flex/bin: Makefile Log Message: Now it works, but it needs gm4... Problem was that our bison cannot deal with it, so we don't regenerate parse.c and parse.h from parse.y. So we need: 1. Fix m4 2. Get new byacc/bison To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/bin/Makefile diff -u src/external/bsd/flex/bin/Makefile:1.2 src/external/bsd/flex/bin/Makefile:1.3 --- src/external/bsd/flex/bin/Makefile:1.2 Mon Oct 26 07:19:47 2009 +++ src/external/bsd/flex/bin/Makefile Mon Oct 26 14:32:39 2009 @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.4 (Berkeley) 6/24/90 -# $NetBSD: Makefile,v 1.2 2009/10/26 11:19:47 christos Exp $ +# $NetBSD: Makefile,v 1.3 2009/10/26 18:32:39 christos Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add @@ -25,7 +25,7 @@ misc.c \ nfa.c \ options.c \ -parse.y \ +parse.c \ regex.c \ scan.c \ scanflags.c \ @@ -37,12 +37,18 @@ tblcmp.c \ yylex.c +# Don't frob yacc files until we have a good bison +.y.c .y.h: + @true + YHEADER=1 -CLEANFILES+=scan.c skel.c +CLEANFILES+=scan.c skel.c parse.c parse.h INCS =FlexLexer.h INCSDIR=/usr/include/g++ LDADD+=-lm DPADD+=${LIBM} +# XXX: Fix m4. +TOOL_M4=/usr/pkg/bin/gm4 MAN = flex.1 @@ -52,7 +58,7 @@ skel.c: flex.skl mkskel.sh flexint.h tables_shared.h ${TOOL_SED} -e 's/m4_/m4postproc_/g' -e 's/m4preproc_/m4_/g' \ - ${IDIST}/flex.skl | ${TOOL_M4} -P \ + ${IDIST}/flex.skl | ${TOOL_M4} -I${IDIST} -P \ -DFLEX_MAJOR_VERSION=`echo ${VERSION} | cut -f 1 -d .` \ -DFLEX_MINOR_VERSION=`echo ${VERSION} | cut -f 2 -d .` \ -DFLEX_SUBMINOR_VERSION=`echo ${VERSION} | cut -f 3 -d .` | \
CVS commit: src/external/bsd/flex/bin
Module Name:src Committed By: christos Date: Mon Oct 26 11:19:47 UTC 2009 Modified Files: src/external/bsd/flex/bin: Makefile Log Message: it is more complicated to rebuild the skel now. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/flex/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/bin/Makefile diff -u src/external/bsd/flex/bin/Makefile:1.1 src/external/bsd/flex/bin/Makefile:1.2 --- src/external/bsd/flex/bin/Makefile:1.1 Sun Oct 25 20:49:04 2009 +++ src/external/bsd/flex/bin/Makefile Mon Oct 26 07:19:47 2009 @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.4 (Berkeley) 6/24/90 -# $NetBSD: Makefile,v 1.1 2009/10/26 00:49:04 christos Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/26 11:19:47 christos Exp $ # # By default, flex will be configured to generate 8-bit scanners only if the # -8 flag is given. If you want it to always generate 8-bit scanners, add @@ -50,9 +50,14 @@ ${BINDIR}/lex ${BINDIR}/flex++ MLINKS= flex.1 lex.1 -skel.c: mkskel.sh flex.skl - ${_MKTARGET_CREATE} - ${HOST_SH} ${.ALLSRC} >${.TARGET} +skel.c: flex.skl mkskel.sh flexint.h tables_shared.h + ${TOOL_SED} -e 's/m4_/m4postproc_/g' -e 's/m4preproc_/m4_/g' \ + ${IDIST}/flex.skl | ${TOOL_M4} -P \ + -DFLEX_MAJOR_VERSION=`echo ${VERSION} | cut -f 1 -d .` \ + -DFLEX_MINOR_VERSION=`echo ${VERSION} | cut -f 2 -d .` \ + -DFLEX_SUBMINOR_VERSION=`echo ${VERSION} | cut -f 3 -d .` | \ + ${TOOL_SED} -e 's/m4postproc_/m4_/g' | \ + ${HOST_SH} ${IDIST}/mkskel.sh > ${.TARGET} .ifndef HOSTPROG scan.c: scan.l
CVS commit: src/external/bsd/flex/bin
Module Name:src Committed By: christos Date: Mon Oct 26 01:37:21 UTC 2009 Modified Files: src/external/bsd/flex/bin: flex.1 Log Message: add options from the new castrated man page. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/flex/bin/flex.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/bin/flex.1 diff -u src/external/bsd/flex/bin/flex.1:1.1 src/external/bsd/flex/bin/flex.1:1.2 --- src/external/bsd/flex/bin/flex.1:1.1 Sun Oct 25 20:49:04 2009 +++ src/external/bsd/flex/bin/flex.1 Sun Oct 25 21:37:21 2009 @@ -1,6 +1,6 @@ -.\" $NetBSD: flex.1,v 1.1 2009/10/26 00:49:04 christos Exp $ +.\" $NetBSD: flex.1,v 1.2 2009/10/26 01:37:21 christos Exp $ .\" -.TH FLEX 1 "April 1995" "Version 2.5" +.TH FLEX 1 "February 2008" "Version 2.5" .SH NAME flex, lex \- fast lexical analyzer generator .SH SYNOPSIS @@ -2162,7 +2162,7 @@ .I flex has the following options: .TP -.B \-b +.B \-b, --backup Generate backing-up information to .I lex.backup. This is a list of scanner states which require backing up @@ -2185,7 +2185,7 @@ .B \-c is a do-nothing, deprecated option included for POSIX compliance. .TP -.B \-d +.B \-d, \-\-debug makes the generated scanner run in .I debug mode. @@ -2207,7 +2207,7 @@ a NUL; at this point, the two look the same as far as the scanner's concerned), or reaches an end-of-file. .TP -.B \-f +.B \-f, \-\-full specifies .I fast scanner. No table compression is done and stdio is bypassed. @@ -2216,7 +2216,7 @@ .B \-Cfr (see below). .TP -.B \-h +.B \-h, \-\-help generates a "help" summary of .I flex's options to @@ -2228,7 +2228,7 @@ are synonyms for .B \-h. .TP -.B \-i +.B \-i, \-\-case-insensitive instructs .I flex to generate a @@ -2242,7 +2242,7 @@ .I yytext will have the preserved case (i.e., it will not be folded). .TP -.B \-l +.B \-l, \-\-lex\-compat turns on maximum compatibility with the original AT\*[Am]T .I lex implementation. @@ -2266,7 +2266,7 @@ is another do-nothing, deprecated option included only for POSIX compliance. .TP -.B \-p +.B \-p, \-\-perf\-report generates a performance report to stderr. The report consists of comments regarding features of the .I flex @@ -2288,7 +2288,7 @@ .B \-I flag entail minor performance penalties. .TP -.B \-s +.B \-s, \-\-no\-default causes the .I default rule (that unmatched scanner input is echoed to @@ -2299,14 +2299,14 @@ This option is useful for finding holes in a scanner's rule set. .TP -.B \-t +.B \-t, \-\-stdout instructs .I flex to write the scanner it generates to standard output instead of .B lex.yy.c. .TP -.B \-v +.B \-v, \-\-verbose specifies that .I flex should write to @@ -2321,10 +2321,10 @@ and the next line the flags used when generating the scanner, including those that are on by default. .TP -.B \-w +.B \-w, \-\-nowarn suppresses warning messages. .TP -.B \-B +.B \-B, \-\-batch instructs .I flex to generate a @@ -2352,7 +2352,7 @@ .B \-B automatically anyway. .TP -.B \-F +.B \-F, \-\-fast specifies that the .ul fast @@ -2385,7 +2385,7 @@ It cannot be used with .B \-+. .TP -.B \-I +.B \-I, \-\-interactive instructs .I flex to generate an @@ -2434,7 +2434,7 @@ .B \-B (see above). .TP -.B \-L +.B \-L, \-\-noline instructs .I flex not to generate @@ -2453,7 +2453,7 @@ fault -- you should report these sorts of errors to the email address given below). .TP -.B \-T +.B \-T, \-\-trace makes .I flex run in @@ -2467,7 +2467,7 @@ This option is mostly for use in maintaining .I flex. .TP -.B \-V +.B \-V, \-\-version prints the version number to .I stdout and exits. @@ -2475,7 +2475,7 @@ is a synonym for .B \-V. .TP -.B \-7 +.B \-7, \-\-7bit instructs .I flex to generate a 7-bit scanner, i.e., one which can only recognized 7-bit @@ -2521,7 +2521,7 @@ scanner, since usually with these compression options full 8-bit tables are not much more expensive than 7-bit tables. .TP -.B \-8 +.B \-8, \-\-8bit instructs .I flex to generate an 8-bit scanner, i.e., one which can recognize 8-bit @@ -2537,7 +2537,7 @@ above for flex's default behavior and the tradeoffs between 7-bit and 8-bit scanners. .TP -.B \-+ +.B \-+, \-\-c++ specifies that you want flex to generate a C++ scanner class. See the section on Generating C++ Scanners below for @@ -2547,7 +2547,7 @@ controls the degree of table compression and, more generally, trade-offs between small scanners and fast scanners. .IP -.B \-Ca +.B \-Ca, \-\-align ("align") instructs flex to trade off larger tables in the generated scanner for faster performance because the elements of the tables are better aligned for memory access and computation. @@ -2557,7 +2557,7 @@ This option can double the size of the tables used by your scanner. .IP -.B \-Ce +.B \-Ce, \-\-ecs directs .I flex to construct @@ -2592,7 +2592,7 @@ This