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: 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: 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: 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: 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
