svn commit: r272955 - in stable/10/contrib/byacc: . package package/debian package/pkgsrc test test/btyacc test/yacc
Craig Rodrigues
rodrigc at FreeBSD.org
Sat Oct 11 19:34:45 UTC 2014
Author: rodrigc
Date: Sat Oct 11 19:34:41 2014
New Revision: 272955
URL: https://svnweb.freebsd.org/changeset/base/272955
Log:
Merge: 272655
Import byacc 20141005 from vendor
Added:
stable/10/contrib/byacc/test/btyacc/btyacc_demo2.error
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_demo2.error
stable/10/contrib/byacc/test/btyacc/btyacc_demo2.output
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_demo2.output
stable/10/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
stable/10/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
stable/10/contrib/byacc/test/btyacc/btyacc_destroy1.error
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_destroy1.error
stable/10/contrib/byacc/test/btyacc/btyacc_destroy1.output
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_destroy1.output
stable/10/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
stable/10/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
stable/10/contrib/byacc/test/btyacc/btyacc_destroy2.error
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_destroy2.error
stable/10/contrib/byacc/test/btyacc/btyacc_destroy2.output
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_destroy2.output
stable/10/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
stable/10/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
stable/10/contrib/byacc/test/btyacc/btyacc_destroy3.error
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_destroy3.error
stable/10/contrib/byacc/test/btyacc/btyacc_destroy3.output
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_destroy3.output
stable/10/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
stable/10/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
- copied unchanged from r272655, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
stable/10/contrib/byacc/test/btyacc_destroy1.y
- copied unchanged from r272655, head/contrib/byacc/test/btyacc_destroy1.y
stable/10/contrib/byacc/test/btyacc_destroy2.y
- copied unchanged from r272655, head/contrib/byacc/test/btyacc_destroy2.y
stable/10/contrib/byacc/test/btyacc_destroy3.y
- copied unchanged from r272655, head/contrib/byacc/test/btyacc_destroy3.y
Modified:
stable/10/contrib/byacc/CHANGES
stable/10/contrib/byacc/MANIFEST
stable/10/contrib/byacc/VERSION
stable/10/contrib/byacc/aclocal.m4
stable/10/contrib/byacc/btyaccpar.c
stable/10/contrib/byacc/closure.c
stable/10/contrib/byacc/config.sub
stable/10/contrib/byacc/configure
stable/10/contrib/byacc/defs.h
stable/10/contrib/byacc/lalr.c
stable/10/contrib/byacc/main.c
stable/10/contrib/byacc/output.c
stable/10/contrib/byacc/package/byacc.spec
stable/10/contrib/byacc/package/debian/changelog
stable/10/contrib/byacc/package/mingw-byacc.spec
stable/10/contrib/byacc/package/pkgsrc/Makefile
stable/10/contrib/byacc/reader.c
stable/10/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
stable/10/contrib/byacc/test/btyacc/btyacc_demo.tab.c
stable/10/contrib/byacc/test/btyacc/calc.tab.c
stable/10/contrib/byacc/test/btyacc/calc1.tab.c
stable/10/contrib/byacc/test/btyacc/calc2.tab.c
stable/10/contrib/byacc/test/btyacc/calc3.tab.c
stable/10/contrib/byacc/test/btyacc/code_calc.code.c
stable/10/contrib/byacc/test/btyacc/code_calc.tab.c
stable/10/contrib/byacc/test/btyacc/code_error.code.c
stable/10/contrib/byacc/test/btyacc/code_error.tab.c
stable/10/contrib/byacc/test/btyacc/empty.tab.c
stable/10/contrib/byacc/test/btyacc/err_inherit1.tab.c
stable/10/contrib/byacc/test/btyacc/err_inherit2.tab.c
stable/10/contrib/byacc/test/btyacc/err_inherit3.tab.c
stable/10/contrib/byacc/test/btyacc/err_inherit4.tab.c
stable/10/contrib/byacc/test/btyacc/err_inherit5.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax1.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax10.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax11.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax12.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax13.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax14.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax15.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax16.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax17.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax18.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax19.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax2.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax20.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax21.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax22.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax23.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax24.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax25.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax26.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax27.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax3.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax4.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax5.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax6.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax7.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax7a.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax7b.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax8.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax8a.tab.c
stable/10/contrib/byacc/test/btyacc/err_syntax9.tab.c
stable/10/contrib/byacc/test/btyacc/error.tab.c
stable/10/contrib/byacc/test/btyacc/grammar.tab.c
stable/10/contrib/byacc/test/btyacc/inherit0.tab.c
stable/10/contrib/byacc/test/btyacc/inherit1.tab.c
stable/10/contrib/byacc/test/btyacc/inherit2.tab.c
stable/10/contrib/byacc/test/btyacc/ok_syntax1.tab.c
stable/10/contrib/byacc/test/btyacc/pure_calc.tab.c
stable/10/contrib/byacc/test/btyacc/pure_error.tab.c
stable/10/contrib/byacc/test/btyacc/quote_calc-s.tab.c
stable/10/contrib/byacc/test/btyacc/quote_calc.tab.c
stable/10/contrib/byacc/test/btyacc/quote_calc2-s.tab.c
stable/10/contrib/byacc/test/btyacc/quote_calc2.tab.c
stable/10/contrib/byacc/test/btyacc/quote_calc3-s.tab.c
stable/10/contrib/byacc/test/btyacc/quote_calc3.tab.c
stable/10/contrib/byacc/test/btyacc/quote_calc4-s.tab.c
stable/10/contrib/byacc/test/btyacc/quote_calc4.tab.c
stable/10/contrib/byacc/test/btyacc/rename_debug.c
stable/10/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
stable/10/contrib/byacc/test/yacc/calc2.tab.c
stable/10/contrib/byacc/test/yacc/calc3.tab.c
stable/10/contrib/byacc/test/yacc/ok_syntax1.tab.c
stable/10/contrib/byacc/yacc.1
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/byacc/CHANGES
==============================================================================
--- stable/10/contrib/byacc/CHANGES Sat Oct 11 19:28:22 2014 (r272954)
+++ stable/10/contrib/byacc/CHANGES Sat Oct 11 19:34:41 2014 (r272955)
@@ -1,9 +1,125 @@
+2014-10-05 Thomas E. Dickey <tom at invisible-island.net>
+
+ * main.c:
+ make change to umask before calling mkstemp, as suggested in Coverity #56902
+
+ * reader.c:
+ adjust logic in copy_action to avoid potential null-pointer dereference
+ (Coverity #56901)
+
+ * reader.c:
+ adjust logic to avoid potential null-pointer dereference in compile_args
+ (Coverity #63407)
+
+ * reader.c: eliminate strcpy into fixed-size buffer (Coverity #63408)
+
+ * yacc.1: document changes made with respect to %parse-param
+
+ * output.c:
+ add parameters from %parse-param to destructor. The order of the parameters
+ is intentionally inconsistent with yyparse/yyerror, for "compatibility" with
+ bison.
+
+ * test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c:
+ regen
+
+ * output.c:
+ use puts_param_types/puts_param_names to output lex_param data.
+
+ * test/btyacc/ok_syntax1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c
, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/rename_debug.c:
+ regen
+
+ * btyaccpar.c: add casts, change types to fix strict compiler warnings
+
+ * test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.tab.c, test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax9.tab.c, test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c:
+ regen
+
+ * output.c: gcc-warning
+
+ * test/btyacc/code_calc.tab.c, test/btyacc/code_error.tab.c: regen
+
+ * output.c: fix limit when merging real/workaround tables
+
+ * output.c:
+ for btyacc, it is possible to have no conflicts - but in that case, the
+ "ctable" was not generated at all, while the skeleton uses the table.
+ The most straightforward (workaround) is generating a dummy table which
+ rejects any state.
+
+ * test/btyacc_destroy3.y, test/btyacc_destroy2.y, test/btyacc_destroy1.y:
+ fix "make check_make"
+
+ * test/yacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/calc2.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c:
+ regen
+
+ * reader.c:
+ trim blanks from interim value in copy_param() to handle special case when
+ a space precedes a comma.
+
+ * output.c:
+ use two new functions, puts_param_types and puts_param_names, to improve
+ format of the parse_param list (by trimming space after "*") as well as
+ correcting the output of the comma-separated names (only the last name
+ was output).
+
+ * test/btyacc/ok_syntax1.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c:
+ regen
+
+ * reader.c:
+ modify copy_param() to handle resulting comma-separated list. Before, it
+ only expected a single parameter.
+
+2014-10-04 Thomas E. Dickey <tom at invisible-island.net>
+
+ * reader.c: split-out save_param() from copy_param()
+
+ * reader.c: trim_blanks() did not always convert spaces - fix.
+
+ * reader.c: fix some minor regressions with error-reporting
+
+ * aclocal.m4: update CF_XOPEN_SOURCE for Unixware change from lynx
+
+ * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+ bump
+
+ * reader.c:
+ modify copy_param() to accept multiple parameters, each in curly braces like
+ recent bison, as well as honoring bison's undocumented feature to accept the
+ parameters as a comma-separated list.
+
+ * test/btyacc/btyacc_destroy3.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.error, test/btyacc/btyacc_destroy3.output, test/btyacc/btyacc_destroy3.tab.h, test/btyacc/btyacc_destroy2.error, test/btyacc/btyacc_destroy2.output, test/btyacc/btyacc_destroy2.tab.h:
+ RCS_BASE
+
+2014-10-03 Thomas E. Dickey <tom at invisible-island.net>
+
+ * test/btyacc/btyacc_demo2.error, test/btyacc/btyacc_demo2.output, test/btyacc/btyacc_demo2.tab.c, test/btyacc/btyacc_demo2.tab.h, test/btyacc/btyacc_destroy1.error, test/btyacc/btyacc_destroy1.output, test/btyacc/btyacc_destroy1.tab.h, test/btyacc_destroy3.y, test/btyacc_destroy1.y, test/btyacc_destroy2.y:
+ RCS_BASE
+
2014-10-02 Thomas E. Dickey <tom at invisible-island.net>
- * reader.c, defs.h:
+ * main.c, reader.c, defs.h:
use calloc in get_line() when allocating line to ensure it is fully initialized,
fixes a later uninitialized value in copy_param() (FreeBSD #193499).
+2014-09-17 Thomas E. Dickey <tom at invisible-island.net>
+
+ * closure.c, lalr.c, output.c, defs.h:
+ rephrase odd addressing to fix Coverity #48848, #38950, #38860, not actually
+ a bug.
+
+2014-09-01 Thomas E. Dickey <tom at invisible-island.net>
+
+ * config.sub: update to 2014-07-28
+
+2014-07-27 Thomas E. Dickey <tom at invisible-island.net>
+
+ * configure: regen
+
+ * aclocal.m4: modified to support port to Minix3.2
+
+ * package/pkgsrc/Makefile, VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec:
+ bump
+
2014-07-15 Thomas E. Dickey <tom at invisible-island.net>
* aclocal.m4: resync with my-autoconf (no change to configure script)
Modified: stable/10/contrib/byacc/MANIFEST
==============================================================================
--- stable/10/contrib/byacc/MANIFEST Sat Oct 11 19:28:22 2014 (r272954)
+++ stable/10/contrib/byacc/MANIFEST Sat Oct 11 19:34:41 2014 (r272955)
@@ -1,4 +1,4 @@
-MANIFEST for byacc-20140715, version t20140715
+MANIFEST for byacc-20141005, version t20141005
--------------------------------------------------------------------------------
MANIFEST this file
ACKNOWLEDGEMENTS original version of byacc - 1993
Modified: stable/10/contrib/byacc/VERSION
==============================================================================
--- stable/10/contrib/byacc/VERSION Sat Oct 11 19:28:22 2014 (r272954)
+++ stable/10/contrib/byacc/VERSION Sat Oct 11 19:34:41 2014 (r272955)
@@ -1 +1 @@
-20140715
+20141005
Modified: stable/10/contrib/byacc/aclocal.m4
==============================================================================
--- stable/10/contrib/byacc/aclocal.m4 Sat Oct 11 19:28:22 2014 (r272954)
+++ stable/10/contrib/byacc/aclocal.m4 Sat Oct 11 19:34:41 2014 (r272955)
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.35 2014/07/15 19:38:05 tom Exp $
+dnl $Id: aclocal.m4,v 1.37 2014/10/04 16:40:06 tom Exp $
dnl Macros for byacc configure script (Thomas E. Dickey)
dnl ---------------------------------------------------------------------------
dnl Copyright 2004-2013,2014 Thomas E. Dickey
@@ -54,7 +54,7 @@ define([CF_ACVERSION_COMPARE],
[ifelse([$8], , ,[$8])],
[ifelse([$9], , ,[$9])])])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
+dnl CF_ADD_CFLAGS version: 11 updated: 2014/07/22 05:32:57
dnl -------------
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
dnl The second parameter if given makes this macro verbose.
@@ -79,7 +79,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
@@ -116,7 +116,7 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -1085,7 +1085,7 @@ fi
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 46 updated: 2014/02/09 19:30:15
+dnl CF_XOPEN_SOURCE version: 48 updated: 2014/09/01 12:29:14
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -1136,6 +1136,9 @@ irix[[56]].*) #(vi
linux*|gnu*|mint*|k*bsd*-gnu) #(vi
CF_GNU_SOURCE
;;
+minix*) #(vi
+ cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
+ ;;
mirbsd*) #(vi
# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
cf_XOPEN_SOURCE=
@@ -1165,6 +1168,10 @@ solaris2.*) #(vi
cf_xopen_source="-D__EXTENSIONS__"
cf_cv_xopen_source=broken
;;
+sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2)
+ cf_XOPEN_SOURCE=
+ cf_POSIX_C_SOURCE=
+ ;;
*)
CF_TRY_XOPEN_SOURCE
CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
@@ -1172,7 +1179,7 @@ solaris2.*) #(vi
esac
if test -n "$cf_xopen_source" ; then
- CF_ADD_CFLAGS($cf_xopen_source)
+ CF_ADD_CFLAGS($cf_xopen_source,true)
fi
dnl In anything but the default case, we may have system-specific setting
Modified: stable/10/contrib/byacc/btyaccpar.c
==============================================================================
--- stable/10/contrib/byacc/btyaccpar.c Sat Oct 11 19:28:22 2014 (r272954)
+++ stable/10/contrib/byacc/btyaccpar.c Sat Oct 11 19:34:41 2014 (r272955)
@@ -18,7 +18,7 @@ const char *const banner[] =
{
"/* original parser id follows */",
"/* yysccsid[] = \"@(#)yaccpar 1.9 (Berkeley) 02/21/93\" */",
- "/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */",
+ "/* (use YYMAJOR/YYMINOR for ifdefs dependent of parser version) */",
"",
"#define YYBYACC 1",
CONCAT1("#define YYMAJOR ", YYMAJOR),
@@ -56,7 +56,7 @@ const char *const tables[] =
"#if YYBTYACC",
"extern const YYINT yycindex[];",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"extern const YYINT yygindex[];",
"extern const YYINT yytable[];",
"extern const YYINT yycheck[];",
@@ -64,7 +64,7 @@ const char *const tables[] =
"#if YYBTYACC",
"extern const YYINT yyctable[];",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"#if YYDEBUG",
"extern const char *const yyname[];",
@@ -127,7 +127,7 @@ const char *const hdr_defs[] =
"#define YYLVQUEUEGROWTH 32",
"#endif",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"/* define the initial stack-sizes */",
"#ifdef YYSTACKSIZE",
@@ -172,7 +172,7 @@ const char *const hdr_defs[] =
"};",
"typedef struct YYParseState_s YYParseState;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
0
};
@@ -220,7 +220,7 @@ const char *const hdr_vars[] =
"",
"static short *yylexemes = 0;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
0
};
@@ -277,7 +277,7 @@ const char *const body_vars[] =
"",
" static short *yylexemes = 0;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
0
};
@@ -290,14 +290,14 @@ const char *const body_1[] =
"#if YYBTYACC",
"#define yytrial (yyps->save)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"#if YYDEBUG",
- "#include <stdio.h> /* needed for printf */",
+ "#include <stdio.h> /* needed for printf */",
"#endif",
"",
- "#include <stdlib.h> /* needed for malloc, etc */",
- "#include <string.h> /* needed for memset */",
+ "#include <stdlib.h> /* needed for malloc, etc */",
+ "#include <string.h> /* needed for memset */",
"",
"/* allocate initial stack or double stack size, up to YYMAXDEPTH */",
"static int yygrowstack(YYSTACKDATA *data)",
@@ -404,7 +404,7 @@ const char *const body_1[] =
" free(p);",
"}",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"#define YYABORT goto yyabort",
"#define YYREJECT goto yyabort",
@@ -416,7 +416,7 @@ const char *const body_1[] =
"#define YYVALID_NESTED do { if (yyps->save && \\",
" yyps->save->save == 0) goto yyvalid; } while(0)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"int",
"YYPARSE_DECL()",
@@ -432,7 +432,7 @@ const char *const body_2[] =
" int yynewerrflag;",
" YYParseState *yyerrctx = NULL;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" YYLTYPE yyerror_loc_range[2]; /* position of error start & end */",
"#endif",
@@ -454,7 +454,7 @@ const char *const body_2[] =
" yyps = yyNewState(0); if (yyps == 0) goto yyenomem;",
" yyps->save = 0;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yynerrs = 0;",
" yyerrflag = 0;",
" yychar = YYEMPTY;",
@@ -495,8 +495,8 @@ const char *const body_2[] =
" /* in trial mode; save scanner results for future parse attempts */",
" if (yylvp == yylvlim)",
" { /* Enlarge lexical value queue */",
- " int p = yylvp - yylvals;",
- " int s = yylvlim - yylvals;",
+ " size_t p = (size_t) (yylvp - yylvals);",
+ " size_t s = (size_t) (yylvlim - yylvals);",
"",
" s += YYLVQUEUEGROWTH;",
" if ((yylexemes = (short *) realloc(yylexemes, s * sizeof(short))) == NULL) goto yyenomem;",
@@ -524,13 +524,13 @@ const char *const body_2[] =
" }",
" /* normal operation, no conflict encountered */",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yychar = YYLEX;",
#if defined(YYBTYACC)
"#if YYBTYACC",
" } while (0);",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" if (yychar < 0) yychar = YYEOF;",
" /* if ((yychar = YYLEX) < 0) yychar = YYEOF; */",
"#if YYDEBUG",
@@ -544,7 +544,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" fprintf(stderr, \" <%s>\", YYSTYPE_TOSTRING(yychar, yylval));",
"#endif",
" fputc('\\n', stderr);",
@@ -598,12 +598,12 @@ const char *const body_2[] =
" save->state = yystate;",
" save->errflag = yyerrflag;",
" save->yystack.s_mark = save->yystack.s_base + (yystack.s_mark - yystack.s_base);",
- " memcpy (save->yystack.s_base, yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (save->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" save->yystack.l_mark = save->yystack.l_base + (yystack.l_mark - yystack.l_base);",
- " memcpy (save->yystack.l_base, yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (save->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" save->yystack.p_mark = save->yystack.p_base + (yystack.p_mark - yystack.p_base);",
- " memcpy (save->yystack.p_base, yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (save->yystack.p_base, yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
" ctry = yytable[yyn];",
" if (yyctable[ctry] == -1)",
@@ -658,7 +658,7 @@ const char *const body_2[] =
" yylexp--;",
" yychar = YYEMPTY;",
" }",
- " save->lexeme = yylvp - yylvals;",
+ " save->lexeme = (int) (yylvp - yylvals);",
" yyps->save = save;",
" }",
" if (yytable[yyn] == ctry)",
@@ -695,7 +695,7 @@ const char *const body_2[] =
" }",
" } /* End of code dealing with conflicts */",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" if (((yyn = yysindex[yystate]) != 0) && (yyn += yychar) >= 0 &&",
" yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yychar)",
" {",
@@ -754,14 +754,14 @@ const char *const body_2[] =
" yyerrctx->state = yystate;",
" yyerrctx->errflag = yyerrflag;",
" yyerrctx->yystack.s_mark = yyerrctx->yystack.s_base + (yystack.s_mark - yystack.s_base);",
- " memcpy (yyerrctx->yystack.s_base, yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yyerrctx->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" yyerrctx->yystack.l_mark = yyerrctx->yystack.l_base + (yystack.l_mark - yystack.l_base);",
- " memcpy (yyerrctx->yystack.l_base, yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (yyerrctx->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" yyerrctx->yystack.p_mark = yyerrctx->yystack.p_base + (yystack.p_mark - yystack.p_base);",
- " memcpy (yyerrctx->yystack.p_base, yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (yyerrctx->yystack.p_base, yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
- " yyerrctx->lexeme = yylvp - yylvals;",
+ " yyerrctx->lexeme = (int) (yylvp - yylvals);",
" }",
" yylvp = yylvals + save->lexeme;",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -770,12 +770,12 @@ const char *const body_2[] =
" yylexp = yylexemes + save->lexeme;",
" yychar = YYEMPTY;",
" yystack.s_mark = yystack.s_base + (save->yystack.s_mark - save->yystack.s_base);",
- " memcpy (yystack.s_base, save->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yystack.s_base, save->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" yystack.l_mark = yystack.l_base + (save->yystack.l_mark - save->yystack.l_base);",
- " memcpy (yystack.l_base, save->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (yystack.l_base, save->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" yystack.p_mark = yystack.p_base + (save->yystack.p_mark - save->yystack.p_base);",
- " memcpy (yystack.p_base, save->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (yystack.p_base, save->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
" ctry = ++save->ctry;",
" yystate = save->state;",
@@ -805,12 +805,12 @@ const char *const body_2[] =
" yylloc = yylpp[-1];",
"#endif",
" yystack.s_mark = yystack.s_base + (yyerrctx->yystack.s_mark - yyerrctx->yystack.s_base);",
- " memcpy (yystack.s_base, yyerrctx->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yystack.s_base, yyerrctx->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" yystack.l_mark = yystack.l_base + (yyerrctx->yystack.l_mark - yyerrctx->yystack.l_base);",
- " memcpy (yystack.l_base, yyerrctx->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (yystack.l_base, yyerrctx->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" yystack.p_mark = yystack.p_base + (yyerrctx->yystack.p_mark - yyerrctx->yystack.p_base);",
- " memcpy (yystack.p_base, yyerrctx->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (yystack.p_base, yyerrctx->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
" yystate = yyerrctx->state;",
" yyFreeState(yyerrctx);",
@@ -820,7 +820,7 @@ const char *const body_2[] =
" }",
" if (yynewerrflag == 0) goto yyinrecovery;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
" YYERROR_CALL(\"syntax error\");",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -876,7 +876,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" YYDESTRUCT_CALL(\"error: discarding state\",",
" yystos[*yystack.s_mark], yystack.l_mark, yystack.p_mark);",
@@ -909,7 +909,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" YYDESTRUCT_CALL(\"error: discarding token\", yychar, &yylval, &yylloc);",
"#else",
@@ -932,7 +932,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" if (yym > 0)",
" {",
" int i;",
@@ -961,7 +961,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" {",
" YYLLOC_DEFAULT(yyloc, &yystack.p_mark[1-yym], yym);",
" /* just in case YYERROR is invoked within the action, save",
@@ -998,7 +998,7 @@ const char *const trailer[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" fprintf(stderr, \"result is <%s>, \", YYSTYPE_TOSTRING(yystos[YYFINAL], yyval));",
"#endif",
" fprintf(stderr, \"shifting from state 0 to final state %d\\n\", YYFINAL);",
@@ -1030,8 +1030,8 @@ const char *const trailer[] =
" /* in trial mode; save scanner results for future parse attempts */",
" if (yylvp == yylvlim)",
" { /* Enlarge lexical value queue */",
- " int p = yylvp - yylvals;",
- " int s = yylvlim - yylvals;",
+ " size_t p = (size_t) (yylvp - yylvals);",
+ " size_t s = (size_t) (yylvlim - yylvals);",
"",
" s += YYLVQUEUEGROWTH;",
" if ((yylexemes = (short *) realloc(yylexemes, s * sizeof(short))) == NULL)",
@@ -1062,13 +1062,13 @@ const char *const trailer[] =
" }",
" /* normal operation, no conflict encountered */",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yychar = YYLEX;",
#if defined(YYBTYACC)
"#if YYBTYACC",
" } while (0);",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" if (yychar < 0) yychar = YYEOF;",
" /* if ((yychar = YYLEX) < 0) yychar = YYEOF; */",
"#if YYDEBUG",
@@ -1097,7 +1097,7 @@ const char *const trailer[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" fprintf(stderr, \"result is <%s>, \", YYSTYPE_TOSTRING(yystos[yystate], yyval));",
"#endif",
" fprintf(stderr, \"shifting from state %d to state %d\\n\", *yystack.s_mark, yystate);",
@@ -1140,17 +1140,17 @@ const char *const trailer[] =
" yylexp = yylexemes + yypath->lexeme;",
" yychar = YYEMPTY;",
" yystack.s_mark = yystack.s_base + (yypath->yystack.s_mark - yypath->yystack.s_base);",
- " memcpy (yystack.s_base, yypath->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yystack.s_base, yypath->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" yystack.l_mark = yystack.l_base + (yypath->yystack.l_mark - yypath->yystack.l_base);",
- " memcpy (yystack.l_base, yypath->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (yystack.l_base, yypath->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" yystack.p_mark = yystack.p_base + (yypath->yystack.p_mark - yypath->yystack.p_base);",
- " memcpy (yystack.p_base, yypath->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (yystack.p_base, yypath->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
" yystate = yypath->state;",
" goto yyloop;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"yyoverflow:",
" YYERROR_CALL(\"yacc stack overflow\");",
@@ -1161,7 +1161,7 @@ const char *const trailer[] =
" YYERROR_CALL(\"memory exhausted\");",
"yyabort_nomem:",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yyresult = 2;",
" goto yyreturn;",
"",
@@ -1174,7 +1174,7 @@ const char *const trailer[] =
"#if YYBTYACC",
" if (yyps->save) goto yyvalid;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yyresult = 0;",
"",
"yyreturn:",
@@ -1224,7 +1224,7 @@ const char *const trailer[] =
" yyFreeState(save);",
" }",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yyfreestack(&yystack);",
" return (yyresult);",
"}",
Modified: stable/10/contrib/byacc/closure.c
==============================================================================
--- stable/10/contrib/byacc/closure.c Sat Oct 11 19:28:22 2014 (r272954)
+++ stable/10/contrib/byacc/closure.c Sat Oct 11 19:34:41 2014 (r272955)
@@ -1,4 +1,4 @@
-/* $Id: closure.c,v 1.10 2014/02/19 00:45:42 Tom.Shields Exp $ */
+/* $Id: closure.c,v 1.11 2014/09/18 00:40:07 tom Exp $ */
#include "defs.h"
@@ -6,6 +6,7 @@ Value_t *itemset;
Value_t *itemsetend;
unsigned *ruleset;
+static unsigned *first_base;
static unsigned *first_derives;
static unsigned *EFF;
@@ -68,7 +69,8 @@ set_first_derives(void)
rulesetsize = WORDSIZE(nrules);
varsetsize = WORDSIZE(nvars);
- first_derives = NEW2(nvars * rulesetsize, unsigned) - ntokens * rulesetsize;
+ first_base = NEW2(nvars * rulesetsize, unsigned);
+ first_derives = first_base - ntokens * rulesetsize;
set_EFF();
@@ -176,7 +178,7 @@ finalize_closure(void)
{
FREE(itemset);
FREE(ruleset);
- FREE(first_derives + ntokens * WORDSIZE(nrules));
+ FREE(first_base);
}
#ifdef DEBUG
Modified: stable/10/contrib/byacc/config.sub
==============================================================================
--- stable/10/contrib/byacc/config.sub Sat Oct 11 19:28:22 2014 (r272954)
+++ stable/10/contrib/byacc/config.sub Sat Oct 11 19:34:41 2014 (r272955)
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2014-04-03'
+timestamp='2014-07-28'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -283,8 +283,10 @@ case $basic_machine in
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
@@ -401,8 +403,10 @@ case $basic_machine in
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa32r6-* | mipsisa32r6el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64r6-* | mipsisa64r6el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
@@ -824,6 +828,10 @@ case $basic_machine in
basic_machine=powerpc-unknown
os=-morphos
;;
+ moxiebox)
+ basic_machine=moxie-unknown
+ os=-moxiebox
+ ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -1369,7 +1377,7 @@ case $os in
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
Modified: stable/10/contrib/byacc/configure
==============================================================================
--- stable/10/contrib/byacc/configure Sat Oct 11 19:28:22 2014 (r272954)
+++ stable/10/contrib/byacc/configure Sat Oct 11 19:34:41 2014 (r272955)
@@ -1936,7 +1936,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
@@ -1977,7 +1977,7 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -2498,6 +2498,9 @@ echo "${ECHO_T}$cf_cv_gnu_source" >&6
test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
;;
+minix*) #(vi
+ cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
+ ;;
mirbsd*) #(vi
# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
cf_XOPEN_SOURCE=
@@ -2515,16 +2518,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAG
sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
-echo "$as_me:2518: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:2521: checking if we should define _POSIX_C_SOURCE" >&5
echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
if test "${cf_cv_posix_c_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "${as_me:-configure}:2524: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:2527: testing if the symbol is already defined go no further ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 2527 "configure"
+#line 2530 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2539,16 +2542,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2542: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2545: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2545: \$? = $ac_status" >&5
+ echo "$as_me:2548: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2548: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2551: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2551: \$? = $ac_status" >&5
+ echo "$as_me:2554: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_posix_c_source=no
else
@@ -2569,7 +2572,7 @@ cf_want_posix_source=no
esac
if test "$cf_want_posix_source" = yes ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 2572 "configure"
+#line 2575 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2584,16 +2587,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2587: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2590: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2590: \$? = $ac_status" >&5
+ echo "$as_me:2593: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2593: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2596: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2596: \$? = $ac_status" >&5
+ echo "$as_me:2599: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -2604,15 +2607,15 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "${as_me:-configure}:2607: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:2610: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
CFLAGS="$cf_trim_CFLAGS"
CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
-echo "${as_me:-configure}:2612: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:2615: testing if the second compile does not leave our definition intact error ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 2615 "configure"
+#line 2618 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2627,16 +2630,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2630: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2633: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2633: \$? = $ac_status" >&5
+ echo "$as_me:2636: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2636: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2639: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2639: \$? = $ac_status" >&5
+ echo "$as_me:2642: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -2652,7 +2655,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:2655: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:2658: result: $cf_cv_posix_c_source" >&5
echo "${ECHO_T}$cf_cv_posix_c_source" >&6
if test "$cf_cv_posix_c_source" != no ; then
@@ -2674,7 +2677,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
@@ -2715,7 +2718,7 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -2766,14 +2769,14 @@ solaris2.*) #(vi
;;
*)
-echo "$as_me:2769: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:2772: checking if we should define _XOPEN_SOURCE" >&5
echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
if test "${cf_cv_xopen_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 2776 "configure"
+#line 2779 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -2792,16 +2795,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2795: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2798: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2798: \$? = $ac_status" >&5
+ echo "$as_me:2801: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2801: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2804: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2804: \$? = $ac_status" >&5
+ echo "$as_me:2807: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -2810,7 +2813,7 @@ cat conftest.$ac_ext >&5
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 2813 "configure"
+#line 2816 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -2829,16 +2832,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2832: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2835: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2835: \$? = $ac_status" >&5
+ echo "$as_me:2838: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2838: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2841: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2841: \$? = $ac_status" >&5
+ echo "$as_me:2844: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -2853,7 +2856,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:2856: result: $cf_cv_xopen_source" >&5
+echo "$as_me:2859: result: $cf_cv_xopen_source" >&5
echo "${ECHO_T}$cf_cv_xopen_source" >&6
if test "$cf_cv_xopen_source" != no ; then
@@ -2883,7 +2886,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
@@ -2924,7 +2927,7 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -2961,16 +2964,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAG
sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
-echo "$as_me:2964: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:2967: checking if we should define _POSIX_C_SOURCE" >&5
echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
if test "${cf_cv_posix_c_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "${as_me:-configure}:2970: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:2973: testing if the symbol is already defined go no further ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 2973 "configure"
+#line 2976 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2985,16 +2988,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2988: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2991: \$? = $ac_status" >&5
+ echo "$as_me:2994: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2994: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2997: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2997: \$? = $ac_status" >&5
+ echo "$as_me:3000: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_posix_c_source=no
else
@@ -3015,7 +3018,7 @@ cf_want_posix_source=no
esac
if test "$cf_want_posix_source" = yes ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 3018 "configure"
+#line 3021 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -3030,16 +3033,16 @@ make an error
}
_ACEOF
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list