====================================================================== GNU bison-1.25 for HUMAN68K X6_04 ====================================================================== Free Software FoundationのGNU bison-1.25をHUMAN68Kに移植しました。 o 保証 正しく動作するよう意識して移植していますが動作保証はいたしません。 o 著作権 全ての変更箇所についての著作権は放棄します。 o 再配布 GPLにしたがいます。 o 問い合わせ GNU bison-1.25 for HUMAN68Kについての問い合わせはWILLs宛てにお願い します。 決してFree Software Foundationに問い合わせるような事はしな いで下さい。 ういるす / WILLs / 岡部　勝幸 hgc02147@niftyserve.or.jp RMN00081@うさぎ倶楽部 WILLS@めんたいネット SUME0008@すめネット WILLs@Network-SCoT WILLs@YASTY-Serve ---------------------------------------------------------------------- diff -u2rN bison-1.25/ChangeLog.X68 bison-1.25x04/ChangeLog.X68 --- bison-1.25/ChangeLog.X68 Thu Jan 01 09:00:00 1970 +++ bison-1.25x04/ChangeLog.X68 Sat Jun 15 00:26:40 1996 @@ -0,0 +1,19 @@ +Tue Jun 11 00:23:52 1996 Katsuyuki Okabe (WILLs at X68K) + + * version X6_04 + * base version を 1.25 へ + * files.c (openfiles): spec_file_prefix が NULL でないとき(-b スイッ + チが指定されていたとき)の処理が不適切だったのを直した. + +Tue Jun 27 13:53:25 1995 Katsuyuki Okabe (WILLs at X68K) + + * version X6_03 + * files.c (openfiles, open_extra_files): 環境変数INITが設定してあ + るときbison.simple,bison.hairyをそのディレクトリから探すようにした + +Mon Jun 19 13:45:41 1995 Katsuyuki Okabe (WILLs at x68k) + + * version X6_02 + * files.c (openfiles): bison.simpleのオープンで環境変数INITを参照 + するのを忘れていたのを直した + diff -u2rN bison-1.25/Makefile.in bison-1.25x04/Makefile.in --- bison-1.25/Makefile.in Sun May 12 04:17:40 1996 +++ bison-1.25x04/Makefile.in Sat Jun 15 00:21:28 1996 @@ -36,5 +36,5 @@ DEFS = @DEFS@ -CFLAGS = -g +CFLAGS = @CFLAGS@ LDFLAGS = @@ -47,16 +47,17 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ +exec_suffix = @exec_suffix@ # where the installed binary goes -bindir = $(exec_prefix)/bin +bindir = @bindir@ # where the parsers go -datadir = $(prefix)/share +datadir = @datadir@ # where the info files go -infodir = $(prefix)/info +infodir = @infodir@ # where manual pages go and what their extensions should be -mandir = $(prefix)/man/man$(manext) +mandir = @mandir@/man$(manext) manext = 1 @@ -95,5 +96,5 @@ getopt.o getopt1.o $(ALLOCA) -all: bison bison.info bison.s1 +all: bison$(exec_suffix) bison.info bison.s1 Makefile: Makefile.in config.status @@ -112,5 +113,5 @@ clean: - rm -f *.o core bison bison.s1 + rm -f *.o core bison$(exec_suffix) bison.s1 mostlyclean: clean @@ -124,5 +125,5 @@ # Most of these deps are in case using RCS. install: all bison.1 $(srcdir)/$(PFILE) $(srcdir)/$(PFILE1) installdirs uninstall - $(INSTALL_PROGRAM) bison $(bindir)/bison + $(INSTALL_PROGRAM) bison$(exec_suffix) $(bindir)/bison$(exec_suffix) $(INSTALL_DATA) bison.s1 $(datadir)/$(PFILE) $(INSTALL_DATA) $(srcdir)/$(PFILE1) $(datadir)/$(PFILE1) @@ -137,5 +138,5 @@ uninstall: - rm -f $(bindir)/bison + rm -f $(bindir)/bison$(exec_suffix) -cd $(datadir); rm -f $(PFILE) $(PFILE1) rm -f $(mandir)/bison.$(manext) $(infodir)/bison.info* @@ -144,5 +145,5 @@ @echo "No checks implemented (yet)." -bison: $(OBJECTS) +bison$(exec_suffix): $(OBJECTS) $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJECTS) $(LIBS) @@ -187,4 +188,7 @@ symtab.o: system.h new.h symtab.h gram.h warshall.o: system.h machine.h + +options.o: options.s + $(CC) -c $(srcdir)/options.s # Prevent GNU make v3 from overflowing arg limit on SysV. diff -u2rN bison-1.25/configure bison-1.25x04/configure --- bison-1.25/configure Fri Dec 29 05:08:14 1995 +++ bison-1.25x04/configure Sat Jun 15 00:23:24 1996 @@ -2,6 +2,6 @@ # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.7 -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. +# Generated automatically using autoconf version 2.10 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -331,5 +331,5 @@ -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.7" + echo "configure generated by autoconf version 2.10" exit 0 ;; @@ -405,5 +405,5 @@ # 5 compiler messages saved in config.log if test "$silent" = yes; then - exec 6>/dev/null + exec 6>nul else exec 6>&1 @@ -496,14 +496,11 @@ ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='echo $CPP $CPPFLAGS 1>&5; -$CPP $CPPFLAGS' -ac_compile='echo ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5; -${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='echo ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5; -${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-gcc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='( ${CC-gcc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>conftest.msg 2>&1; ac_state=$?; cat conftest.msg 1>&5; exit $ac_state )' -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then +if (echo "testing\c"; echo 1,2,3) | grep c >nul; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >nul; then ac_n= ac_c=' ' ac_t=' ' @@ -515,4 +512,5 @@ fi +: ${LIBS=-lsignal} @@ -526,8 +524,8 @@ ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS};" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then + if test -f $ac_dir/$ac_word -o -f $ac_dir/${ac_word}.x; then ac_cv_prog_CC="gcc" break @@ -535,5 +533,4 @@ done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc" fi fi @@ -545,4 +542,53 @@ fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS};" + ac_prog_rejected=no + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word -o -f $ac_dir/${ac_word}.x; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 @@ -555,5 +601,5 @@ #endif EOF -if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-gcc} -E conftest.c'; { (eval echo configure:604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >nul 2>&1; then ac_cv_prog_gcc=yes else @@ -566,10 +612,10 @@ GCC=yes if test "${CFLAGS+set}" != set; then - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 + echo $ac_n "checking whether ${CC-gcc} accepts -g""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then +if test -z "`${CC-gcc} -g -c conftest.c 2>&1`"; then ac_cv_prog_gcc_g=yes else @@ -626,5 +672,5 @@ echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS};" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. @@ -636,5 +682,5 @@ if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + grep dspmsg $ac_dir/$ac_prog >nul 2>&1; then # AIX install. It has an incompatible calling convention. # OSF/1 installbsd also uses dspmsg, but is usable. @@ -644,4 +690,7 @@ break 2 fi + elif test -f $ac_dir/${ac_prog}.x; then + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 fi done @@ -681,15 +730,16 @@ else # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" + # substituted into the Makefile and "${CC-gcc}" will confuse make. + CPP="${CC-gcc} -E" # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >nul 2>conftest.out" +{ (eval echo configure:744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then @@ -698,12 +748,13 @@ echo "$ac_err" >&5 rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" + CPP="${CC-gcc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >nul 2>conftest.out" +{ (eval echo configure:759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then @@ -731,9 +782,10 @@ else cat > conftest.$ac_ext < EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >nul 2>conftest.out" +{ (eval echo configure:790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then @@ -772,5 +824,5 @@ echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 if test -d /etc/conf/kconfig.d && - grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 + grep _POSIX_VERSION /usr/include/sys/unistd.h >nul 2>&1 then echo "$ac_t""yes" 1>&6 @@ -800,10 +852,10 @@ else cat > conftest.$ac_ext </dev/null; then +{ (eval echo configure:859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +if test -x conftest && (./conftest; exit) 2>nul; then ac_cv_c_cross=no else @@ -822,5 +874,5 @@ else cat > conftest.$ac_ext < @@ -829,5 +881,6 @@ #include EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >nul 2>conftest.out" +{ (eval echo configure:885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then @@ -844,10 +897,10 @@ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then + egrep "memchr" >nul 2>&1; then : else @@ -862,10 +915,10 @@ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then + egrep "free" >nul 2>&1; then : else @@ -883,5 +936,5 @@ else cat > conftest.$ac_ext < @@ -894,6 +947,6 @@ EOF -eval $ac_link -if test -s conftest && (./conftest; exit) 2>/dev/null; then +{ (eval echo configure:950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +if test -x conftest && (./conftest; exit) 2>nul; then : else @@ -921,9 +974,10 @@ else cat > conftest.$ac_ext < EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >nul 2>conftest.out" +{ (eval echo configure:982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then @@ -955,5 +1009,5 @@ else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes @@ -1032,5 +1086,5 @@ else cat > conftest.$ac_ext < @@ -1040,5 +1094,5 @@ ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:1097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1; then rm -rf conftest* ac_cv_header_alloca_h=yes @@ -1064,5 +1118,5 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1; then rm -rf conftest* ac_cv_func_alloca=yes @@ -1123,5 +1177,5 @@ else cat > conftest.$ac_ext <&5 | - egrep "webecray" >/dev/null 2>&1; then + egrep "webecray" >nul 2>&1; then rm -rf conftest* ac_cv_os_cray=yes @@ -1152,5 +1206,5 @@ else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char $ac_func(); @@ -1174,5 +1230,5 @@ ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:1233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" @@ -1206,5 +1262,5 @@ else cat > conftest.$ac_ext </dev/null; then +{ (eval echo configure:1284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +if test -x conftest && (./conftest; exit) 2>nul; then ac_cv_c_stack_direction=1 else @@ -1249,5 +1305,5 @@ else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char $ac_func(); @@ -1271,5 +1329,5 @@ ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:1332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" @@ -1294,4 +1352,103 @@ +case "$KSH_VERSION" in +*X6*) + exec_suffix=.x + echo $ac_n "checking for -lhdi""... $ac_c" 1>&6 +ac_lib_var=`echo hdi'_'strtoll | tr './+\055' '__p_'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lhdi $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo hdi | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi + + echo $ac_n "checking for -lhmem""... $ac_c" 1>&6 +ac_lib_var=`echo hmem'_'hmemset | tr './+\055' '__p_'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lhmem $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo hmem | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi + + LIBS="options.o $LIBS" + ;; +*) + exec_suffix= + ;; +esac + + trap '' 1 2 15 cat > confcache <<\EOF @@ -1306,5 +1463,5 @@ # what configure does when it calls configure scripts in # subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. +# Giving --cache-file=nul disables caching, for debugging configure. # config.status only pays attention to the cache file if you give it the # --recheck option to rerun configure. @@ -1347,5 +1504,5 @@ # Protect against Makefile macro expansion. cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g s%\[%\\&%g @@ -1367,5 +1524,5 @@ # Run this file to recreate the current configuration. # This directory was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# on host `(hostname || uname -n) 2>nul | sed 1q`: # # $0 $ac_configure_args @@ -1382,5 +1539,5 @@ exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.7" + echo "$CONFIG_STATUS generated by autoconf version 2.10" exit 0 ;; -help | --help | --hel | --he | --h) @@ -1428,4 +1585,5 @@ s%@CPP@%$CPP%g s%@ALLOCA@%$ALLOCA%g +s%@exec_suffix@%$exec_suffix%g CEOF @@ -1463,4 +1621,5 @@ else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + "A-Za-z:/*") srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" @@ -1495,4 +1654,8 @@ chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +ac_states=0 +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || ac_states=1 +exec 6>&- +exec 5>&- +exit $ac_states diff -u2rN bison-1.25/configure.in bison-1.25x04/configure.in --- bison-1.25/configure.in Fri Nov 11 06:40:54 1994 +++ bison-1.25x04/configure.in Sat Jun 15 00:19:54 1996 @@ -20,3 +20,17 @@ AC_CHECK_FUNCS(strerror) +dnl Check X680x0 +case "$KSH_VERSION" in +*X6*) + exec_suffix=.x + AC_CHECK_LIB(hdi, strtoll) + AC_CHECK_LIB(hmem, hmemset) + LIBS="options.o $LIBS" + ;; +*) + exec_suffix= + ;; +esac +AC_SUBST(exec_suffix) + AC_OUTPUT(Makefile) diff -u2rN bison-1.25/files.c bison-1.25x04/files.c --- bison-1.25/files.c Mon Oct 16 05:01:30 1995 +++ bison-1.25x04/files.c Mon Jun 10 15:19:36 1996 @@ -99,4 +99,16 @@ } +#ifdef __human68k__ +static char* +basename(path) +char *path; +{ + char *base; + + base = strrchr(path, '/'); + return base != NULL ? base + 1 : path; +} +#endif /* __human68k__ */ + /* JF this has been hacked to death. Nowaday it sets up the file names for @@ -105,4 +117,13 @@ openfiles() { +#ifdef __human68k__ +#if __GNUC__ == 1 + extern long TwentyOneOptions (); +#else + extern long TwentyOneOptions () __attribute((const)); +#endif + long options = TwentyOneOptions () != -1 ? TwentyOneOptions () : 0 ; +#define is_multipiriod() (options & 0x10000000L) +#endif /* __human68k__ */ char *name_base; register char *cp; @@ -125,4 +146,14 @@ #endif /* MSDOS */ +#ifdef __human68k__ + tmp_base = getenv ("TMPDIR"); + if (tmp_base == 0) + tmp_base = getenv ("temp"); + if (tmp_base == 0) + tmp_base = getenv ("TMP"); + if (tmp_base == 0) + tmp_base = ""; +#endif /* __human68k__ */ + tmp_len = strlen (tmp_base); @@ -160,5 +191,5 @@ #else strcat (name_base, ".tab"); -#endif +#endif /* not VMS */ #ifdef MSDOS strlwr (name_base); @@ -185,5 +216,10 @@ name_base = stringappend(name_base, short_base_length, "_tab"); #else +#ifdef __human68k__ + name_base = stringappend(name_base, short_base_length, + is_multipiriod() ? ".tab" : "_tab"); +#else name_base = stringappend(name_base, short_base_length, ".tab"); +#endif /* not __human68k__ */ #endif /* not MSDOS */ #endif @@ -196,16 +232,27 @@ { filename = getenv("BISON_SIMPLE"); -#ifdef MSDOS +#if defined(MSDOS) || defined(__human68k__) /* File doesn't exist in current directory; try in INIT directory. */ cp = getenv("INIT"); if (filename == 0 && cp != NULL) { +#ifdef __human68k__ + char *pfile; + + pfile = basename(PFILE); + filename = xmalloc(strlen(cp) + strlen(pfile) + 2); +#else filename = xmalloc(strlen(cp) + strlen(PFILE) + 2); +#endif /* not __human68k__ */ strcpy(filename, cp); cp = filename + strlen(filename); *cp++ = '/'; +#ifdef __human68k__ + strcpy(cp, pfile); +#else strcpy(cp, PFILE); +#endif /* not __human68k__ */ } -#endif /* MSDOS */ +#endif /* MSDOS || __human68k__ */ fparser = tryopen(filename ? filename : PFILE, "r"); } @@ -218,5 +265,10 @@ /* We used to use just .out if spec_name_prefix (-p) was used, but that conflicts with Posix. */ +#ifdef __human68k__ + outfile = stringappend(name_base, short_base_length, + is_multipiriod() ? ".output" : ".out"); +#else outfile = stringappend(name_base, short_base_length, ".output"); +#endif /* not __human68k__ */ #endif foutput = tryopen(outfile, "w"); @@ -230,5 +282,5 @@ } -#ifdef MSDOS +#if defined(MSDOS) || defined(__human68k__) if (! noparserflag) actfile = mktemp(stringappend(tmp_base, tmp_len, "acXXXXXX")); @@ -242,5 +294,5 @@ tmptabfile = mktemp(stringappend(tmp_base, tmp_len, "tab.XXXXXX")); tmpdefsfile = mktemp(stringappend(tmp_base, tmp_len, "defs.XXXXXX")); -#endif /* not MSDOS */ +#endif /* not (MSDOS || __human68k__) */ if (! noparserflag) @@ -256,4 +308,5 @@ #ifndef MSDOS +#ifndef __human68k__ if (! noparserflag) unlink(actfile); @@ -262,4 +315,5 @@ unlink(tmpdefsfile); #endif +#endif /* These are opened by `done' or `open_extra_files', if at all */ @@ -277,6 +331,13 @@ guardfile = stringappend(name_base, short_base_length, ".guc"); #else +#ifdef __human68k__ + attrsfile = stringappend(name_base, short_base_length, + is_multipiriod() ? ".stype.h" : ".sth"); + guardfile = stringappend(name_base, short_base_length, + is_multipiriod() ? ".guard.c" : ".guc"); +#else attrsfile = stringappend(name_base, short_base_length, ".stype.h"); guardfile = stringappend(name_base, short_base_length, ".guard.c"); +#endif /* not __human68k__ */ #endif /* not MSDOS */ #endif /* not VMS */ @@ -301,14 +362,25 @@ { filename = (char *) getenv ("BISON_HAIRY"); -#ifdef MSDOS +#if defined(MSDOS) || defined(__human68k__) /* File doesn't exist in current directory; try in INIT directory. */ cp = getenv("INIT"); if (filename == 0 && cp != NULL) { +#ifdef __human68k__ + char *pfile1; + + pfile1 = basename(PFILE1); + filename = xmalloc(strlen(cp) + strlen(pfile1) + 2); +#else filename = xmalloc(strlen(cp) + strlen(PFILE1) + 2); +#endif /* not __human68k__ */ strcpy(filename, cp); cp = filename + strlen(filename); *cp++ = '/'; +#ifdef __human68k__ + strcpy(cp, pfile1); +#else strcpy(cp, PFILE1); +#endif /* not __human68k__ */ } #endif @@ -404,10 +476,10 @@ sys$exit(SS$_ABORT); #else -#ifdef MSDOS +#if defined(MSDOS) || defined(__human68k__) if (actfile && ! noparserflag) unlink(actfile); if (tmpattrsfile) unlink(tmpattrsfile); if (tmptabfile) unlink(tmptabfile); if (tmpdefsfile) unlink(tmpdefsfile); -#endif /* MSDOS */ +#endif /* MSDOS || __human68k__ */ exit(k); #endif /* not VMS, or __VMS_POSIX */ diff -u2rN bison-1.25/main.c bison-1.25x04/main.c --- bison-1.25/main.c Mon Oct 16 01:44:08 1995 +++ bison-1.25x04/main.c Mon Jun 10 15:24:42 1996 @@ -46,4 +46,11 @@ { program_name = argv[0]; +#ifdef __human68k__ + { + char *p = strrchr(program_name, '.'); + if (p && !stricmp(p, ".x")) + *p = '\0'; + } +#endif /* __human68k__ */ failure = 0; lineno = 0; diff -u2rN bison-1.25/version.c bison-1.25x04/version.c --- bison-1.25/version.c Tue Aug 22 02:10:44 1995 +++ bison-1.25x04/version.c Mon Jun 10 14:57:46 1996 @@ -1 +1,5 @@ +#ifdef __human68k__ +char *version_string = "GNU Bison version 1.25 (X6_04)\n"; +#else char *version_string = "GNU Bison version 1.25\n"; +#endif