Author: bapt
Date: Tue Oct 29 08:21:22 2013
New Revision: 257315
URL: http://svnweb.freebsd.org/changeset/base/257315
Log:
Merge byacc 20130925
2 changes:
- Increase default stack-size so that used to be our default stack-size prior
byacc import
- fix two loop-limits found by clang 3.3
Added:
head/contrib/byacc/package/mingw-byacc.spec
- copied unchanged from r257314, vendor/byacc/dist/package/mingw-byacc.spec
Modified:
head/contrib/byacc/CHANGES
head/contrib/byacc/VERSION
head/contrib/byacc/aclocal.m4
head/contrib/byacc/config.guess
head/contrib/byacc/config.sub
head/contrib/byacc/configure
head/contrib/byacc/package/byacc.spec
head/contrib/byacc/package/debian/changelog
head/contrib/byacc/reader.c
head/contrib/byacc/skeleton.c
head/contrib/byacc/test/calc.tab.c
head/contrib/byacc/test/calc1.tab.c
head/contrib/byacc/test/calc2.tab.c
head/contrib/byacc/test/calc3.tab.c
head/contrib/byacc/test/code_calc.code.c
head/contrib/byacc/test/code_error.code.c
head/contrib/byacc/test/error.tab.c
head/contrib/byacc/test/ftp.tab.c
head/contrib/byacc/test/grammar.tab.c
head/contrib/byacc/test/pure_calc.tab.c
head/contrib/byacc/test/pure_error.tab.c
head/contrib/byacc/test/quote_calc-s.tab.c
head/contrib/byacc/test/quote_calc.tab.c
head/contrib/byacc/test/quote_calc2-s.tab.c
head/contrib/byacc/test/quote_calc2.tab.c
head/contrib/byacc/test/quote_calc3-s.tab.c
head/contrib/byacc/test/quote_calc3.tab.c
head/contrib/byacc/test/quote_calc4-s.tab.c
head/contrib/byacc/test/quote_calc4.tab.c
Directory Properties:
head/contrib/byacc/ (props changed)
Modified: head/contrib/byacc/CHANGES
==============================================================================
--- head/contrib/byacc/CHANGES Tue Oct 29 08:10:34 2013 (r257314)
+++ head/contrib/byacc/CHANGES Tue Oct 29 08:21:22 2013 (r257315)
@@ -1,3 +1,44 @@
+2013-09-25 Thomas E. Dickey <t...@invisible-island.net>
+
+ * reader.c: fix two loop-limits found by clang 3.3 --analyze
+
+ * configure: regen
+
+ * aclocal.m4:
+ tweaks to CF_MIXEDCASE_FILENAMES and CF_XOPEN_SOURCE for msys from
ncurses
+
+ * package/mingw-byacc.spec: RCS_BASE
+
+ * test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c,
test/calc3.tab.c, test/code_calc.code.c, test/code_error.code.c,
test/error.tab.c, test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c,
test/pure_error.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c,
test/quote_calc2-s.tab.c, test/quote_calc2.tab.c, test/quote_calc3-s.tab.c,
test/quote_calc3.tab.c, test/quote_calc4-s.tab.c, test/quote_calc4.tab.c:
+ regen
+
+ * skeleton.c:
+ Increase default stack-size to match FreeBSD version noted as from
+ "BSD 4.4 Lite Usr.bin Sources". See
+
+ http://svnweb.freebsd.org/base/vendor/CSRG/dist/usr.bin/yacc/
+ http://svnweb.freebsd.org/base/head/usr.bin/yacc/
+ http://svnweb.freebsd.org/base/vendor/byacc/
+
+ The original 1.9 sources (on which I based development) used 500 for
+ stacksize; the BSD Lite sources (a year or two later) used 10000.
+
+ This is a change to default values; the YYMAXDEPTH and YYSTACKSIZE
+ symbols have "always" been overridable by applications, but rarely
+ needed to do this. RedHat began using the FreeBSD source in 2000,
+ and switched to this source in 2007 using the 20050813 snapshot.
+
+ RedHat #743343 misattributed the change in default stacksize to
+ a regression in byacc, but did not report the issue upstream.
+
+ * package/debian/changelog, VERSION, package/byacc.spec: bump
+
+2013-09-07 Thomas E. Dickey <t...@invisible-island.net>
+
+ * config.sub: update to 2013-09-15
+
+ * config.guess: update to 2013-06-10
+
2013-03-04 Thomas E. Dickey <t...@invisible-island.net>
* package/debian/changelog, VERSION, package/byacc.spec: bump
@@ -30,7 +71,7 @@
2013-02-10 Thomas E. Dickey <t...@invisible-island.net>
- * config.sub, config.guess: 2013-02-04
+ * config.sub, config.guess: update to 2013-02-04
2012-10-03 Thomas E. Dickey <t...@invisible-island.net>
@@ -348,11 +389,11 @@
2011-04-01 Thomas E. Dickey <t...@invisible-island.net>
- * config.sub: 2011-04-01
+ * config.sub: update to 2011-04-01
2011-02-02 Thomas E. Dickey <t...@invisible-island.net>
- * config.guess: 2011-01-01
+ * config.guess: update to 2011-01-01
2010-12-29 Thomas E. Dickey <t...@invisible-island.net>
@@ -530,11 +571,11 @@
2010-09-28 Thomas E. Dickey <t...@invisible-island.net>
- * config.guess: 2010-09-24
+ * config.guess: update to 2010-09-24
2010-09-10 Thomas E. Dickey <t...@invisible-island.net>
- * config.sub: 2010-09-11
+ * config.sub: update to 2010-09-11
2010-06-10 Thomas E. Dickey <t...@invisible-island.net>
@@ -770,9 +811,9 @@
2009-12-31 Thomas E. Dickey <t...@invisible-island.net>
- * config.guess: 2009-12-30
+ * config.guess: update to 2009-12-30
- * config.sub: 2009-12-31
+ * config.sub: update to 2009-12-31
2009-10-27 Thomas E. Dickey <t...@invisible-island.net>
@@ -798,7 +839,7 @@
2009-08-25 Thomas E. Dickey <t...@invisible-island.net>
- * config.guess, config.sub: 2009-08-19
+ * config.guess, config.sub: update to 2009-08-19
2009-02-21 Thomas E. Dickey <t...@invisible-island.net>
@@ -979,11 +1020,11 @@
2006-12-22 Thomas E. Dickey <t...@invisible-island.net>
- * config.guess: 2006/12/22
+ * config.guess: update to 2006/12/22
2006-12-08 Thomas E. Dickey <t...@invisible-island.net>
- * config.sub: 2006/12/08
+ * config.sub: update to 2006/12/08
2005-08-13 Thomas E. Dickey <t...@invisible-island.net>
@@ -1012,9 +1053,9 @@
2005-06-25 Thomas E. Dickey <t...@invisible-island.net>
- * config.sub: 2005/6/2
+ * config.sub: update to 2005/6/2
- * config.guess: 2005/5/27
+ * config.guess: update to 2005/5/27
2005-05-05 Thomas E. Dickey <t...@invisible-island.net>
@@ -1108,9 +1149,9 @@
2005-04-16 Thomas E. Dickey <t...@invisible-island.net>
- * config.sub: 2005/2/10
+ * config.sub: update to 2005/2/10
- * config.guess: 2005/3/24
+ * config.guess: update to 2005/3/24
2005-04-13 Thomas E. Dickey <t...@invisible-island.net>
Modified: head/contrib/byacc/VERSION
==============================================================================
--- head/contrib/byacc/VERSION Tue Oct 29 08:10:34 2013 (r257314)
+++ head/contrib/byacc/VERSION Tue Oct 29 08:21:22 2013 (r257315)
@@ -1 +1 @@
-20130304
+20130925
Modified: head/contrib/byacc/aclocal.m4
==============================================================================
--- head/contrib/byacc/aclocal.m4 Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/aclocal.m4 Tue Oct 29 08:21:22 2013
(r257315)
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.30 2013/03/05 01:13:39 tom Exp $
+dnl $Id: aclocal.m4,v 1.31 2013/09/25 23:15:41 tom Exp $
dnl Macros for byacc configure script (Thomas E. Dickey)
dnl ---------------------------------------------------------------------------
dnl Copyright 2004-2012,2013 Thomas E. Dickey
@@ -671,7 +671,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
AC_SUBST(MAKE_LOWER_TAGS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MIXEDCASE_FILENAMES version: 4 updated: 2012/10/02 20:55:03
+dnl CF_MIXEDCASE_FILENAMES version: 5 updated: 2013/09/07 13:54:05
dnl ----------------------
dnl Check if the file-system supports mixed-case filenames. If we're able to
dnl create a lowercase name and see it as uppercase, it doesn't support that.
@@ -680,7 +680,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES],
AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
if test "$cross_compiling" = yes ; then
case $target_alias in #(vi
- *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
+ *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi
cf_cv_mixedcase=no
;;
*)
@@ -1018,7 +1018,7 @@ fi
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 43 updated: 2013/02/10 10:41:05
+dnl CF_XOPEN_SOURCE version: 45 updated: 2013/09/07 14:06:25
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,
@@ -1038,7 +1038,7 @@ case $host_os in #(vi
aix[[4-7]]*) #(vi
cf_xopen_source="-D_ALL_SOURCE"
;;
-cygwin) #(vi
+cygwin|msys) #(vi
cf_XOPEN_SOURCE=600
;;
darwin[[0-8]].*) #(vi
Modified: head/contrib/byacc/config.guess
==============================================================================
--- head/contrib/byacc/config.guess Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/config.guess Tue Oct 29 08:21:22 2013
(r257315)
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2013-02-04'
+timestamp='2013-06-10'
# 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
@@ -132,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ LIBC=gnu
+
+ eval $set_cc_for_build
+ cat <<-EOF > $dummy.c
+ #include <features.h>
+ #if defined(__UCLIBC__)
+ LIBC=uclibc
+ #elif defined(__dietlibc__)
+ LIBC=dietlibc
+ #else
+ LIBC=gnu
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ ;;
+esac
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -853,21 +874,21 @@ EOF
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo
${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo
${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,'
| tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,'
| tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -880,59 +901,54 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:Linux:*:*)
- LIBC=gnu
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -951,54 +967,63 @@ EOF
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
+ or1k:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
or32:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
+ echo sparc-unknown-linux-${LIBC}
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ echo hppa64-unknown-linux-${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+ *) echo hppa-unknown-linux-${LIBC} ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
+ echo powerpc64-unknown-linux-${LIBC}
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
+ echo powerpc-unknown-linux-${LIBC}
+ exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-${LIBC}
+ exit ;;
+ ppcle:Linux:*:*)
+ echo powerpcle-unknown-linux-${LIBC}
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1231,19 +1256,21 @@ EOF
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in
- i386)
- eval $set_cc_for_build
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo
'#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- UNAME_PROCESSOR="x86_64"
- fi
- fi ;;
- unknown) UNAME_PROCESSOR=powerpc ;;
- esac
+ eval $set_cc_for_build
+ if test "$UNAME_PROCESSOR" = unknown ; then
+ UNAME_PROCESSOR=powerpc
+ fi
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ case $UNAME_PROCESSOR in
+ i386) UNAME_PROCESSOR=x86_64 ;;
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
+ fi
+ fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
Modified: head/contrib/byacc/config.sub
==============================================================================
--- head/contrib/byacc/config.sub Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/config.sub Tue Oct 29 08:21:22 2013
(r257315)
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2013-02-04'
+timestamp='2013-09-05'
# 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
@@ -252,12 +252,12 @@ case $basic_machine in
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] |
alpha64pca5[67] \
| am33_2.0 \
- | arc \
+ | arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
| be32 | be64 \
| bfin \
- | c4x | clipper \
+ | c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
| fido | fr30 | frv \
@@ -296,7 +296,7 @@ case $basic_machine in
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 \
- | or32 \
+ | or1k | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
@@ -324,7 +324,7 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -366,13 +366,13 @@ case $basic_machine in
| aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
- | clipper-* | craynv-* | cydra-* \
+ | c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -794,7 +794,7 @@ case $basic_machine in
os=-mingw64
;;
mingw32)
- basic_machine=i386-pc
+ basic_machine=i686-pc
os=-mingw32
;;
mingw32ce)
@@ -830,7 +830,7 @@ case $basic_machine in
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
msys)
- basic_machine=i386-pc
+ basic_machine=i686-pc
os=-msys
;;
mvs)
@@ -1546,6 +1546,9 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
+ c8051-*)
+ os=-elf
+ ;;
hexagon-*)
os=-elf
;;
@@ -1589,6 +1592,9 @@ case $basic_machine in
mips*-*)
os=-elf
;;
+ or1k-*)
+ os=-elf
+ ;;
or32-*)
os=-coff
;;
Modified: head/contrib/byacc/configure
==============================================================================
--- head/contrib/byacc/configure Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/configure Tue Oct 29 08:21:22 2013
(r257315)
@@ -2112,7 +2112,7 @@ else
if test "$cross_compiling" = yes ; then
case $target_alias in #(vi
- *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
+ *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi
cf_cv_mixedcase=no
;;
*)
@@ -2340,7 +2340,7 @@ case $host_os in #(vi
aix[4-7]*) #(vi
cf_xopen_source="-D_ALL_SOURCE"
;;
-cygwin) #(vi
+cygwin|msys) #(vi
cf_XOPEN_SOURCE=600
;;
darwin[0-8].*) #(vi
Modified: head/contrib/byacc/package/byacc.spec
==============================================================================
--- head/contrib/byacc/package/byacc.spec Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/package/byacc.spec Tue Oct 29 08:21:22 2013
(r257315)
@@ -1,8 +1,8 @@
Summary: byacc - public domain Berkeley LALR Yacc parser generator
%define AppProgram byacc
-%define AppVersion 20130304
+%define AppVersion 20130925
%define UseProgram yacc
-# $XTermId: byacc.spec,v 1.16 2013/03/05 01:17:35 tom Exp $
+# $XTermId: byacc.spec,v 1.17 2013/09/25 22:41:54 tom Exp $
Name: %{AppProgram}
Version: %{AppVersion}
Release: 1
Modified: head/contrib/byacc/package/debian/changelog
==============================================================================
--- head/contrib/byacc/package/debian/changelog Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/package/debian/changelog Tue Oct 29 08:21:22 2013
(r257315)
@@ -1,3 +1,9 @@
+byacc (20130925) unstable; urgency=low
+
+ * increase default stack-size
+
+ -- Thomas E. Dickey <dic...@invisible-island.net> Wed, 25 Sep 2013 18:41:54
-0400
+
byacc (20130304) unstable; urgency=low
* changes prompted by Richard Mitton bug-report
Copied: head/contrib/byacc/package/mingw-byacc.spec (from r257314,
vendor/byacc/dist/package/mingw-byacc.spec)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/byacc/package/mingw-byacc.spec Tue Oct 29 08:21:22 2013
(r257315, copy of r257314, vendor/byacc/dist/package/mingw-byacc.spec)
@@ -0,0 +1,60 @@
+Summary: byacc - public domain Berkeley LALR Yacc parser generator
+%define AppProgram byacc
+%define AppVersion 20130925
+%define UseProgram yacc
+# $XTermId: mingw-byacc.spec,v 1.1 2013/09/25 23:12:06 tom Exp $
+Name: %{AppProgram}
+Version: %{AppVersion}
+Release: 1
+License: Public Domain, MIT
+Group: Applications/Development
+URL: ftp://invisible-island.net/%{AppProgram}
+Source0: %{AppProgram}-%{AppVersion}.tgz
+Packager: Thomas Dickey <dic...@invisible-island.net>
+
+%description
+This package provides a parser generator utility that reads a grammar
+specification from a file and generates an LR(1) parser for it. The
+parsers consist of a set of LALR(1) parsing tables and a driver
+routine written in the C programming language. It has a public domain
+license which includes the generated C.
+
+%prep
+
+%setup -q -n %{AppProgram}-%{AppVersion}
+
+%build
+
+INSTALL_PROGRAM='${INSTALL}' \
+ ./configure \
+ --program-prefix=b \
+ --target %{_target_platform} \
+ --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --mandir=%{_mandir}
+
+make
+
+%install
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT
+( cd $RPM_BUILD_ROOT%{_bindir} && ln -s %{AppProgram} %{UseProgram} )
+
+strip $RPM_BUILD_ROOT%{_bindir}/%{AppProgram}
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{_prefix}/bin/%{AppProgram}
+%{_prefix}/bin/%{UseProgram}
+%{_mandir}/man1/%{AppProgram}.*
+
+%changelog
+# each patch should add its ChangeLog entries here
+
+* Wed Sep 25 2013 Thomas Dickey
+- cloned from byacc.spec
Modified: head/contrib/byacc/reader.c
==============================================================================
--- head/contrib/byacc/reader.c Tue Oct 29 08:10:34 2013 (r257314)
+++ head/contrib/byacc/reader.c Tue Oct 29 08:21:22 2013 (r257315)
@@ -1,4 +1,4 @@
-/* $Id: reader.c,v 1.36 2012/05/26 16:05:41 tom Exp $ */
+/* $Id: reader.c,v 1.37 2013/09/25 23:46:18 tom Exp $ */
#include "defs.h"
@@ -701,7 +701,7 @@ copy_param(int k)
goto out;
buf[i--] = '\0';
- while (i >= 0 && isspace(UCH(buf[i])))
+ while (i > 0 && isspace(UCH(buf[i])))
buf[i--] = '\0';
if (buf[i] == ']')
@@ -724,8 +724,8 @@ copy_param(int k)
type2 = i + 1;
}
- while (i >= 0 && (isalnum(UCH(buf[i])) ||
- UCH(buf[i]) == '_'))
+ while (i > 0 && (isalnum(UCH(buf[i])) ||
+ UCH(buf[i]) == '_'))
i--;
if (!isspace(UCH(buf[i])) && buf[i] != '*')
Modified: head/contrib/byacc/skeleton.c
==============================================================================
--- head/contrib/byacc/skeleton.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/skeleton.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -1,4 +1,4 @@
-/* $Id: skeleton.c,v 1.32 2013/03/04 23:19:39 tom Exp $ */
+/* $Id: skeleton.c,v 1.33 2013/09/25 22:44:22 tom Exp $ */
#include "defs.h"
@@ -90,12 +90,12 @@ const char *const hdr_defs[] =
"#ifdef YYMAXDEPTH",
"#define YYSTACKSIZE YYMAXDEPTH",
"#else",
- "#define YYSTACKSIZE 500",
- "#define YYMAXDEPTH 500",
+ "#define YYSTACKSIZE 10000",
+ "#define YYMAXDEPTH 10000",
"#endif",
"#endif",
"",
- "#define YYINITSTACKSIZE 500",
+ "#define YYINITSTACKSIZE 200",
"",
"typedef struct {",
" unsigned stacksize;",
Modified: head/contrib/byacc/test/calc.tab.c
==============================================================================
--- head/contrib/byacc/test/calc.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/calc.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -284,12 +284,12 @@ YYSTYPE yylval;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/calc1.tab.c
==============================================================================
--- head/contrib/byacc/test/calc1.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/calc1.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -334,12 +334,12 @@ YYSTYPE yylval;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/calc2.tab.c
==============================================================================
--- head/contrib/byacc/test/calc2.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/calc2.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -286,12 +286,12 @@ YYSTYPE yylval;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/calc3.tab.c
==============================================================================
--- head/contrib/byacc/test/calc3.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/calc3.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -286,12 +286,12 @@ int yynerrs;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/code_calc.code.c
==============================================================================
--- head/contrib/byacc/test/code_calc.code.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/code_calc.code.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -187,12 +187,12 @@ YYSTYPE yylval;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/code_error.code.c
==============================================================================
--- head/contrib/byacc/test/code_error.code.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/code_error.code.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -179,12 +179,12 @@ YYSTYPE yylval;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/error.tab.c
==============================================================================
--- head/contrib/byacc/test/error.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/error.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -193,12 +193,12 @@ YYSTYPE yylval;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/ftp.tab.c
==============================================================================
--- head/contrib/byacc/test/ftp.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/ftp.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -559,12 +559,12 @@ YYSTYPE yylval;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/grammar.tab.c
==============================================================================
--- head/contrib/byacc/test/grammar.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/grammar.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -893,12 +893,12 @@ YYSTYPE yylval;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/pure_calc.tab.c
==============================================================================
--- head/contrib/byacc/test/pure_calc.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/pure_calc.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -289,12 +289,12 @@ int yynerrs;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/pure_error.tab.c
==============================================================================
--- head/contrib/byacc/test/pure_error.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/pure_error.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -200,12 +200,12 @@ int yynerrs;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/quote_calc-s.tab.c
==============================================================================
--- head/contrib/byacc/test/quote_calc-s.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/quote_calc-s.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -299,12 +299,12 @@ YYSTYPE yylval;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/quote_calc.tab.c
==============================================================================
--- head/contrib/byacc/test/quote_calc.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/quote_calc.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -305,12 +305,12 @@ YYSTYPE yylval;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/quote_calc2-s.tab.c
==============================================================================
--- head/contrib/byacc/test/quote_calc2-s.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/quote_calc2-s.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -299,12 +299,12 @@ YYSTYPE yylval;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/quote_calc2.tab.c
==============================================================================
--- head/contrib/byacc/test/quote_calc2.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/quote_calc2.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -305,12 +305,12 @@ YYSTYPE yylval;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/quote_calc3-s.tab.c
==============================================================================
--- head/contrib/byacc/test/quote_calc3-s.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/quote_calc3-s.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -300,12 +300,12 @@ YYSTYPE yylval;
#ifdef YYMAXDEPTH
#define YYSTACKSIZE YYMAXDEPTH
#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH 10000
#endif
#endif
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
typedef struct {
unsigned stacksize;
Modified: head/contrib/byacc/test/quote_calc3.tab.c
==============================================================================
--- head/contrib/byacc/test/quote_calc3.tab.c Tue Oct 29 08:10:34 2013
(r257314)
+++ head/contrib/byacc/test/quote_calc3.tab.c Tue Oct 29 08:21:22 2013
(r257315)
@@ -300,12 +300,12 @@ YYSTYPE yylval;
#ifdef YYMAXDEPTH
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
