diff options
| author | obrien <obrien@FreeBSD.org> | 1999-09-19 05:59:11 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-09-19 05:59:11 +0000 |
| commit | c53c47e769827bb2d6d596865051a4af89d246fd (patch) | |
| tree | 354ca5598013982362bb6e08cf4b5d6b79b0c370 | |
| parent | 98e51635e2084da6cfe0d3b1782cb95b80fd2caa (diff) | |
| download | FreeBSD-src-c53c47e769827bb2d6d596865051a4af89d246fd.zip FreeBSD-src-c53c47e769827bb2d6d596865051a4af89d246fd.tar.gz | |
Virgin import of GCC 2.95.1's libf2c
64 files changed, 2706 insertions, 887 deletions
diff --git a/contrib/libf2c/ChangeLog b/contrib/libf2c/ChangeLog index bb6148c..2fb044d 100644 --- a/contrib/libf2c/ChangeLog +++ b/contrib/libf2c/ChangeLog @@ -1,28 +1,238 @@ -Sun Mar 14 02:38:07 PST 1999 Jeff Law (law@cygnus.com) +Mon Aug 16 01:29:24 PDT 1999 Jeff Law (law@cygnus.com) - * egcs-1.1.2 Released. + * gcc-2.95.1 Released. -1999-03-05 Craig Burley <craig@jcb-sc.com> +Fri Aug 6 23:32:29 1999 Daniel Jacobowitz <drow@drow.them.org> + + * Makefile.in (FLAGS_TO_PASS): Include prefix, exec_prefix, + libdir, libsubdir and tooldir. + +Wed Jul 28 21:39:31 PDT 1999 Jeff Law (law@cygnus.com) + + * gcc-2.95 Released. + + * libF77/Version.c: No longer a prerelease. + * libI77/Version.c: No longer a prerelease. + * libU77/Version.c: No longer a prerelease. + +Wed Jul 7 15:58:16 1999 Craig Burley <craig@jcb-sc.com> + + * libU77/date_.c (G77_date_y2kbug_0): G77_time_0 returns + longint, not integer, and G77_ctime_0 takes longint, not + integer, argument. * libU77/Version.c: Bump version. - * libU77/vxtidate_.c (G77_vxtidate_0): Truncate - year to last two digits (i.e. modulo 100), as per - documentation and Y2K (non-)compliance. +Mon Jun 28 10:22:30 1999 Craig Burley <craig@jcb-sc.com> + + * libI77/rsne.c: Fix NAMELIST bug by applying 19990627 + Netlib patch to release branch. + +Wed Jun 16 11:38:58 1999 Craig Burley <craig@jcb-sc.com> + + From Ian Watson <WATSON_IAN_A@Lilly.com> 1999-06-12: + * libI77/backspace.c: Reload file descriptor after + calling t_runc. + * libI77/Version.c: Bump libg2c version. + +Wed May 26 14:26:35 1999 Craig Burley <craig@jcb-sc.com> + + * libF77/Version.c, libI77/Version.c, libU77/Version.c: + Use 0.5.24 to designate the version of g77 within GCC 2.95. + +Thu May 20 03:20:59 1999 Jeffrey A Law (law@cygnus.com) + + * configure.in (AC_EXEEXT): Remove call. + (compiler_name): Explicitly check with no extension and .exe + extension. + * configure: Regenerate. + +Mon May 10 17:33:45 1999 Craig Burley <craig@jcb-sc.com> + + Update to Netlib version of 1999-05-10: + * changes.netlib, libF77/Version.c, libF77/abort_.c, + libF77/c_log.c, libF77/ef1asc_.c, libF77/s_rnge.c, + libF77/s_stop.c, libI77/Version.c, libI77/open.c, + readme.netlib: See changes.netlib for info. + +Fri May 7 9:33:55 1999 Donn Terry (donn@interix.com) + + * libU77/dtime_.c (G77_dtime_0): Standard-conforming error check. + * libU77/etime_.c (G77_etime_0): Likewise. + +Mon May 3 19:15:07 1999 Craig Burley <craig@jcb-sc.com> + + * libU77/u77-test.f (main): Declare ABORT as intrinsic. + +1999-05-03 Craig Burley <craig@jcb-sc.com> -1999-02-26 Craig Burley <craig@jcb-sc.com> + * libU77/u77-test.f: Reverse order of two arguments to + CTIME_subr, DTIME_subr, ETIME_subr, and TTYNAM_subr. + +Mon May 3 11:21:35 1999 Craig Burley <craig@jcb-sc.com> + + * libF77/c_log.c: Cope with partial overlap a la z_log.c. + (Change likely to be made to netlib version shortly.) + +Mon May 3 11:12:38 1999 Craig Burley <craig@jcb-sc.com> + + Update to Netlib version of 1999-05-03: + * changes.netlib, libF77/Version.c, libF77/c_cos.c, + libF77/c_exp.c, libF77/c_sin.c, libF77/d_cnjg.c, + libF77/dtime_.c, libF77/etime_.c, libF77/getenv_.c, + libF77/r_cnjg.c, libF77/z_cos.c, libF77/z_exp.c, + libF77/z_log.c, libF77/z_sin.c, libI77/Version.c, + libI77/err.c, libI77/open.c, libI77/rdfmt.c, readme.netlib: + See changes.netlib for info. + +Mon May 3 10:52:53 1999 Craig Burley <craig@jcb-sc.com> + + * libF77/c_cos.c, libF77/c_div.c, libF77/c_exp.c, libF77/c_log.c, + libF77/c_sin.c, libF77/c_sqrt.c, libF77/d_cnjg.c, libF77/pow_zi.c, + libF77/r_cnjg.c, libF77/z_cos.c, libF77/z_div.c, libF77/z_exp.c, + libF77/z_log.c, libF77/z_sin.c, libF77/z_sqrt.c: Revert back to + netlib versions as of f2c-19990501. + +Sun May 2 01:38:50 1999 Craig Burley <craig@jcb-sc.com> + + * libU77/u77-test.f (main): Declare FTELL as intrinsic. + +Sun May 2 01:13:37 1999 Craig Burley <craig@jcb-sc.com> + + * libU77/u77-test.f (main): List libU77 intrinsics + not currently tested. + Add tests for TIME8, CTIME_subr, IARGC, TTYNAM_subr, + GETENV, FDATE_subr, DTIME_subr, ETIME_subr, DATE, ITIME, + FTELL_subr, MCLOCK, MCLOCK8, and CPU_TIME. + Trim blanks off the ends of some printed strings. + +Sun May 2 00:06:45 1999 Craig Burley <craig@jcb-sc.com> + + * libU77/u77-test.f (main): Just warn about FSTAT gid + disagreement, as it's expected on some systems. + +Sat May 1 23:57:18 1999 Craig Burley <craig@jcb-sc.com> + + * libU77/u77-test.f: Generalize sum-checking to + use a new function, which allows for some slop. + Clean up some commentary. + (issum): The new function. + (sgladd): Deleted subroutine. + +Sat May 1 23:35:18 1999 Craig Burley <craig@jcb-sc.com> + + * libU77/u77-test.f: Modify to be more like testsuite + version, bringing patches to that version here. + Add suitable commentary. + +Sat Apr 24 11:02:48 1999 Craig Burley <craig@jcb-sc.com> + + * Makefile.in (s-libi77, s-libf77, s-libu77): Revert + the patch from <hjl@gnu.org>, as per the commentary. + +Sat Apr 17 17:33:30 1999 Craig Burley <craig@jcb-sc.com> + + From H.J. Lu <hjl@gnu.org>: + * Makefile.in (s-libi77): Depend on i77. + (s-libf77): Depend on i77. + (s-libu77): Depend on u77. + +Mon Apr 12 21:38:14 1999 Mumit Khan <khan@xraylith.wisc.edu> + + * libF77/getenv_.c: Include stdlib.h. +Sun Apr 11 23:30:42 1999 Mumit Khan <khan@xraylith.wisc.edu> + + * libU77/dtime_.c: Handle all variants of WIN32. + * libU77/etime_.c: Likewise. + + * libU77/aclocal.m4: New file. + * libU77/configure.in (LIBU77_HAVE_STRUCT_TIMEZONE): Add test. + * libU77/acconfig.h (HAVE_STRUCT_TIMEZONE): Add macro. + * libU77/datetime_c.c (G77_date_and_time_0): Use. + * libU77/config.hin: Regenerate. + * libU77/configure: Likewise. + +Wed Mar 31 13:50:24 1999 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * configure.in (extra_includes): Don't attempt to calculate the + location of the gcc src or obj directories. Instead rely on + precomputed variables, $topsrcdir and $r, to obtain these values. + Set -I flags appropriately. + +1999-03-28 Dave Love <fx@gnu.org> + + * configure: Rebuilt. + + * configure.in: Fix integer size tests: sanity check first; search + toplevel include dir (from Rainer Orth); only mess with ac_cpp + once; use -DIN_GCC -DHAVE_CONFIG_H. + + * configure.in: Use `g77_cv_...', not `f77_cv_...'. + +Wed Mar 24 22:41:28 1999 Mumit Khan <khan@xraylith.wisc.edu> + + * configure.in (AC_PREREQ): Update to 2.13. + (AC_EXEEXT): Call to find possible file extension. + (compiler_name): Use. + * configure: Regenerate. + +1999-03-17 Craig Burley <craig@jcb-sc.com> + + Update to Netlib version of 1999-03-17: + * libF77/F77_aloc.c, libF77/README.netlib, libF77/dtime_.c, + libF77/etime_.c, libF77/signal1.h0, libI77/Version.c, + libI77/dfe.c, libI77/endfile.c, libI77/lread.c, + libI77/sfe.c, readme.netlib, changes.netlib: + See changes.netlib for info. + +1999-03-06 Craig Burley <craig@jcb-sc.com> + + Mon Dec 21 23:03:54 1998 Hans-Peter Nilsson <hp@axis.se>: + * libI77/Makefile.in (all *.o except VersionI.o): Added dependence + on respective .c file. + * libF77/Makefile.in (all .o except VersionF.o): Similarly. + * libU77/Makefile.in (date_.o): Added dependence on date_.c + +1999-03-06 Craig Burley <craig@jcb-sc.com> + + Rename non-Y2K-compliant intrinsics: + * Makefile.in (F2CEXT): Now two versions each of + `date' and `vxtidt'. + * f2cext.c (date_, vxtidate_): Split into two versions, + the existing one calling a new "y2kbuggy" routine that + does not exist, and a new one named with "y2kbug" that + calls the newly renamed underlying routine. + * libU77/date_.c (G77_date_y2kbug_0): Rename from G77_date_0. + * libU77/vxtidate_.c (G77_vxtidate_y2kbug_0): Rename from + G77_vxtidate_0. * libU77/Version.c: Bump version. +1999-03-03 Craig Burley <craig@jcb-sc.com> + + * libU77/vxtidate_.c (G77_vxtidate_0): Truncate + year to last two digits (i.e. modulo 100), as per + documentation and (documented) Y2K non-compliance. + 1999-02-20 Craig Burley <craig@jcb-sc.com> From Krister Walfridsson <cato@df.lth.se>: * libU77/lstat_.c (G77_lstat_0): Kill spurious setting of element 6 to zero, as it undid the previous setting. +1999-02-15 Craig Burley <craig@jcb-sc.com> + + * f2c.h: Delete my (old) email address. + 1999-02-14 Craig Burley <craig@jcb-sc.com> - * libI77/Version.c: Bump ("update" below) to date of last change. + * libU77/Version.c: Bump ("update" below) to date of last change. + * libI77/Version.c: Bump to date of last change. + +Tue Feb 9 18:13:30 GMT 1999 Nathan Sidwell <nathan@acm.org> + + * Makefile.in (distclean): Move Makefile deletion to end of + commands. 1999-01-15 Dave Love <fx@gnu.org> @@ -30,13 +240,68 @@ Sun Mar 14 02:38:07 PST 1999 Jeff Law (law@cygnus.com) such, not as microseconds. (s_copy): Declare. -1998-10-21 Dave Love <fx@gnu.org> +1998-11-26 Manfred Hollstein <manfred@s-direktnet.de> + + * configure.in (compiler_name): Add check to detect if this + language's compiler has been built. + * configure: Regenerate. + +Mon Nov 23 16:52:22 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * configure.in: Use AC_PREREQ(2.12.1). + * libF77/configure.in: Likewise. + * libI77/configure.in: Likewise. + * libU77/configure.in: Likewise. + +1998-10-24 Dave Love <d.love@dl.ac.uk> + + * configure.in: Touch g2c.h in AC_OUTPUT after multilib + disturbance. + +1998-10-23 Dave Love <d.love@dl.ac.uk> + + * f2cext.c: Include math.h. + +1998-10-19 Dave Love <d.love@dl.ac.uk> + + * configure: Regenerate. + + * configure.in: Use AC_CONFIG_AUX_DIR. + +1998-10-12 Dave Love <fx@gnu.org> * libI77/open.c (_XOPEN_SOURCE): Define. -Fri Oct 2 01:27:50 1998 Kamil Iskra <iskra@student.uci.agh.edu.pl> +1998-10-12 Dave Love <fx@gnu.org> - * Makefile.in (install): Add missing "else true;". + * Makefile.in (.SUFFIXES): Don't use any. + (all-unilib): New target, like old all. + (all): Use it. + (.PHONY): Add all-unilib. + +1998-10-12 Dave Love <d.love@dl.ac.uk> + + * configure.in: Reorder Makefile, g2c.h in AC_OUTPUT. + +Tue Oct 6 21:16:58 1998 Jeffrey A Law (law@cygnus.com) + + * Makefile.in: Revert last patch. + +Mon Oct 5 01:16:10 1998 H.J. Lu (hjl@gnu.org) + + * Makefile.in (s-libi77): Depend on i77. + (s-libf77): Depend on i77. + (s-libu77): Depend on u77. + +1998-09-30 Dave Love <d.love@dl.ac.uk> + + * Makefile.in (f2cext.c): Depend on g2c.h. + +1998-09-30 Robert Lipe <robertl@dgii.com> + + * Makefile.in (all): Correct dependencies so --disable-multilibs + works again. + (distclean): Correct typo. 1998-09-28 Dave Love <d.love@dl.ac.uk> @@ -48,18 +313,56 @@ Fri Oct 2 01:27:50 1998 Kamil Iskra <iskra@student.uci.agh.edu.pl> * libI77/Version.c: Update. -Sat Sep 5 23:06:56 1998 Craig Burley <burley@gnu.org> +Mon Sep 21 12:27:27 1998 Robert Lipe <robertl@dgii.com> + + * Makefile.in (distclean, clean, uninstall, install, all): Add + multilib support. + * configure.in: Likewise. + * configure: Regenerate. + * libF77/Makefile.in, libU77/Makefile.in, libI77/Makefile.in (clean): + Explictly remove stamp in parent's directory. + +1998-09-20 Dave Love <d.love@dl.ac.uk> * libI77/sfe.c (e_wdfe): Set f__init to avoid spurious recursive i/o error from formatted direct i/o. +Thu Sep 10 14:57:25 1998 Kamil Iskra <iskra@student.uci.agh.edu.pl> + + * Makefile.in (install): Add missing "else true;". + +1998-09-09 Craig Burley <burley@gnu.org> + + * configure.in: Test $srcdir, not $subdir (probable typo). + Clarify commentary, fix a bit of spacing. + +1998-09-07 Dave Love <d.love@dl.ac.uk> + + * ChangeLog.egcs: Deleted. Entries merged here. + +1998-09-07 Dave Love <d.love@dl.ac.uk> + + * libI77/sfe.c, libI77/dfe.c: Revert last change. + +1998-09-06 Dave Love <d.love@dl.ac.uk> + + From Toon to fix spurious recursive i/o errors: + * libI77/sfe.c (e_wdfe): Set f__init. + + * libI77/dfe.c (c_dfe): Check and set f__init. + (s_rdfe, s_wdfe): Don't check and set f__init. + +Fri Sep 4 18:40:32 1998 Craig Burley <burley@gnu.org> + + * libU77/sys_clock_.c (G77_system_clock_0): Fix indentation. + Tue Sep 1 10:06:06 1998 Craig Burley <burley@gnu.org> * libF77/Version.c: Update. * libU77/Version.c: Update. * libI77/Version.c: Update. -Wed Aug 26 23:20:12 1998 Jeffrey A Law (law@cygnus.com) +Wed Aug 26 23:19:40 1998 Jeffrey A Law (law@cygnus.com) * Makefile.in (FLAGS_TO_PASS): Fix typo. @@ -69,8 +372,8 @@ Wed Aug 26 23:20:12 1998 Jeffrey A Law (law@cygnus.com) 1998-07-24 Dave Love <d.love@dl.ac.uk> - * Makefile.in (s-libe77, ${srcdir}/configure, g2c.h, Makefile, - config.status, rebuilt): Rely on VPATH, dropping explicit use of + * Makefile.in (s-libe77, ${srcdir}/configure, g2c.h, Makefile) + (config.status, rebuilt): Rely on VPATH, dropping explicit use of $(srcdir) in various places. 1998-07-19 Dave Love <d.love@dl.ac.uk> @@ -78,6 +381,31 @@ Wed Aug 26 23:20:12 1998 Jeffrey A Law (law@cygnus.com) * Makefile.in (all): Depend on s-libe77, not e77. (.PHONY): Remove e77. +Thu Jul 16 00:58:52 1998 Jeffrey A Law (law@cygnus.com) + + * libU77/Makefile.in: Missed one config.h.in -> config.hin change. + + * g2c.hin: Renamed from g2c.h.in. + * Makefile.in, configure.in: Changed as needed. + * configure: Rebuilt. + + * libU77/config.hin: Renamed from libU77/config.h.in. + * Makefile.in, configure.in: Changed as needed. + * configure: Rebuilt. + +Tue Jul 14 21:35:30 1998 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * Makefile.in (all): Invoke $(MAKE) instead of just make. + +Tue Jul 14 02:16:34 1998 Jeffrey A Law (law@cygnus.com) + + * Makefile.in: stamp-lib* -> s-lib*. + * libU77/Makefile.in: Likewise. + * libF77/Makefile.in: Likewise. + * libI77/Makefile.in: Likewise. + + * libU77/Makefile.in (ALL_CFLAGS): Add -I$(F2C_H_DIR). + Mon Jul 13 13:31:03 1998 Craig Burley <burley@gnu.org> * libU77/u77-test.f: Double-check ETIME results, just @@ -95,8 +423,8 @@ Mon Jul 13 13:31:03 1998 Craig Burley <burley@gnu.org> * configure.in: Move much of testing to new configures in subdirs. Tidy up handling of RANLIB etc. - * stamp-h.in, libF77/configure.in, libI77/configure.in, - libF77/configure, libI77/configure: New files. + * stamp-h.in, libF77/configure.in, libI77/configure.in: + * libF77/configure, libI77/configure: New files. * libF77/Makefile.in, libI77/Makefile.in, libU77/Makefile.in: Change in step with libf2c/Makefile.in. @@ -111,6 +439,11 @@ Mon Jul 13 13:31:03 1998 Craig Burley <burley@gnu.org> * libU77/sys_clock_.c: Replace TIMES conditional stuff removed in error by last change. +1998-07-06 Mike Stump <mrs@wrs.com> + + * Makefile.in (clean): Don't remove Makefiles, that is done in + distclean. + 1998-07-06 Dave Love <d.love@dl.ac.uk> * libU77/Makefile.in (lib): Change variable lib to LIBS. @@ -149,12 +482,41 @@ Mon Jul 13 13:31:03 1998 Craig Burley <burley@gnu.org> previous change. * libI77/rsfe.c (s_rsfe): Likewise. +Sat Jun 27 23:04:49 1998 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (FLAGS_TO_PASS, case G2C_H_DIR): Use $(TARGET_SUBDIR) + instead of hardcoding "libraries". + +1998-06-26 Manfred Hollstein <manfred@s-direktnet.de> + + * Makefile.in (gcc_version_trigger): Add new macro. + (config.status): Add dependency upon $(gcc_version_trigger). + + * configure.in (gcc_version_trigger): New variable; initialize + using value from toplevel configure; add AC_SUBST for it. + (gcc_version): Change initialization to use this new variable. + * configure: Regenerate. + +1998-06-24 Manfred Hollstein <manfred@s-direktnet.de> + + * Makefile.in (version): Rename to gcc_version. + * configure.in (version): Likewise. + (gcc_version): Add code to use an option passed from parent configure. + * configure: Regenerate. + 1998-06-23 Dave Love <d.love@dl.ac.uk> - * libI77/backspace.c, libI77/dfe.c, libI77/due.c, libI77/iio.c, - libI77/lread.c, libI77/ sfe.c, libI77/sue.c, libI77/wsfe.c: Update + * libI77/backspace.c, libI77/dfe.c, libI77/due.c, libI77/iio.c: + * libI77/lread.c, libI77/sfe.c, libI77/sue.c, libI77/wsfe.c: Update to Netlib version of 1998-06-18. +1998-06-21 Dave Love <d.love@dl.ac.uk> + + * configure.in (version, target_alias): Define. + + * Makefile.in (version, target_alias, libsubdir): Define. + (install): Remove check for libsubdir. + Sat Jun 13 03:46:40 1998 Craig Burley <burley@gnu.org> * Makefile.in (install): Don't install if $(libsubdir) @@ -163,8 +525,8 @@ Sat Jun 13 03:46:40 1998 Craig Burley <burley@gnu.org> * Makefile.in (g2c.h): Rename from f2c.h. - * Makefile.in, libF77/Makefile.in, libI77/Makefile.in, - libU77/Makefile.in: Rewrite config and var assignment + * Makefile.in, libF77/Makefile.in, libI77/Makefile.in: + * libU77/Makefile.in: Rewrite config and var assignment sections to be even more minimal than before, and to more clearly documented what macros are expected to be set and to what sorts of values. Eliminate CROSS and @@ -208,6 +570,16 @@ Sat Jun 13 03:46:40 1998 Craig Burley <burley@gnu.org> dependencies on f2c.h and g2c.h. (*clean): Remove. +Mon Apr 27 22:52:31 1998 Richard Henderson <rth@cygnus.com> + + * libU77/ltime_.c: Bounce the ftnint argument through a local time_t. + * libU77/gmtime_.c: Likewise. + +Sun Apr 26 18:07:56 1998 Richard Henderson <rth@cygnus.com> + + * configure.in: Adjust include paths in F2C_INTEGER and F2C_LONGINT + tests to work out of the build directory. + 1998-05-20 Dave Love <d.love@dl.ac.uk> * Makefile.in ($(lib)): Use shell loop instead of unportable @@ -274,6 +646,83 @@ Sat Feb 28 15:32:15 1998 Craig Burley <burley@gnu.org> * libI77/open.c (f_open): Use sizeof(buf) instead of 256, for the usual reasons. +1998-02-17 Dave Love <d.love@dl.ac.uk> + + * libU77/u77-test.f: Tweak some o/p. + + * libU77/Makefile.in (check): Use -L for new directory structure. + + * Makefile.in (check): Run the u77 check. + (config.status, Makefile): New targets. + +Wed Feb 11 01:46:20 1998 Manfred Hollstein <manfred@s-direktnet.de> + + * Makefile.in ($(lib)): Call $(AR) repeatedly to avoid overflowing + argument size limit on ancious System V. + +Sun Feb 8 00:32:17 1998 Manfred Hollstein <manfred@s-direktnet.de> + + * Makefile.in: Add `info install-info clean-info check dvi' targets. + +Mon Feb 2 11:08:49 1998 Richard Henderson <rth@cygnus.com> + + * configure.in: Update F2C_INTEGER and F2C_LONGINT tests + for the new placement in the hierarchy. + +Sun Feb 1 02:36:33 1998 Richard Henderson <rth@cygnus.com> + + * Previous contents of gcc/f/runtime moved into toplevel + "libf2c" directory. + +Sun Feb 1 01:42:47 1998 Mumit Khan <khan@xraylith.wisc.edu> + + * libU77/configure.in (getlogin,getgid,getuid, kill,link,ttyname): + Check. + * libU77/config.h.in (HAVE_GETLOGIN, HAVE_GETGID, HAVE_GETUID, + HAVE_KILL, HAVE_LINK, HAVE_TTYNAME): New defs. + * libU77/getlog_.c: Conditionalize for target platform. Set errno + to ENOSYS if target libc doesn't have the function. + * libU77/getgid_.c: Likewise. + * libU77/getuid_.c: Likewise. + * libU77/kill_.c: Likewise. + * libU77/link_.c: Likewise. + * libU77/ttynam_.c: Likewise. + +Sun Jan 18 20:01:37 1998 Toon Moene <toon@moene.indiv.nluug.nl> + + * libI77/backspace.c: (f_back): Use type `uiolen' to determine size + of record length specifier. + +Sat Jan 17 22:40:31 1998 Mumit Khan <khan@xraylith.wisc.edu> + + * libU77/configure.in (sys/param.h,sys/times.h): Check. + (times,alarm): Likewise. + * libU77/config.h.in (HAVE_SYS_PARAM_H, HAVE_SYS_TIMES_H) + (HAVE_ALARM, HAVE_TIMES): New defs. + * libU77/alarm_.c: Conditionalize for target platform. Set errno + to ENOSYS if target libc doesn't have the function. + * libU77/dtime_.c: Likewise. + * libU77/etime_.c: Likewise. + * libU77/sys_clock_.c: Likewise. + + * configure.in (NON_UNIX_STDIO): Define if MINGW32. + (NON_ANSI_RW_MODE): Do not define for CYGWIN32 or MINGW32. + + * libI77/rawio.h: Don't providing conflicting declarations for + read() and write(). MINGW32 header files use "const" quals. + + * libF77/s_paus.c: _WIN32 does not have pause(). + +Mon Apr 27 22:52:31 1998 Richard Henderson <rth@cygnus.com> + + * libU77/ltime_.c: Bounce the ftnint argument through a local time_t. + * libU77/gmtime_.c: Likewise. + +Sun Apr 26 18:07:56 1998 Richard Henderson <rth@cygnus.com> + + * configure.in: Adjust include paths in F2C_INTEGER and F2C_LONGINT + tests to work out of the build directory. + Tue Dec 23 22:56:01 1997 Craig Burley <burley@gnu.org> * libF77/signal_.c (G77_signal_0): Return type is @@ -281,6 +730,16 @@ Tue Dec 23 22:56:01 1997 Craig Burley <burley@gnu.org> handler on 64-bit systems like Alphas. * f2cext.c (signal_): Changed accordingly. +Tue Nov 18 09:49:04 1997 Mumit Khan (khan@xraylith.wisc.edu) + + * libI77/close.c (f_exit): Reset f__init so that f_clos does not + (incorrectly) think there is an I/O recursion when program is + interrupted. + +Sat Nov 1 18:03:42 1997 Jeffrey A Law (law@cygnus.com) + + * libF77/signal_.c: Undo last change until we can fix it right. + Wed Oct 29 01:01:04 1997 Mumit Khan <khan@brahma.xraylith.wisc.edu> * configure.in: Set CC to CC_FOR_TARGET when cross-compiling. @@ -293,15 +752,36 @@ Fri Oct 24 11:15:22 1997 Mumit Khan <khan@brahma.xraylith.wisc.edu> Wed Oct 15 10:06:29 1997 Richard Henderson <rth@cygnus.com> + * libF77/signal_.c (G77_signal_0): Make return type sig_pf as well. * libI77/fio.h: Include <string.h> if STDC_HEADERS. * libU77/chmod_.c: Likewise. +Tue Oct 7 18:22:10 1997 Richard Henderson <rth@cygnus.com> + + * Makefile.in (CGFLAGS): Don't force -g0. + * libF77/Makefile.in, libI77/Makefile.in, libU77/Makefile.in: Likewise. + +Mon Oct 6 14:16:46 1997 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (distclean): Do a better job at cleaning up. + 1997-10-03 Dave Love <d.love@dl.ac.uk> * configure.in: Check for tempnam (best because it obeys TMPDIR). * libI77/open.c: Use it. * libI77/err.c: New message # 132. +Wed Oct 1 01:46:16 1997 Philippe De Muyter <phdm@info.ucl.ac.be> + + * libU77/sys_clock_.c: File renamed from system_clock_.c. + * libU77/Makefile.in, Makefile.in : Reference sys_clock_.*, not + system_clock_.*. + * libU77/dtime_.c (clk_tck): Try also HZ macro. + * libU77/access.c (G77_access_0): Check malloc return value against 0, + not NULL. + * libU77/getlog_.c, libU77/ttynam_.c, libU77/chdir_.c: Ditto. + * libU77/chmod_.c, libU77/rename_.c: Ditto. + Tue Sep 30 00:41:39 1997 Craig Burley <burley@gnu.ai.mit.edu> Do a better job of printing the offending FORMAT string @@ -332,6 +812,13 @@ Mon Sep 29 16:30:31 1997 Craig Burley <burley@gnu.ai.mit.edu> * libU77/dtime_.c (G77_dtime_0): Fix types in HAVE_GETRUSAGE case so as not to truncate results to integer values. + * libU77/Version.c: Bump. + +Thu Sep 18 16:58:46 1997 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (stamp-lib): Don't use '$?', explicitly + list the variables containing the object files to include + in libf2c.a Tue Sep 9 00:33:24 1997 Craig Burley <burley@gnu.ai.mit.edu> @@ -343,6 +830,15 @@ Mon Sep 8 19:39:01 1997 Craig Burley <burley@gnu.ai.mit.edu> of whether initialization done, so exiting now closes open units again. +Fri Sep 5 00:18:17 1997 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (clean): Don't remove config.cache. + (distclean): Do it here instead. + +Tue Aug 26 20:14:08 1997 Robert Lipe (robertl@dgii.com) + + * hostnm_.c: Include errno.h + Tue Aug 26 01:42:21 1997 Craig Burley <burley@gnu.ai.mit.edu> From Jim Wilson: @@ -359,6 +855,14 @@ Tue Aug 26 01:25:58 1997 Craig Burley <burley@gnu.ai.mit.edu> once into libf2c.a, to get the job done a bit faster. Still remove the objects (and libE77 directory) afterward. +Mon Aug 25 23:26:05 1997 H.J. Lu (hjl@gnu.ai.mit.edu) + + * Makefile.in (mostlyclean, clean): Check if Makefile exists + before using it. Remove stamp-*. + (stamp-libi77, stamp-libf77, stamp-libu77): New. + (stamp-lib): Only depend on stamp-libi77 stamp-libf77 + stamp-libu77 + Sun Aug 24 05:04:35 1997 Craig Burley <burley@gnu.ai.mit.edu> * libU77/rand_.c (G77_rand_0), libU77/dtime_.c (G77_dtime_0), @@ -793,7 +1297,7 @@ Wed Nov 6 14:17:27 1996 Craig Burley <burley@gnu.ai.mit.edu> * libF77/Version.c, libI77/Version.c: Restore macro definition of version information. - * libI77/Makefile.in (OBJ): Add ftell_.o to list of objects. + * libI77/Makefile.in (OBJ) [foo]: Add ftell_.o to list of objects. * libI77/uio.c (do_ud): Fix up casts in PAD_UDread case just like they were fixed in the other case. @@ -807,7 +1311,7 @@ Thu Oct 31 22:27:45 1996 Craig Burley <burley@gnu.ai.mit.edu> 1996-10-19 Dave Love <d.love@dl.ac.uk> * configure.in: Add check that we have the tools to cross-compile - if appropriate. + if appropriate. (NO_EOF_CHAR_CHECK,Skip_f2c_Undefs): Define. * libF77/Makefile.in (F90BIT): New routines from Netlib. @@ -846,8 +1350,8 @@ Tue Aug 20 09:21:43 1996 Dave Love <d.love@dl.ac.uk> Sat Aug 17 13:00:47 1996 Dave Love <d.love@dl.ac.uk> - * (libF77/qbitshft.c, libF77/qbitbits.c, libF77/lbitshft.c, - libF77/lbitbits.c): New file from Netlib. qbit... not currently + * libF77/qbitshft.c, libF77/qbitbits.c, libF77/lbitshft.c, + libF77/lbitbits.c: New file from Netlib. qbit... not currently compiled. Sun Jul 7 18:06:33 1996 Dave Love <d.love@dl.ac.uk> @@ -908,7 +1412,8 @@ Tue Mar 19 13:10:02 1996 Craig Burley <burley@gnu.ai.mit.edu> * Makefile.in (rebuilt): New target. - * lib[FI]77/Makefile.in: Use $AR_FOR_TARGET, not $AR. + * libF77/Makefile.in, libI77/Makefile.in: Use $AR_FOR_TARGET, not + $AR. Tue Mar 19 12:53:19 1996 Dave Love <d.love@dl.ac.uk> @@ -931,10 +1436,10 @@ Fri Dec 29 18:22:01 1995 Craig Burley <burley@gnu.ai.mit.edu> * Makefile.in: Reorganize the *clean rules to more closely parallel gcc's. - * lib[FI]77/Makefile.in: Ignore error from $(AR) command, - in case just doing an install and installer has no write - access to library (this is a kludge fix -- perhaps install - targets should never try updating anything?). + * libF77/Makefile.in, libI77/Makefile.in: Ignore error from $(AR) + command, in case just doing an install and installer has no write + access to library (this is a kludge fix -- perhaps install targets + should never try updating anything?). Sat Nov 18 19:37:22 1995 Craig Burley (burley@gnu.ai.mit.edu) @@ -1089,3 +1594,7 @@ Thu Feb 2 12:22:41 1995 Craig Burley (burley@gnu.ai.mit.edu) * libF77/Makefile.in (libf77): Add rule to .PHONY list. * libI77/Makefile.in (libi77): Add rule to .PHONY list. + +Local Variables: +add-log-time-format: current-time-string +End: diff --git a/contrib/libf2c/Makefile.in b/contrib/libf2c/Makefile.in index ced3dd7..790e6cd 100644 --- a/contrib/libf2c/Makefile.in +++ b/contrib/libf2c/Makefile.in @@ -34,6 +34,14 @@ gcc_version_trigger = @gcc_version_trigger@ libdir = $(exec_prefix)/lib libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version) +# Multilib support variables. +MULTISRCTOP = +MULTIBUILDTOP = +MULTIDIRS = +MULTISUBDIR = +MULTIDO = true +MULTICLEAN = true + # Not configured per top-level version, since that doesn't get passed # down at configure time, but overrridden by the top-level install # target. @@ -59,7 +67,12 @@ FLAGS_TO_PASS= \ AR='$(AR)' \ RANLIB='$(RANLIB)' \ PICFLAG='$(PICFLAG)' \ - RUNTESTFLAGS='$(RUNTESTFLAGS)' + RUNTESTFLAGS='$(RUNTESTFLAGS)' \ + prefix='$(prefix)' \ + exec_prefix='$(exec_prefix)' \ + libdir='$(libdir)' \ + libsubdir='$(libsubdir)' \ + tooldir='$(tooldir)' LIBG2C = libg2c.a @@ -67,21 +80,60 @@ SUBDIRS = libI77 libF77 libU77 F2CEXT = abort derf derfc ef1asc ef1cmc erf erfc exit getarg getenv iargc \ signal system flush ftell fseek access besj0 besj1 besjn besy0 besy1 \ - besyn chdir chmod ctime date dbesj0 dbesj1 dbesjn dbesy0 dbesy1 dbesyn \ + besyn chdir chmod ctime dbesj0 dbesj1 dbesjn dbesy0 dbesy1 dbesyn \ dtime etime fdate fgetc fget flush1 fnum fputc fput fstat gerror \ getcwd getgid getlog getpid getuid gmtime hostnm idate ierrno irand \ isatty itime kill link lnblnk lstat ltime mclock perror rand rename \ secnds second sleep srand stat symlnk time ttynam umask unlink \ - vxtidt vxttim alarm - -# These dependencies can be satisfied in parallel. The [fiu]77 -# targets update stamp files which the $(LIBG2C) target checks in the -# sub-make. (Probably only one stamp file is really needed.) -all: i77 f77 u77 s-libe77 + vxttim alarm \ + date_y2kbuggy date_y2kbug vxtidt_y2kbuggy vxtidt_y2kbug + +.SUFFIXES: + +# The logic here is partly dictated by the desire to keep the lib?77 +# subdirs for compatibility with the Netlib version and because libU77 +# has a different copyright; then the libe77 bit (EXTERNALly-callable +# versions) is funny. Given that, as well as keeping things as simple +# as possible we want (at least) the following: +# * Allow make to be run at the top level (all-target-libf2c), at this +# level, or the subdirs of this level. In the latter case we only +# compile, rather than updating libg2c.a; +# * A robust set of dependencies, so that we rebuild (as little as +# possible) if a configuration file, g2c.h or any lib?77/*.c file +# changes; +# * Avoid unnecessary running of ar and ranlib; +# * Expose parallelism where reasonable, but not as a priority. + +# The intended top-level target here does a non-multilib build (via +# the dependency) and then (perhaps) builds multilibs. + +all: all-unilib + $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="all-unilib" + +# `all-unilib' is the overall target in the absence of multilibs, +# meant to be invoked via multi-do for multilibs. + +# Its dependencies can be satisfied in parallel. The [fiu]77 targets +# update stamp files (see the subdir makefiles) which the $(LIBG2C) +# target checks in the sub make to decide whether to run ar/ranlib. +# (Probably only one stamp file is really needed.) The stamp files +# s-lib[fiu]77 are intentionally not targets, since we're only meant +# to come in at the level of this target. The [fiu]77 targets always +# invoke sub makes to check dependencies in the subdirs, else we'd +# have to maintain them at this level; we live with the overhead of +# some recursive makes which may do nothing. + +all-unilib: i77 f77 u77 s-libe77 $(MAKE) $(FLAGS_TO_PASS) $(LIBG2C) i77 f77 u77: g2c.h +# This target should normally only get invoked via `all-unilib' -- +# after all's well in the subdirs -- actually to assemble the library. +# The stamp file dependencies are just to check whether libg2c.a is +# up-to-date (to avoid running ar regardless) -- the files should +# always have been created by a successful `all-unilib'. + $(LIBG2C): s-libi77 s-libf77 s-libu77 s-libe77 rm -f $(LIBG2C) set -e; \ @@ -113,6 +165,8 @@ s-libe77: f2cext.c done echo timestamp >s-libe77 +f2cext.c: g2c.h + ${srcdir}/configure: configure.in rm -f config.cache cd $(srcdir) && autoconf @@ -128,7 +182,7 @@ g2c.h: g2c.hin config.status Makefile # $(srcdir)/../move-if-change g2c.h g2c.x && mv g2c.x g2c.h Makefile: Makefile.in config.status -# Autoconf doc uses `./config.status'. Is there a good reason to use +# Autoconf doc uses `./config.status'. Is there a good reason to use $(SHELL)? $(SHELL) config.status config.status: configure $(gcc_version_trigger) @@ -143,9 +197,9 @@ check: cd libU77; $(MAKE) G77DIR=../../../gcc/ check install: all - $(INSTALL_DATA) $(LIBG2C) $(libsubdir)/$(LIBG2C).n - ( cd $(libsubdir) ; $(RANLIB) $(LIBG2C).n ) - mv -f $(libsubdir)/$(LIBG2C).n $(libsubdir)/$(LIBG2C) + $(INSTALL_DATA) $(LIBG2C) $(libsubdir)/$(MULTISUBDIR)/$(LIBG2C).n + ( cd $(libsubdir)/$(MULTISUBDIR) ; $(RANLIB) $(LIBG2C).n ) + mv -f $(libsubdir)/$(MULTISUBDIR)/$(LIBG2C).n $(libsubdir)/$(MULTISUBDIR)/$(LIBG2C) $(INSTALL_DATA) g2c.h $(libsubdir)/include/g2c.h @if [ -f f2c-install-ok -o -f $(srcdir)/f2c-install-ok ]; then \ echo ''; \ @@ -156,25 +210,31 @@ install: all echo ' f2c-install-ok in the source or build directory.)'; \ echo ''; \ else true; fi + $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@" install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install uninstall: - rm -f $(libsubdir)/include/g2c.h $(libsubdir)/$(LIBG2C) + rm -f $(libsubdir)/$(MULTISUBDIR)/include/g2c.h $(libsubdir)/$(MULTISUBDIR)/$(LIBG2C) + $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@" mostlyclean: rm -f $(LIBG2C) - for i in $(SUBDIRS); do (cd $$i && $(MAKE) mostlyclean); done - rm -fr libE77 + $(MAKE) DO=$@ DODIRS="$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do; \ + $(MULTICLEAN) multi-clean DO=$@ + rm -fr libE77 s-libe77 clean: mostlyclean rm -f config.log - for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean); done + $(MAKE) DO=$@ DODIRS="$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do; \ + $(MULTICLEAN) multi-clean DO=$@ distclean: clean - rm -f Makefile config.cache config.status g2c.h s-libe77 - for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean); done + rm -f g2c.h s-libe77 + $(MAKE) DO=$@ DODIRS="$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do; \ + $(MULTICLEAN) multi-clean DO=distclean + rm -f config.cache config.status Makefile maintainer-clean: @@ -182,4 +242,21 @@ rebuilt: configure .PHONY: rebuilt mostlyclean clean distclean maintainer-clean all \ i77 f77 u77 check uninstall install-strip dist \ - installcheck installdirs + installcheck installdirs all-unilib + +subdir_do: + @rootpre=`pwd`/; export rootpre; \ + srcrootpre=`cd $(srcdir); pwd`/; export srcrootpre; \ + for i in .. $(DODIRS); do \ + if [ x$$i != x.. ]; then \ + if [ -f ./$$i/Makefile ]; then \ + if (cd ./$$i; $(MAKE) $(FLAGS_TO_PASS) $(DO)); then \ + true; \ + else \ + exit 1; \ + fi; \ + else true; fi; \ + else true; fi; \ + done + +# multidoings may be added here by configure. diff --git a/contrib/libf2c/changes.netlib b/contrib/libf2c/changes.netlib index 47d51d7..a525220 100644 --- a/contrib/libf2c/changes.netlib +++ b/contrib/libf2c/changes.netlib @@ -2927,3 +2927,90 @@ Thu Jun 18 01:22:52 EDT 1998 either a decimal point or an exponent field) are treated as errors when they appear as list input for integer data. Compile lread.c with -DALLOW_FLOAT_IN_INTEGER_LIST_INPUT to restore the old behavior. + +Mon Aug 31 10:38:54 EDT 1998 + formatdata.c: if possible, and assuming doubles must be aligned on +double boundaries, use existing holes in DATA for common blocks to +force alignment of the block. For example, + block data + common /abc/ a, b + double precision a + integer b(2) + data b(2)/1/ + end +used to generate + struct { + integer fill_1[3]; + integer e_2; + doublereal e_3; + } abc_ = { {0}, 1, 0. }; +and now generates + struct { + doublereal fill_1[1]; + integer fill_2[1]; + integer e_3; + } abc_ = { {0}, {0}, 1 }; +In the old generated C, e_3 was added to force alignment; in the new C, +fill_1 does this job. + +Mon Sep 7 19:48:51 EDT 1998 + libi77: move e_wdfe from sfe.c to dfe.c, where it was originally. +Why did it ever move to sfe.c? + +Tue Sep 8 10:22:50 EDT 1998 + Treat dreal as a synonym for dble unless -cd is specified on the +command line. + +Sun Sep 13 22:23:41 EDT 1998 + format.c: fix bug in writing prototypes under f2c -A ... *.P: +under some circumstances involving external functions with no known +type, a null pointer was passed to printf. + +Tue Oct 20 23:25:54 EDT 1998 + Comments added to libf2c/README and libF77/README, pointing out +the need to modify signal1.h on some systems. + +Wed Feb 10 22:59:52 EST 1999 + defs.h lex.c: permit long names (up to at least roughly +MAX_SHARPLINE_LEN = 1000 characters long) in #line lines (which only +matters under -g). + fc: add -U option; recognize .so files. + +Sat Feb 13 10:18:27 EST 1999 + libf2c: endfile.c, lread.c, signal1.h0: minor tweaks to make some +(C++) compilers happier; f77_aloc.c: make exit_() visible to C++ +compilers. Version strings not changed. + +Thu Mar 11 23:14:02 EST 1999 + Modify f2c (exec.c, expr.c) to diagnose incorrect mixing of types +when (f2c extended) intrinsic functions are involved, as in +(not(17) .and. 4). Catching this in the first executable statement +is a bit tricky, as some checking must be postponed until all statement +function declarations have been parsed. Thus there is a chance of +today's changes introducing bugs under (let us hope) unusual conditions. + +Sun Mar 28 13:17:44 EST 1999 + lex.c: tweak to get the file name right in error messages caused +by statements just after a # nnn "filename" line emitted by the C +preprocessor. (The trouble is that the line following the # nnn line +must be read to see if it is a continuation of the stuff that preceded +the # nnn line.) When # nnn "filename" lines appear among the lines +for a Fortran statement, the filename reported in an error message for +the statement should now be the file that was current when the first +line of the statement was read. + +Sun May 2 22:38:25 EDT 1999 + libf77, libi77, libf2c.zip: make getenv_() more portable (call +getenv() rather than knowing about char **environ); adjust some +complex intrinsics to work with overlapping arguments (caused by +inappropriate use of equivalence); open.c: get "external" versus +"internal" right in the error message if a file cannot be opened; +err.c: cast a pointer difference to (int) for %d; rdfmt.c: omit +fixed-length buffer that could be overwritten by formats Inn or Lnn +with nn > 83. + +Mon May 3 13:14:07 EDT 1999 + "Invisible" changes to omit a few compiler warnings in f2c and +libf2c; two new casts in libf2c/open.c that matter with 64-bit longs, +and one more tweak (libf2c/c_log.c) for pathological equivalences. + Minor update to "fc" script: new -L flag and comment correction. diff --git a/contrib/libf2c/configure b/contrib/libf2c/configure index 5f7d1ed..a182368 100755 --- a/contrib/libf2c/configure +++ b/contrib/libf2c/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12.1 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -333,7 +333,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12.1" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -503,9 +503,11 @@ ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross +ac_exeext= +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; 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 @@ -520,22 +522,83 @@ fi -# From configure.in 1.12 +if test "${srcdir}" = "." ; then + if test "${with_target_subdir}" != "." ; then + topsrcdir=${with_multisrctop}../.. + else + topsrcdir=${with_multisrctop}.. + fi +else + topsrcdir=${srcdir}/.. +fi +ac_aux_dir= +for ac_dir in $topsrcdir $srcdir/$topsrcdir; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in $topsrcdir $srcdir/$topsrcdir" 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + + +# If the language specific compiler does not exist, but the "gcc" directory +# does, we do not build anything. Note, $r is set by the top-level Makefile. +# Note that when we look for the compiler, we search both with and without +# extension to handle cross and canadian cross builds. +compiler_name=f771 +rm -f skip-this-dir +echo $ac_n "checking if compiler $compiler_name has been built""... $ac_c" 1>&6 +echo "configure:562: checking if compiler $compiler_name has been built" >&5 +if eval "test \"`echo '$''{'g77_cv_compiler_exists'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + g77_cv_compiler_exists=yes +if test -n "$r"; then + if test -d "$r"/gcc; then + if test -f "$r"/gcc/$compiler_name \ + || test -f "$r"/gcc/$compiler_name.exe; then + true + else + g77_cv_compiler_exists=no + echo "rm -f config.cache config.log multilib.out" > skip-this-dir + fi + fi +fi + +fi + +echo "$ac_t""$g77_cv_compiler_exists" 1>&6 +if test x$g77_cv_compiler_exists = xno +then + rm -f Makefile conftest* confdefs* core + exit 0 +fi # For g77 we'll set CC to point at the built gcc, but this will get it into # the makefiles # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:531: checking for $ac_word" >&5 +echo "configure:593: checking for $ac_word" >&5 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}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -556,16 +619,17 @@ 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 -echo "configure:560: checking for $ac_word" >&5 +echo "configure:623: checking for $ac_word" >&5 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}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then @@ -600,25 +664,61 @@ else echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:674: checking for $ac_word" >&5 +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=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +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 + ;; + esac + fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:608: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:706: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -cat > conftest.$ac_ext <<EOF -#line 618 "configure" +cat > conftest.$ac_ext << EOF + +#line 717 "configure" #include "confdefs.h" + main(){return(0);} EOF -if { (eval echo configure:622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -632,18 +732,24 @@ else ac_cv_prog_cc_works=no fi rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:642: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:748: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:647: checking whether we are using GNU C" >&5 +echo "configure:753: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -652,7 +758,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -663,11 +769,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6 if test $ac_cv_prog_gcc = yes; then GCC=yes - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:671: checking whether ${CC-cc} accepts -g" >&5 +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:781: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -682,16 +792,20 @@ rm -f conftest* fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-O2" + CFLAGS="-g" fi else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi @@ -703,15 +817,16 @@ else # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:707: checking for $ac_word" >&5 +echo "configure:821: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" @@ -730,25 +845,6 @@ else fi fi -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -761,12 +857,12 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:765: checking for a BSD compatible install" >&5 +echo "configure:861: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in @@ -809,10 +905,12 @@ echo "$ac_t""$INSTALL" 1>&6 # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:816: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:914: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -841,7 +939,7 @@ fi # Sanity check for the cross-compilation case: echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:845: checking how to run the C preprocessor" >&5 +echo "configure:943: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -856,14 +954,14 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 860 "configure" +#line 958 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:964: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -873,14 +971,31 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 877 "configure" +#line 975 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext <<EOF +#line 992 "configure" +#include "confdefs.h" +#include <assert.h> +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -893,6 +1008,8 @@ fi rm -f conftest* fi rm -f conftest* +fi +rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" @@ -903,18 +1020,18 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stdio.h""... $ac_c" 1>&6 -echo "configure:907: checking for stdio.h" >&5 +echo "configure:1024: checking for stdio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 912 "configure" +#line 1029 "configure" #include "confdefs.h" #include <stdio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -941,21 +1058,48 @@ fi # We have to firkle with the info in hconfig.h to figure out suitable types -# (via com.h). proj.h and com.h are in $srcdir/.., config.h which they need -# is in ../.. and the config files are in $srcdir/../../config. +# (via com.h). proj.h and com.h are in gcc/f/, config.h which they need +# is in gcc/ and the config files are in gcc/config/. echo $ac_n "checking f2c integer type""... $ac_c" 1>&6 -echo "configure:948: checking f2c integer type" >&5 +echo "configure:1065: checking f2c integer type" >&5 +# Set this back later below! late_ac_cpp=$ac_cpp -ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" -if test "$subdir" != . ; then - ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" +late_cflags=$CFLAGS +extra_includes="-I$topsrcdir/gcc/f -I$topsrcdir/gcc -I$topsrcdir/include -I$topsrcdir/gcc/config -I$r/gcc" +ac_cpp="$late_ac_cpp -DIN_GCC -DHAVE_CONFIG_H $extra_includes" + +# The AC_EGREP_CPPs below have been known to fail when the header +# path is wrong after things have been moved about; the cpp error status +# counts for nothing. First check that there aren't any errors from +# the headers. +CFLAGS="$CFLAGS -DHAVE_CONFIG_H -DIN_GCC $extra_includes" +cat > conftest.$ac_ext <<EOF +#line 1078 "configure" +#include "confdefs.h" +#include "proj.h" +#define FFECOM_DETERMINE_TYPES 1 +#include "com.h" +int main() { + +; return 0; } +EOF +if { (eval echo configure:1087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + { echo "configure: error: Can't run check for integer sizes -- see config.log" 1>&2; exit 1; } fi +rm -f conftest* +CFLAGS=$late_cflags + if eval "test \"`echo '$''{'g77_cv_sys_f2cinteger'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - echo "configure:957: using $ac_cpp" >&5 + echo "configure:1101: using $ac_cpp" >&5 cat > conftest.$ac_ext <<EOF -#line 959 "configure" +#line 1103 "configure" #include "confdefs.h" #include "proj.h" #define FFECOM_DETERMINE_TYPES 1 @@ -977,9 +1121,9 @@ fi rm -f conftest* if test "$g77_cv_sys_f2cinteger" = ""; then -echo "configure:981: using $ac_cpp" >&5 +echo "configure:1125: using $ac_cpp" >&5 cat > conftest.$ac_ext <<EOF -#line 983 "configure" +#line 1127 "configure" #include "confdefs.h" #include "proj.h" #define FFECOM_DETERMINE_TYPES 1 @@ -1010,22 +1154,16 @@ fi echo "$ac_t""$g77_cv_sys_f2cinteger" 1>&6 F2C_INTEGER=$g77_cv_sys_f2cinteger -ac_cpp=$late_ac_cpp echo $ac_n "checking f2c long int type""... $ac_c" 1>&6 -echo "configure:1018: checking f2c long int type" >&5 -late_ac_cpp=$ac_cpp -ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" -if test "$subdir" != . ; then - ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" -fi +echo "configure:1161: checking f2c long int type" >&5 if eval "test \"`echo '$''{'g77_cv_sys_f2clongint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - echo "configure:1027: using $ac_cpp" >&5 + echo "configure:1165: using $ac_cpp" >&5 cat > conftest.$ac_ext <<EOF -#line 1029 "configure" +#line 1167 "configure" #include "confdefs.h" #include "proj.h" #define FFECOM_DETERMINE_TYPES 1 @@ -1046,10 +1184,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | fi rm -f conftest* + if test "$g77_cv_sys_f2clongint" = ""; then -echo "configure:1051: using $ac_cpp" >&5 +echo "configure:1190: using $ac_cpp" >&5 cat > conftest.$ac_ext <<EOF -#line 1053 "configure" +#line 1192 "configure" #include "confdefs.h" #include "proj.h" #define FFECOM_DETERMINE_TYPES 1 @@ -1080,8 +1219,8 @@ fi echo "$ac_t""$g77_cv_sys_f2clongint" 1>&6 F2C_LONGINT=$g77_cv_sys_f2clongint -ac_cpp=$late_ac_cpp +ac_cpp=$late_ac_cpp # avoid confusion in case the `makefile's from the f2c distribution have # got put here @@ -1128,7 +1267,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1132: checking host system type" >&5 +echo "configure:1271: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1149,7 +1288,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:1153: checking target system type" >&5 +echo "configure:1292: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -1167,7 +1306,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1171: checking build system type" >&5 +echo "configure:1310: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1190,9 +1329,11 @@ test "$host_alias" != "$target_alias" && program_prefix=${target_alias}- - subdirs="libU77 libI77 libF77" +# Do Makefile first since g2c.h depends on it and shouldn't get an +# earlier timestamp. Of course, it does when the multilib gunk below +# edits Makefile, sigh; see additional touch below. trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1216,7 +1357,7 @@ EOF # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1 | grep ac_space` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -1295,7 +1436,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" 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.12.1" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1319,6 +1460,7 @@ s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g @@ -1341,6 +1483,7 @@ s%@CC@%$CC%g s%@AR@%$AR%g s%@RANLIB@%$RANLIB%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@SET_MAKE@%$SET_MAKE%g s%@CPP@%$CPP%g @@ -1466,10 +1609,26 @@ rm -f conftest.s* EOF cat >> $CONFIG_STATUS <<EOF +srcdir=${srcdir} +host=${host} +target=${target} +with_target_subdir=${with_target_subdir} +with_multisubdir=${with_multisubdir} +ac_configure_args="--enable-multilib ${ac_configure_args}" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +topsrcdir=${topsrcdir} EOF cat >> $CONFIG_STATUS <<\EOF - +test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h +if test -n "$CONFIG_FILES"; then + if test -n "${with_target_subdir}"; then + # FIXME: We shouldn't need to set ac_file + ac_file=Makefile + . ${topsrcdir}/config-ml.in + touch g2c.h # to keep it more recent than Makefile + fi +fi exit 0 EOF chmod +x $CONFIG_STATUS @@ -1574,3 +1733,4 @@ if test "$no_recursion" != yes; then fi + diff --git a/contrib/libf2c/configure.in b/contrib/libf2c/configure.in index 1b338c6..a4c502c 100644 --- a/contrib/libf2c/configure.in +++ b/contrib/libf2c/configure.in @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -# Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1995, 1997, 1998, 1999 Free Software Foundation, Inc. # Contributed by Dave Love (d.love@dl.ac.uk). # #This file is part of GNU Fortran. @@ -19,9 +19,49 @@ #the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #02111-1307, USA. +AC_PREREQ(2.13) AC_INIT(libF77/Version.c) -AC_REVISION(1.12) +if test "${srcdir}" = "." ; then + if test "${with_target_subdir}" != "." ; then + topsrcdir=${with_multisrctop}../.. + else + topsrcdir=${with_multisrctop}.. + fi +else + topsrcdir=${srcdir}/.. +fi +dnl This is needed for a multilibbed build in the source tree so +dnl that install-sh and config.sub get found. +AC_CONFIG_AUX_DIR($topsrcdir) + +# If the language specific compiler does not exist, but the "gcc" directory +# does, we do not build anything. Note, $r is set by the top-level Makefile. +# Note that when we look for the compiler, we search both with and without +# extension to handle cross and canadian cross builds. +compiler_name=f771 +rm -f skip-this-dir +AC_MSG_CHECKING(if compiler $compiler_name has been built) +AC_CACHE_VAL(g77_cv_compiler_exists, +[g77_cv_compiler_exists=yes +if test -n "$r"; then + if test -d "$r"/gcc; then + if test -f "$r"/gcc/$compiler_name \ + || test -f "$r"/gcc/$compiler_name.exe; then + true + else + g77_cv_compiler_exists=no + echo "rm -f config.cache config.log multilib.out" > skip-this-dir + fi + fi +fi +]) +AC_MSG_RESULT($g77_cv_compiler_exists) +if test x$g77_cv_compiler_exists = xno +then + rm -f Makefile conftest* confdefs* core + exit 0 +fi dnl Checks for programs. # For g77 we'll set CC to point at the built gcc, but this will get it into @@ -50,14 +90,26 @@ the G77 runtime system. If necessary, install gcc now with \`LANGUAGES=c', then the target library, then build with \`LANGUAGES=f77'.])]) # We have to firkle with the info in hconfig.h to figure out suitable types -# (via com.h). proj.h and com.h are in $srcdir/.., config.h which they need -# is in ../.. and the config files are in $srcdir/../../config. +# (via com.h). proj.h and com.h are in gcc/f/, config.h which they need +# is in gcc/ and the config files are in gcc/config/. AC_MSG_CHECKING(f2c integer type) +# Set this back later below! late_ac_cpp=$ac_cpp -ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" -if test "$subdir" != . ; then - ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" -fi +late_cflags=$CFLAGS +extra_includes="-I$topsrcdir/gcc/f -I$topsrcdir/gcc -I$topsrcdir/include -I$topsrcdir/gcc/config -I$r/gcc" +ac_cpp="$late_ac_cpp -DIN_GCC -DHAVE_CONFIG_H $extra_includes" + +# The AC_EGREP_CPPs below have been known to fail when the header +# path is wrong after things have been moved about; the cpp error status +# counts for nothing. First check that there aren't any errors from +# the headers. +CFLAGS="$CFLAGS -DHAVE_CONFIG_H -DIN_GCC $extra_includes" +AC_TRY_COMPILE([#include "proj.h" +#define FFECOM_DETERMINE_TYPES 1 +#include "com.h"],,, +AC_MSG_ERROR([Can't run check for integer sizes -- see config.log])) +CFLAGS=$late_cflags + AC_CACHE_VAL(g77_cv_sys_f2cinteger, echo "configure:__oline__: using $ac_cpp" >&AC_FD_CC AC_EGREP_CPP(F2C_INTEGER=long int, @@ -96,15 +148,9 @@ fi ) AC_MSG_RESULT($g77_cv_sys_f2cinteger) F2C_INTEGER=$g77_cv_sys_f2cinteger -ac_cpp=$late_ac_cpp AC_SUBST(F2C_INTEGER) AC_MSG_CHECKING(f2c long int type) -late_ac_cpp=$ac_cpp -ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config" -if test "$subdir" != . ; then - ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config" -fi AC_CACHE_VAL(g77_cv_sys_f2clongint, echo "configure:__oline__: using $ac_cpp" >&AC_FD_CC AC_EGREP_CPP(F2C_LONGINT=long int, @@ -120,6 +166,7 @@ F2C_LONGINT=long long int #endif ], g77_cv_sys_f2clongint="long int",) + if test "$g77_cv_sys_f2clongint" = ""; then echo "configure:__oline__: using $ac_cpp" >&AC_FD_CC AC_EGREP_CPP(F2C_LONGINT=long long int, @@ -143,8 +190,8 @@ fi ) AC_MSG_RESULT($g77_cv_sys_f2clongint) F2C_LONGINT=$g77_cv_sys_f2clongint -ac_cpp=$late_ac_cpp AC_SUBST(F2C_LONGINT) +ac_cpp=$late_ac_cpp # avoid confusion in case the `makefile's from the f2c distribution have # got put here @@ -165,9 +212,30 @@ AC_SUBST(gcc_version) AC_SUBST(gcc_version_trigger) AC_CANONICAL_SYSTEM AC_SUBST(target_alias) - AC_CONFIG_SUBDIRS(libU77 libI77 libF77) -AC_OUTPUT(Makefile g2c.h:g2c.hin) +# Do Makefile first since g2c.h depends on it and shouldn't get an +# earlier timestamp. Of course, it does when the multilib gunk below +# edits Makefile, sigh; see additional touch below. +AC_OUTPUT(Makefile g2c.h:g2c.hin, + [test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h +if test -n "$CONFIG_FILES"; then + if test -n "${with_target_subdir}"; then + # FIXME: We shouldn't need to set ac_file + ac_file=Makefile + . ${topsrcdir}/config-ml.in + touch g2c.h # to keep it more recent than Makefile + fi +fi], +srcdir=${srcdir} +host=${host} +target=${target} +with_target_subdir=${with_target_subdir} +with_multisubdir=${with_multisubdir} +ac_configure_args="--enable-multilib ${ac_configure_args}" +CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +topsrcdir=${topsrcdir} +) + dnl Local Variables: dnl comment-start: "dnl " diff --git a/contrib/libf2c/f2c.h b/contrib/libf2c/f2c.h index f27703f..71e5361 100644 --- a/contrib/libf2c/f2c.h +++ b/contrib/libf2c/f2c.h @@ -1,6 +1,6 @@ /* f2c.h file for GNU Fortran run-time library Copyright (C) 1998 Free Software Foundation, Inc. - Contributed by James Craig Burley (burley@gnu.org). + Contributed by James Craig Burley. This file is part of GNU Fortran. diff --git a/contrib/libf2c/f2cext.c b/contrib/libf2c/f2cext.c index 2b51d88..56f9490 100644 --- a/contrib/libf2c/f2cext.c +++ b/contrib/libf2c/f2cext.c @@ -16,7 +16,7 @@ License along with GNU Fortran; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - +#include <math.h> /* for j0 et al */ #include <f2c.h> typedef void *sig_proc; /* For now, this will have to do. */ @@ -203,10 +203,23 @@ void ctime_ (char *chtime, const ftnlen Lchtime, longint *xstime) { } #endif -#ifdef Ldate +#ifdef Ldate_y2kbuggy int date_ (char *buf, ftnlen buf_len) { - extern int G77_date_0 (char *buf, ftnlen buf_len); - return G77_date_0 (buf, buf_len); + /* Fail to link, so user sees attempt to invoke non-Y2K-compliant + routine. */ + extern int G77_date_y2kbuggy_0 (char *buf, ftnlen buf_len); + return G77_date_y2kbuggy_0 (buf, buf_len); +} +#endif + +#ifdef Ldate_y2kbug +int date_y2kbug__ (char *buf, ftnlen buf_len) { + /* If user wants to invoke the non-Y2K-compliant routine via + an `EXTERNAL' interface, avoiding the warning via g77's + `INTRINSIC' interface, force coding of "y2kbug" string in + user's program. */ + extern int G77_date_y2kbug_0 (char *buf, ftnlen buf_len); + return G77_date_y2kbug_0 (buf, buf_len); } #endif @@ -540,10 +553,23 @@ integer unlink_ (const char *str, const ftnlen Lstr) { } #endif -#ifdef Lvxtidt +#ifdef Lvxtidt_y2kbuggy int vxtidate_ (integer *m, integer *d, integer *y) { - extern int G77_vxtidate_0 (integer *m, integer *d, integer *y); - return G77_vxtidate_0 (m, d, y); + /* Fail to link, so user sees attempt to invoke non-Y2K-compliant + routine. */ + extern int G77_vxtidate_y2kbuggy_0 (integer *m, integer *d, integer *y); + return G77_vxtidate_y2kbuggy_0 (m, d, y); +} +#endif + +#ifdef Lvxtidt_y2kbug +int vxtidate_y2kbug__ (integer *m, integer *d, integer *y) { + /* If user wants to invoke the non-Y2K-compliant routine via + an `EXTERNAL' interface, avoiding the warning via g77's + `INTRINSIC' interface, force coding of "y2kbug" string in + user's program. */ + extern int G77_vxtidate_y2kbug_0 (integer *m, integer *d, integer *y); + return G77_vxtidate_y2kbug_0 (m, d, y); } #endif diff --git a/contrib/libf2c/libF77/F77_aloc.c b/contrib/libf2c/libF77/F77_aloc.c index 8754fe2..e329a1b 100644 --- a/contrib/libf2c/libF77/F77_aloc.c +++ b/contrib/libf2c/libF77/F77_aloc.c @@ -14,7 +14,13 @@ extern void G77_exit_0 (); F77_aloc(Len, whence) integer Len; char *whence; #else #include <stdlib.h> +#ifdef __cplusplus +extern "C" { +#endif extern void G77_exit_0 (integer*); +#ifdef __cplusplus + } +#endif char * F77_aloc(integer Len, char *whence) diff --git a/contrib/libf2c/libF77/Makefile.in b/contrib/libf2c/libF77/Makefile.in index 83ac3f9..74c69a0 100644 --- a/contrib/libf2c/libF77/Makefile.in +++ b/contrib/libf2c/libF77/Makefile.in @@ -103,6 +103,128 @@ ${srcdir}/configure: configure.in VersionF.o: Version.c $(CC) -c $(ALL_CFLAGS) -o $@ $(srcdir)/Version.c +F77_aloc.o: F77_aloc.c +main.o: main.c +s_rnge.o: s_rnge.c +abort_.o: abort_.c +getarg_.o: getarg_.c +iargc_.o: iargc_.c +getenv_.o: getenv_.c +signal_.o: signal_.c +s_stop.o: s_stop.c +s_paus.o: s_paus.c +system_.o: system_.c +cabs.o: cabs.c +derf_.o: derf_.c +derfc_.o: derfc_.c +erf_.o: erf_.c +erfc_.o: erfc_.c +sig_die.o: sig_die.c +exit_.o: exit_.c +setarg.o: setarg.c +setsig.o: setsig.c +pow_ci.o: pow_ci.c +pow_dd.o: pow_dd.c +pow_di.o: pow_di.c +pow_hh.o: pow_hh.c +pow_ii.o: pow_ii.c +pow_ri.o: pow_ri.c +pow_zi.o: pow_zi.c +pow_zz.o: pow_zz.c +pow_qq.o: pow_qq.c +c_abs.o: c_abs.c +c_cos.o: c_cos.c +c_div.o: c_div.c +c_exp.o: c_exp.c +c_log.o: c_log.c +c_sin.o: c_sin.c +c_sqrt.o: c_sqrt.c +z_abs.o: z_abs.c +z_cos.o: z_cos.c +z_div.o: z_div.c +z_exp.o: z_exp.c +z_log.o: z_log.c +z_sin.o: z_sin.c +z_sqrt.o: z_sqrt.c +r_abs.o: r_abs.c +r_acos.o: r_acos.c +r_asin.o: r_asin.c +r_atan.o: r_atan.c +r_atn2.o: r_atn2.c +r_cnjg.o: r_cnjg.c +r_cos.o: r_cos.c +r_cosh.o: r_cosh.c +r_dim.o: r_dim.c +r_exp.o: r_exp.c +r_imag.o: r_imag.c +r_int.o: r_int.c +r_lg10.o: r_lg10.c +r_log.o: r_log.c +r_mod.o: r_mod.c +r_nint.o: r_nint.c +r_sign.o: r_sign.c +r_sin.o: r_sin.c +r_sinh.o: r_sinh.c +r_sqrt.o: r_sqrt.c +r_tan.o: r_tan.c +r_tanh.o: r_tanh.c +d_abs.o: d_abs.c +d_acos.o: d_acos.c +d_asin.o: d_asin.c +d_atan.o: d_atan.c +d_atn2.o: d_atn2.c +d_cnjg.o: d_cnjg.c +d_cos.o: d_cos.c +d_cosh.o: d_cosh.c +d_dim.o: d_dim.c +d_exp.o: d_exp.c +d_imag.o: d_imag.c +d_int.o: d_int.c +d_lg10.o: d_lg10.c +d_log.o: d_log.c +d_mod.o: d_mod.c +d_nint.o: d_nint.c +d_prod.o: d_prod.c +d_sign.o: d_sign.c +d_sin.o: d_sin.c +d_sinh.o: d_sinh.c +d_sqrt.o: d_sqrt.c +d_tan.o: d_tan.c +d_tanh.o: d_tanh.c +i_abs.o: i_abs.c +i_dim.o: i_dim.c +i_dnnt.o: i_dnnt.c +i_indx.o: i_indx.c +i_len.o: i_len.c +i_mod.o: i_mod.c +i_nint.o: i_nint.c +i_sign.o: i_sign.c +h_abs.o: h_abs.c +h_dim.o: h_dim.c +h_dnnt.o: h_dnnt.c +h_indx.o: h_indx.c +h_len.o: h_len.c +h_mod.o: h_mod.c +h_nint.o: h_nint.c +h_sign.o: h_sign.c +l_ge.o: l_ge.c +l_gt.o: l_gt.c +l_le.o: l_le.c +l_lt.o: l_lt.c +hl_ge.o: hl_ge.c +hl_gt.o: hl_gt.c +hl_le.o: hl_le.c +hl_lt.o: hl_lt.c +ef1asc_.o: ef1asc_.c +ef1cmc_.o: ef1cmc_.c +s_cat.o: s_cat.c +s_cmp.o: s_cmp.c +s_copy.o: s_copy.c +lbitbits.o: lbitbits.c +lbitshft.o: lbitshft.c +qbitbits.o: qbitbits.c +qbitshft.o: qbitshft.c + # Not quite all these actually do depend on f2c.h... $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) $(HALF) $(CMP) $(EFL) \ $(CHAR) $(F90BIT): $(F2C_H_DIR)/f2c.h $(G2C_H_DIR)/g2c.h @@ -114,6 +236,7 @@ mostlyclean: clean: mostlyclean rm -f config.log + rm -f ../s-libf77 distclean: clean rm -f config.cache config.status Makefile ../s-libf77 configure diff --git a/contrib/libf2c/libF77/README.netlib b/contrib/libf2c/libF77/README.netlib index 7668215..5e532ee 100644 --- a/contrib/libf2c/libF77/README.netlib +++ b/contrib/libf2c/libF77/README.netlib @@ -106,3 +106,7 @@ one-line shell script or (on some systems) exec /usr/bin/ar lts $1 >/dev/null + +If your compiler complains about the signal calls in main.c, s_paus.c, +and signal_.c, you may need to adjust signal1.h suitably. See the +comments in signal1.h. diff --git a/contrib/libf2c/libF77/Version.c b/contrib/libf2c/libF77/Version.c index 3e46ce8..a7c9346 100644 --- a/contrib/libf2c/libF77/Version.c +++ b/contrib/libf2c/libF77/Version.c @@ -1,9 +1,9 @@ -static char junk[] = "\n@(#)LIBF77 VERSION 19970919\n"; +static char junk[] = "\n@(#)LIBF77 VERSION 19990503\n"; /* */ -char __G77_LIBF77_VERSION__[] = "0.5.24"; +char __G77_LIBF77_VERSION__[] = "0.5.25 19990816 (release)"; /* 2.00 11 June 1980. File version.c added to library. @@ -55,6 +55,12 @@ char __G77_LIBF77_VERSION__[] = "0.5.24"; affect systems using gratuitous extra precision). 19 Sept. 1997: [de]time_.c (Unix systems only): change return type to double. + 2 May 1999: getenv_.c: omit environ in favor of getenv(). + c_cos.c, c_exp.c, c_sin.c, d_cnjg.c, r_cnjg.c, + z_cos.c, z_exp.c, z_log.c, z_sin.c: cope fully with + overlapping arguments caused by equivalence. + 3 May 1999: "invisible" tweaks to omit compiler warnings in + abort_.c, ef1asc_.c, s_rnge.c, s_stop.c. */ #include <stdio.h> diff --git a/contrib/libf2c/libF77/abort_.c b/contrib/libf2c/libF77/abort_.c index 8efdc42..f0c2f8d 100644 --- a/contrib/libf2c/libF77/abort_.c +++ b/contrib/libf2c/libF77/abort_.c @@ -12,7 +12,5 @@ int G77_abort_0 (void) #endif { sig_die("Fortran abort routine called", 1); -#ifdef __cplusplus -return 0; -#endif +return 0; /* not reached */ } diff --git a/contrib/libf2c/libF77/c_cos.c b/contrib/libf2c/libF77/c_cos.c index 9e833c16..549953d 100644 --- a/contrib/libf2c/libF77/c_cos.c +++ b/contrib/libf2c/libF77/c_cos.c @@ -3,19 +3,15 @@ #ifdef KR_headers extern double sin(), cos(), sinh(), cosh(); -VOID c_cos(resx, z) complex *resx, *z; +VOID c_cos(r, z) complex *r, *z; #else #undef abs -#include <math.h> +#include "math.h" -void c_cos(complex *resx, complex *z) +void c_cos(complex *r, complex *z) #endif { -complex res; - -res.r = cos(z->r) * cosh(z->i); -res.i = - sin(z->r) * sinh(z->i); - -resx->r = res.r; -resx->i = res.i; -} + double zi = z->i, zr = z->r; + r->r = cos(zr) * cosh(zi); + r->i = - sin(zr) * sinh(zi); + } diff --git a/contrib/libf2c/libF77/c_div.c b/contrib/libf2c/libF77/c_div.c index 9568354..ac96307 100644 --- a/contrib/libf2c/libF77/c_div.c +++ b/contrib/libf2c/libF77/c_div.c @@ -2,39 +2,36 @@ #ifdef KR_headers extern VOID sig_die(); -VOID c_div(resx, a, b) -complex *a, *b, *resx; +VOID c_div(c, a, b) +complex *a, *b, *c; #else extern void sig_die(char*,int); -void c_div(complex *resx, complex *a, complex *b) +void c_div(complex *c, complex *a, complex *b) #endif { -double ratio, den; -double abr, abi; -complex res; + double ratio, den; + double abr, abi, cr; -if( (abr = b->r) < 0.) - abr = - abr; -if( (abi = b->i) < 0.) - abi = - abi; -if( abr <= abi ) - { - if(abi == 0) - sig_die("complex division by zero", 1); - ratio = (double)b->r / b->i ; - den = b->i * (1 + ratio*ratio); - res.r = (a->r*ratio + a->i) / den; - res.i = (a->i*ratio - a->r) / den; - } + if( (abr = b->r) < 0.) + abr = - abr; + if( (abi = b->i) < 0.) + abi = - abi; + if( abr <= abi ) + { + if(abi == 0) + sig_die("complex division by zero", 1); + ratio = (double)b->r / b->i ; + den = b->i * (1 + ratio*ratio); + cr = (a->r*ratio + a->i) / den; + c->i = (a->i*ratio - a->r) / den; + } -else - { - ratio = (double)b->i / b->r ; - den = b->r * (1 + ratio*ratio); - res.r = (a->r + a->i*ratio) / den; - res.i = (a->i - a->r*ratio) / den; + else + { + ratio = (double)b->i / b->r ; + den = b->r * (1 + ratio*ratio); + cr = (a->r + a->i*ratio) / den; + c->i = (a->i - a->r*ratio) / den; + } + c->r = cr; } - -resx->r = res.r; -resx->i = res.i; -} diff --git a/contrib/libf2c/libF77/c_exp.c b/contrib/libf2c/libF77/c_exp.c index 8d3d33d..52d0d2f 100644 --- a/contrib/libf2c/libF77/c_exp.c +++ b/contrib/libf2c/libF77/c_exp.c @@ -3,21 +3,17 @@ #ifdef KR_headers extern double exp(), cos(), sin(); - VOID c_exp(resx, z) complex *resx, *z; + VOID c_exp(r, z) complex *r, *z; #else #undef abs -#include <math.h> +#include "math.h" -void c_exp(complex *resx, complex *z) +void c_exp(complex *r, complex *z) #endif { -double expx; -complex res; + double expx, zi = z->i; -expx = exp(z->r); -res.r = expx * cos(z->i); -res.i = expx * sin(z->i); - -resx->r = res.r; -resx->i = res.i; -} + expx = exp(z->r); + r->r = expx * cos(zi); + r->i = expx * sin(zi); + } diff --git a/contrib/libf2c/libF77/c_log.c b/contrib/libf2c/libF77/c_log.c index 6715131..24d1a3c 100644 --- a/contrib/libf2c/libF77/c_log.c +++ b/contrib/libf2c/libF77/c_log.c @@ -2,20 +2,16 @@ #ifdef KR_headers extern double log(), f__cabs(), atan2(); -VOID c_log(resx, z) complex *resx, *z; +VOID c_log(r, z) complex *r, *z; #else #undef abs -#include <math.h> +#include "math.h" extern double f__cabs(double, double); -void c_log(complex *resx, complex *z) +void c_log(complex *r, complex *z) #endif { -complex res; - -res.i = atan2(z->i, z->r); -res.r = log( f__cabs(z->r, z->i) ); - -resx->r = res.r; -resx->i = res.i; -} + double zi, zr; + r->i = atan2(zi = z->i, zr = z->r); + r->r = log( f__cabs(zr, zi) ); + } diff --git a/contrib/libf2c/libF77/c_sin.c b/contrib/libf2c/libF77/c_sin.c index 7bf3e39..93a5766 100644 --- a/contrib/libf2c/libF77/c_sin.c +++ b/contrib/libf2c/libF77/c_sin.c @@ -3,19 +3,15 @@ #ifdef KR_headers extern double sin(), cos(), sinh(), cosh(); -VOID c_sin(resx, z) complex *resx, *z; +VOID c_sin(r, z) complex *r, *z; #else #undef abs -#include <math.h> +#include "math.h" -void c_sin(complex *resx, complex *z) +void c_sin(complex *r, complex *z) #endif { -complex res; - -res.r = sin(z->r) * cosh(z->i); -res.i = cos(z->r) * sinh(z->i); - -resx->r = res.r; -resx->i = res.i; -} + double zi = z->i, zr = z->r; + r->r = sin(zr) * cosh(zi); + r->i = cos(zr) * sinh(zi); + } diff --git a/contrib/libf2c/libF77/c_sqrt.c b/contrib/libf2c/libF77/c_sqrt.c index 775977a..8481ee4 100644 --- a/contrib/libf2c/libF77/c_sqrt.c +++ b/contrib/libf2c/libF77/c_sqrt.c @@ -3,36 +3,33 @@ #ifdef KR_headers extern double sqrt(), f__cabs(); -VOID c_sqrt(resx, z) complex *resx, *z; +VOID c_sqrt(r, z) complex *r, *z; #else #undef abs -#include <math.h> +#include "math.h" extern double f__cabs(double, double); -void c_sqrt(complex *resx, complex *z) +void c_sqrt(complex *r, complex *z) #endif { -double mag, t; -complex res; + double mag, t; + double zi = z->i, zr = z->r; -if( (mag = f__cabs(z->r, z->i)) == 0.) - res.r = res.i = 0.; -else if(z->r > 0) - { - res.r = t = sqrt(0.5 * (mag + z->r) ); - t = z->i / t; - res.i = 0.5 * t; + if( (mag = f__cabs(zr, zi)) == 0.) + r->r = r->i = 0.; + else if(zr > 0) + { + r->r = t = sqrt(0.5 * (mag + zr) ); + t = zi / t; + r->i = 0.5 * t; + } + else + { + t = sqrt(0.5 * (mag - zr) ); + if(zi < 0) + t = -t; + r->i = t; + t = zi / t; + r->r = 0.5 * t; + } } -else - { - t = sqrt(0.5 * (mag - z->r) ); - if(z->i < 0) - t = -t; - res.i = t; - t = z->i / t; - res.r = 0.5 * t; - } - -resx->r = res.r; -resx->i = res.i; -} diff --git a/contrib/libf2c/libF77/configure b/contrib/libf2c/libF77/configure index 3f738bf..b5622e0 100755 --- a/contrib/libf2c/libF77/configure +++ b/contrib/libf2c/libF77/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12.1 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -333,7 +333,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12.1" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -503,9 +503,11 @@ ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross +ac_exeext= +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; 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 @@ -525,15 +527,16 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:529: checking for $ac_word" >&5 +echo "configure:531: checking for $ac_word" >&5 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}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -554,16 +557,17 @@ 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 -echo "configure:558: checking for $ac_word" >&5 +echo "configure:561: checking for $ac_word" >&5 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}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then @@ -598,25 +602,61 @@ else echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:612: checking for $ac_word" >&5 +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=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +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 + ;; + esac + fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:606: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:644: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -cat > conftest.$ac_ext <<EOF -#line 616 "configure" +cat > conftest.$ac_ext << EOF + +#line 655 "configure" #include "confdefs.h" + main(){return(0);} EOF -if { (eval echo configure:620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -630,18 +670,24 @@ else ac_cv_prog_cc_works=no fi rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:640: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:686: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:645: checking whether we are using GNU C" >&5 +echo "configure:691: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -650,7 +696,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -661,11 +707,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6 if test $ac_cv_prog_gcc = yes; then GCC=yes - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:669: checking whether ${CC-cc} accepts -g" >&5 +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:719: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -680,23 +730,27 @@ rm -f conftest* fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-O2" + CFLAGS="-g" fi else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi test "$AR" || AR=ar echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:700: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:754: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -726,7 +780,7 @@ fi # Sanity check for the cross-compilation case: echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:730: checking how to run the C preprocessor" >&5 +echo "configure:784: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -741,14 +795,14 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 745 "configure" +#line 799 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -758,14 +812,31 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 762 "configure" +#line 816 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext <<EOF +#line 833 "configure" +#include "confdefs.h" +#include <assert.h> +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -778,6 +849,8 @@ fi rm -f conftest* fi rm -f conftest* +fi +rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" @@ -788,18 +861,18 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stdio.h""... $ac_c" 1>&6 -echo "configure:792: checking for stdio.h" >&5 +echo "configure:865: checking for stdio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 797 "configure" +#line 870 "configure" #include "confdefs.h" #include <stdio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -826,12 +899,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:830: checking for ANSI C header files" >&5 +echo "configure:903: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 835 "configure" +#line 908 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -839,8 +912,8 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes @@ -856,7 +929,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 860 "configure" +#line 933 "configure" #include "confdefs.h" #include <string.h> EOF @@ -874,7 +947,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 878 "configure" +#line 951 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -895,7 +968,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 899 "configure" +#line 972 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -906,7 +979,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -931,12 +1004,12 @@ fi echo $ac_n "checking for posix""... $ac_c" 1>&6 -echo "configure:935: checking for posix" >&5 +echo "configure:1008: checking for posix" >&5 if eval "test \"`echo '$''{'g77_cv_header_posix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 940 "configure" +#line 1013 "configure" #include "confdefs.h" #include <sys/types.h> #include <unistd.h> @@ -962,12 +1035,12 @@ echo "$ac_t""$g77_cv_header_posix" 1>&6 # We can rely on the GNU library being posix-ish. I guess checking the # header isn't actually like checking the functions, though... echo $ac_n "checking for GNU library""... $ac_c" 1>&6 -echo "configure:966: checking for GNU library" >&5 +echo "configure:1039: checking for GNU library" >&5 if eval "test \"`echo '$''{'g77_cv_lib_gnu'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 971 "configure" +#line 1044 "configure" #include "confdefs.h" #include <stdio.h> #ifdef __GNU_LIBRARY__ @@ -990,12 +1063,12 @@ fi echo "$ac_t""$g77_cv_lib_gnu" 1>&6 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:994: checking return type of signal handlers" >&5 +echo "configure:1067: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 999 "configure" +#line 1072 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -1012,7 +1085,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1033,12 +1106,12 @@ EOF # we'll get atexit by default if test $ac_cv_header_stdc != yes; then echo $ac_n "checking for atexit""... $ac_c" 1>&6 -echo "configure:1037: checking for atexit" >&5 +echo "configure:1110: checking for atexit" >&5 if eval "test \"`echo '$''{'ac_cv_func_atexit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1042 "configure" +#line 1115 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char atexit(); below. */ @@ -1061,7 +1134,7 @@ atexit(); ; return 0; } EOF -if { (eval echo configure:1065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_atexit=yes" else @@ -1086,12 +1159,12 @@ else EOF echo $ac_n "checking for onexit""... $ac_c" 1>&6 -echo "configure:1090: checking for onexit" >&5 +echo "configure:1163: checking for onexit" >&5 if eval "test \"`echo '$''{'ac_cv_func_onexit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1095 "configure" +#line 1168 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char onexit(); below. */ @@ -1114,7 +1187,7 @@ onexit(); ; return 0; } EOF -if { (eval echo configure:1118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_onexit=yes" else @@ -1132,12 +1205,12 @@ if eval "test \"`echo '$ac_cv_func_'onexit`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for on_exit""... $ac_c" 1>&6 -echo "configure:1136: checking for on_exit" >&5 +echo "configure:1209: checking for on_exit" >&5 if eval "test \"`echo '$''{'ac_cv_func_on_exit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1141 "configure" +#line 1214 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char on_exit(); below. */ @@ -1160,7 +1233,7 @@ on_exit(); ; return 0; } EOF -if { (eval echo configure:1164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_on_exit=yes" else @@ -1190,7 +1263,7 @@ else true fi echo $ac_n "checking for drem in -lm""... $ac_c" 1>&6 -echo "configure:1194: checking for drem in -lm" >&5 +echo "configure:1267: checking for drem in -lm" >&5 ac_lib_var=`echo m'_'drem | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1198,7 +1271,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 1202 "configure" +#line 1275 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1209,7 +1282,7 @@ int main() { drem() ; return 0; } EOF -if { (eval echo configure:1213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1261,7 +1334,7 @@ EOF # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1 | grep ac_space` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -1340,7 +1413,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" 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.12.1" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1363,6 +1436,7 @@ s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g diff --git a/contrib/libf2c/libF77/configure.in b/contrib/libf2c/libF77/configure.in index 660fb1a..5a3aa1a 100644 --- a/contrib/libf2c/libF77/configure.in +++ b/contrib/libf2c/libF77/configure.in @@ -19,6 +19,7 @@ #the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #02111-1307, USA. +AC_PREREQ(2.12.1) AC_INIT(getarg_.c) dnl Checks for programs. diff --git a/contrib/libf2c/libF77/d_cnjg.c b/contrib/libf2c/libF77/d_cnjg.c index 1afa3bc..c1970a5 100644 --- a/contrib/libf2c/libF77/d_cnjg.c +++ b/contrib/libf2c/libF77/d_cnjg.c @@ -2,16 +2,12 @@ VOID #ifdef KR_headers -d_cnjg(resx, z) doublecomplex *resx, *z; +d_cnjg(r, z) doublecomplex *r, *z; #else -d_cnjg(doublecomplex *resx, doublecomplex *z) +d_cnjg(doublecomplex *r, doublecomplex *z) #endif { -doublecomplex res; - -res.r = z->r; -res.i = - z->i; - -resx->r = res.r; -resx->i = res.i; -} + doublereal zi = z->i; + r->r = z->r; + r->i = -zi; + } diff --git a/contrib/libf2c/libF77/dtime_.c b/contrib/libf2c/libF77/dtime_.c index 95db94f..4b37320 100644 --- a/contrib/libf2c/libF77/dtime_.c +++ b/contrib/libf2c/libF77/dtime_.c @@ -1,4 +1,10 @@ #include "time.h" + +#ifdef MSDOS +#undef USE_CLOCK +#define USE_CLOCK +#endif + #ifndef USE_CLOCK #define _INCLUDE_POSIX_SOURCE /* for HP-UX */ #define _INCLUDE_XOPEN_SOURCE /* for HP-UX */ diff --git a/contrib/libf2c/libF77/ef1asc_.c b/contrib/libf2c/libF77/ef1asc_.c index a922a1d..8588584 100644 --- a/contrib/libf2c/libF77/ef1asc_.c +++ b/contrib/libf2c/libF77/ef1asc_.c @@ -15,7 +15,5 @@ int G77_ef1asc_0 (ftnint *a, ftnlen *la, ftnint *b, ftnlen *lb) #endif { s_copy( (char *)a, (char *)b, EVEN(*la), *lb ); -#ifdef __cplusplus -return 0; -#endif +return 0; /* ignored return value */ } diff --git a/contrib/libf2c/libF77/etime_.c b/contrib/libf2c/libF77/etime_.c index 7ed3fce..e88cfd8 100644 --- a/contrib/libf2c/libF77/etime_.c +++ b/contrib/libf2c/libF77/etime_.c @@ -1,4 +1,10 @@ #include "time.h" + +#ifdef MSDOS +#undef USE_CLOCK +#define USE_CLOCK +#endif + #ifndef USE_CLOCK #define _INCLUDE_POSIX_SOURCE /* for HP-UX */ #define _INCLUDE_XOPEN_SOURCE /* for HP-UX */ diff --git a/contrib/libf2c/libF77/getenv_.c b/contrib/libf2c/libF77/getenv_.c index b9916e6..4d0b7cf 100644 --- a/contrib/libf2c/libF77/getenv_.c +++ b/contrib/libf2c/libF77/getenv_.c @@ -1,4 +1,12 @@ #include "f2c.h" +#undef abs +#ifdef KR_headers +extern char *F77_aloc(), *getenv(); +#else +#include <stdlib.h> +#include <string.h> +extern char *F77_aloc(ftnlen, char*); +#endif /* * getenv - f77 subroutine to return environment variables @@ -13,39 +21,36 @@ */ #ifdef KR_headers -VOID G77_getenv_0 (fname, value, flen, vlen) char *value, *fname; ftnlen vlen, flen; + VOID +G77_getenv_0 (fname, value, flen, vlen) char *value, *fname; ftnlen vlen, flen; #else -void G77_getenv_0 (char *fname, char *value, ftnlen flen, ftnlen vlen) + void +G77_getenv_0 (char *fname, char *value, ftnlen flen, ftnlen vlen) #endif { -extern char **environ; -register char *ep, *fp, *flast; -register char **env = environ; + char buf[256], *ep, *fp; + integer i; -flast = fname + flen; -for(fp = fname ; fp < flast ; ++fp) - if(*fp == ' ') - { - flast = fp; - break; + if (flen <= 0) + goto add_blanks; + for(i = 0; i < sizeof(buf); i++) { + if (i == flen || (buf[i] = fname[i]) == ' ') { + buf[i] = 0; + ep = getenv(buf); + goto have_ep; + } } - -while (ep = *env++) - { - for(fp = fname; fp<flast ; ) - if(*fp++ != *ep++) - goto endloop; - - if(*ep++ == '=') { /* copy right hand side */ - while( *ep && --vlen>=0 ) + while(i < flen && fname[i] != ' ') + i++; + strncpy(fp = F77_aloc(i+1, "getenv_"), fname, (int)i); + fp[i] = 0; + ep = getenv(fp); + free(fp); + have_ep: + if (ep) + while(*ep && vlen-- > 0) *value++ = *ep++; - - goto blank; - } -endloop: ; - } - -blank: - while( --vlen >= 0 ) + add_blanks: + while(vlen-- > 0) *value++ = ' '; -} + } diff --git a/contrib/libf2c/libF77/pow_zi.c b/contrib/libf2c/libF77/pow_zi.c index 898ea6b..abb3cb2 100644 --- a/contrib/libf2c/libF77/pow_zi.c +++ b/contrib/libf2c/libF77/pow_zi.c @@ -1,61 +1,54 @@ #include "f2c.h" #ifdef KR_headers -VOID pow_zi(resx, a, b) /* p = a**b */ - doublecomplex *resx, *a; integer *b; +VOID pow_zi(p, a, b) /* p = a**b */ + doublecomplex *p, *a; integer *b; #else extern void z_div(doublecomplex*, doublecomplex*, doublecomplex*); -void pow_zi(doublecomplex *resx, doublecomplex *a, integer *b) /* p = a**b */ +void pow_zi(doublecomplex *p, doublecomplex *a, integer *b) /* p = a**b */ #endif { -integer n; -unsigned long u; -double t; -doublecomplex x; -doublecomplex res; -static doublecomplex one = {1.0, 0.0}; + integer n; + unsigned long u; + double t; + doublecomplex q, x; + static doublecomplex one = {1.0, 0.0}; -n = *b; + n = *b; + q.r = 1; + q.i = 0; -if(n == 0) - { - resx->r = 1; - resx->i = 0; - return; - } - -res.r = 1; -res.i = 0; - -if(n < 0) - { - n = -n; - z_div(&x, &one, a); - } -else - { - x.r = a->r; - x.i = a->i; - } - -for(u = n; ; ) - { - if(u & 01) + if(n == 0) + goto done; + if(n < 0) { - t = res.r * x.r - res.i * x.i; - res.i = res.r * x.i + res.i * x.r; - res.r = t; + n = -n; + z_div(&x, &one, a); } - if(u >>= 1) + else { - t = x.r * x.r - x.i * x.i; - x.i = 2 * x.r * x.i; - x.r = t; + x.r = a->r; + x.i = a->i; } - else - break; - } -resx->r = res.r; -resx->i = res.i; -} + for(u = n; ; ) + { + if(u & 01) + { + t = q.r * x.r - q.i * x.i; + q.i = q.r * x.i + q.i * x.r; + q.r = t; + } + if(u >>= 1) + { + t = x.r * x.r - x.i * x.i; + x.i = 2 * x.r * x.i; + x.r = t; + } + else + break; + } + done: + p->i = q.i; + p->r = q.r; + } diff --git a/contrib/libf2c/libF77/r_cnjg.c b/contrib/libf2c/libF77/r_cnjg.c index b6175ee..756c694 100644 --- a/contrib/libf2c/libF77/r_cnjg.c +++ b/contrib/libf2c/libF77/r_cnjg.c @@ -1,16 +1,12 @@ #include "f2c.h" #ifdef KR_headers -VOID r_cnjg(resx, z) complex *resx, *z; +VOID r_cnjg(r, z) complex *r, *z; #else -VOID r_cnjg(complex *resx, complex *z) +VOID r_cnjg(complex *r, complex *z) #endif { -complex res; - -res.r = z->r; -res.i = - z->i; - -resx->r = res.r; -resx->i = res.i; -} + real zi = z->i; + r->r = z->r; + r->i = -zi; + } diff --git a/contrib/libf2c/libF77/s_rnge.c b/contrib/libf2c/libF77/s_rnge.c index 189b524..fbe3219 100644 --- a/contrib/libf2c/libF77/s_rnge.c +++ b/contrib/libf2c/libF77/s_rnge.c @@ -20,7 +20,5 @@ fprintf(stderr, ".\nAttempt to access the %ld-th element of variable ", offset+1 while((i = *varn) && i != ' ') putc(*varn++, stderr); sig_die(".", 1); -#ifdef __cplusplus -return 0; -#endif +return 0; /* not reached */ } diff --git a/contrib/libf2c/libF77/s_stop.c b/contrib/libf2c/libF77/s_stop.c index 2e3f103..975edb7 100644 --- a/contrib/libf2c/libF77/s_stop.c +++ b/contrib/libf2c/libF77/s_stop.c @@ -30,8 +30,13 @@ if(n > 0) f_exit(); #endif exit(0); -#ifdef __cplusplus + +/* We cannot avoid (useless) compiler diagnostics here: */ +/* some compilers complain if there is no return statement, */ +/* and others complain that this one cannot be reached. */ + return 0; /* NOT REACHED */ } -#endif +#ifdef __cplusplus } +#endif diff --git a/contrib/libf2c/libF77/signal1.h0 b/contrib/libf2c/libF77/signal1.h0 index 662cae4..a383774 100644 --- a/contrib/libf2c/libF77/signal1.h0 +++ b/contrib/libf2c/libF77/signal1.h0 @@ -3,6 +3,8 @@ /* compiler-dependent. The #define below assumes signal.h declares */ /* type SIG_PF for the signal function's second argument. */ +/* For some C++ compilers, "#define Sigarg_t ..." may be appropriate. */ + #include <signal.h> #ifndef Sigret_t @@ -12,12 +14,8 @@ #ifdef KR_headers #define Sigarg_t #else -#ifdef __cplusplus -#define Sigarg_t ... -#else #define Sigarg_t int #endif -#endif #endif /*Sigarg_t*/ #ifdef USE_SIG_PF /* compile with -DUSE_SIG_PF under IRIX */ diff --git a/contrib/libf2c/libF77/z_cos.c b/contrib/libf2c/libF77/z_cos.c index a811bbe..2d4a24d 100644 --- a/contrib/libf2c/libF77/z_cos.c +++ b/contrib/libf2c/libF77/z_cos.c @@ -2,18 +2,14 @@ #ifdef KR_headers double sin(), cos(), sinh(), cosh(); -VOID z_cos(resx, z) doublecomplex *resx, *z; +VOID z_cos(r, z) doublecomplex *r, *z; #else #undef abs -#include <math.h> -void z_cos(doublecomplex *resx, doublecomplex *z) +#include "math.h" +void z_cos(doublecomplex *r, doublecomplex *z) #endif { -doublecomplex res; - -res.r = cos(z->r) * cosh(z->i); -res.i = - sin(z->r) * sinh(z->i); - -resx->r = res.r; -resx->i = res.i; -} + double zi = z->i, zr = z->r; + r->r = cos(zr) * cosh(zi); + r->i = - sin(zr) * sinh(zi); + } diff --git a/contrib/libf2c/libF77/z_div.c b/contrib/libf2c/libF77/z_div.c index 4a987ab2..22153fa 100644 --- a/contrib/libf2c/libF77/z_div.c +++ b/contrib/libf2c/libF77/z_div.c @@ -2,38 +2,35 @@ #ifdef KR_headers extern VOID sig_die(); -VOID z_div(resx, a, b) doublecomplex *a, *b, *resx; +VOID z_div(c, a, b) doublecomplex *a, *b, *c; #else extern void sig_die(char*, int); -void z_div(doublecomplex *resx, doublecomplex *a, doublecomplex *b) +void z_div(doublecomplex *c, doublecomplex *a, doublecomplex *b) #endif { -double ratio, den; -double abr, abi; -doublecomplex res; + double ratio, den; + double abr, abi, cr; -if( (abr = b->r) < 0.) - abr = - abr; -if( (abi = b->i) < 0.) - abi = - abi; -if( abr <= abi ) - { - if(abi == 0) - sig_die("complex division by zero", 1); - ratio = b->r / b->i ; - den = b->i * (1 + ratio*ratio); - res.r = (a->r*ratio + a->i) / den; - res.i = (a->i*ratio - a->r) / den; - } + if( (abr = b->r) < 0.) + abr = - abr; + if( (abi = b->i) < 0.) + abi = - abi; + if( abr <= abi ) + { + if(abi == 0) + sig_die("complex division by zero", 1); + ratio = b->r / b->i ; + den = b->i * (1 + ratio*ratio); + cr = (a->r*ratio + a->i) / den; + c->i = (a->i*ratio - a->r) / den; + } -else - { - ratio = b->i / b->r ; - den = b->r * (1 + ratio*ratio); - res.r = (a->r + a->i*ratio) / den; - res.i = (a->i - a->r*ratio) / den; + else + { + ratio = b->i / b->r ; + den = b->r * (1 + ratio*ratio); + cr = (a->r + a->i*ratio) / den; + c->i = (a->i - a->r*ratio) / den; + } + c->r = cr; } - -resx->r = res.r; -resx->i = res.i; -} diff --git a/contrib/libf2c/libF77/z_exp.c b/contrib/libf2c/libF77/z_exp.c index 85fb63e..ecf8429 100644 --- a/contrib/libf2c/libF77/z_exp.c +++ b/contrib/libf2c/libF77/z_exp.c @@ -2,20 +2,16 @@ #ifdef KR_headers double exp(), cos(), sin(); -VOID z_exp(resx, z) doublecomplex *resx, *z; +VOID z_exp(r, z) doublecomplex *r, *z; #else #undef abs -#include <math.h> -void z_exp(doublecomplex *resx, doublecomplex *z) +#include "math.h" +void z_exp(doublecomplex *r, doublecomplex *z) #endif { -double expx; -doublecomplex res; + double expx, zi = z->i; -expx = exp(z->r); -res.r = expx * cos(z->i); -res.i = expx * sin(z->i); - -resx->r = res.r; -resx->i = res.i; -} + expx = exp(z->r); + r->r = expx * cos(zi); + r->i = expx * sin(zi); + } diff --git a/contrib/libf2c/libF77/z_log.c b/contrib/libf2c/libF77/z_log.c index 48afca6..34c56d4 100644 --- a/contrib/libf2c/libF77/z_log.c +++ b/contrib/libf2c/libF77/z_log.c @@ -2,19 +2,15 @@ #ifdef KR_headers double log(), f__cabs(), atan2(); -VOID z_log(resx, z) doublecomplex *resx, *z; +VOID z_log(r, z) doublecomplex *r, *z; #else #undef abs -#include <math.h> +#include "math.h" extern double f__cabs(double, double); -void z_log(doublecomplex *resx, doublecomplex *z) +void z_log(doublecomplex *r, doublecomplex *z) #endif { -doublecomplex res; - -res.i = atan2(z->i, z->r); -res.r = log( f__cabs( z->r, z->i ) ); - -resx->r = res.r; -resx->i = res.i; -} + double zi = z->i, zr = z->r; + r->i = atan2(zi, zr); + r->r = log( f__cabs( zr, zi ) ); + } diff --git a/contrib/libf2c/libF77/z_sin.c b/contrib/libf2c/libF77/z_sin.c index 94456c9..e24caff 100644 --- a/contrib/libf2c/libF77/z_sin.c +++ b/contrib/libf2c/libF77/z_sin.c @@ -2,18 +2,14 @@ #ifdef KR_headers double sin(), cos(), sinh(), cosh(); -VOID z_sin(resx, z) doublecomplex *resx, *z; +VOID z_sin(r, z) doublecomplex *r, *z; #else #undef abs -#include <math.h> -void z_sin(doublecomplex *resx, doublecomplex *z) +#include "math.h" +void z_sin(doublecomplex *r, doublecomplex *z) #endif { -doublecomplex res; - -res.r = sin(z->r) * cosh(z->i); -res.i = cos(z->r) * sinh(z->i); - -resx->r = res.r; -resx->i = res.i; -} + double zi = z->i, zr = z->r; + r->r = sin(zr) * cosh(zi); + r->i = cos(zr) * sinh(zi); + } diff --git a/contrib/libf2c/libF77/z_sqrt.c b/contrib/libf2c/libF77/z_sqrt.c index f5db565..c04e8f0 100644 --- a/contrib/libf2c/libF77/z_sqrt.c +++ b/contrib/libf2c/libF77/z_sqrt.c @@ -2,32 +2,28 @@ #ifdef KR_headers double sqrt(), f__cabs(); -VOID z_sqrt(resx, z) doublecomplex *resx, *z; +VOID z_sqrt(r, z) doublecomplex *r, *z; #else #undef abs -#include <math.h> +#include "math.h" extern double f__cabs(double, double); -void z_sqrt(doublecomplex *resx, doublecomplex *z) +void z_sqrt(doublecomplex *r, doublecomplex *z) #endif { -double mag; -doublecomplex res; + double mag, zi = z->i, zr = z->r; -if( (mag = f__cabs(z->r, z->i)) == 0.) - res.r = res.i = 0.; -else if(z->r > 0) - { - res.r = sqrt(0.5 * (mag + z->r) ); - res.i = z->i / res.r / 2; + if( (mag = f__cabs(zr, zi)) == 0.) + r->r = r->i = 0.; + else if(zr > 0) + { + r->r = sqrt(0.5 * (mag + zr) ); + r->i = zi / r->r / 2; + } + else + { + r->i = sqrt(0.5 * (mag - zr) ); + if(zi < 0) + r->i = - r->i; + r->r = zi / r->i / 2; + } } -else - { - res.i = sqrt(0.5 * (mag - z->r) ); - if(z->i < 0) - res.i = - res.i; - res.r = z->i / res.i / 2; - } - -resx->r = res.r; -resx->i = res.i; -} diff --git a/contrib/libf2c/libI77/Makefile.in b/contrib/libf2c/libI77/Makefile.in index 2625bf5..1ff6b60 100644 --- a/contrib/libf2c/libI77/Makefile.in +++ b/contrib/libf2c/libI77/Makefile.in @@ -84,58 +84,61 @@ ${srcdir}/configure: configure.in VersionI.o: Version.c $(CC) -c $(ALL_CFLAGS) -o $@ $(srcdir)/Version.c -backspace.o: fio.h -close.o: fio.h +backspace.o: backspace.c fio.h +close.o: close.c fio.h dfe.o: fio.h -dfe.o: fmt.h -due.o: fio.h -endfile.o: fio.h rawio.h -err.o: fio.h rawio.h +dfe.o: dfe.c fmt.h +dolio.o: dolio.c +due.o: due.c fio.h +endfile.o: endfile.c fio.h rawio.h +err.o: err.c fio.h rawio.h fmt.o: fio.h -fmt.o: fmt.h -ftell_.o: fio.h +fmt.o: fmt.c fmt.h +fmtlib.o: fmtlib.c +ftell_.o: ftell_.c fio.h iio.o: fio.h -iio.o: fmt.h +iio.o: iio.c fmt.h ilnw.o: fio.h -ilnw.o: lio.h -inquire.o: fio.h +ilnw.o: ilnw.c lio.h +inquire.o: inquire.c fio.h lread.o: fio.h lread.o: fmt.h lread.o: lio.h -lread.o: fp.h +lread.o: lread.c fp.h lwrite.o: fio.h lwrite.o: fmt.h -lwrite.o: lio.h -open.o: fio.h rawio.h +lwrite.o: lwrite.c lio.h +open.o: open.c fio.h rawio.h rdfmt.o: fio.h rdfmt.o: fmt.h -rdfmt.o: fp.h -rewind.o: fio.h +rdfmt.o: rdfmt.c fp.h +rewind.o: rewind.c fio.h rsfe.o: fio.h -rsfe.o: fmt.h +rsfe.o: rsfe.c fmt.h rsli.o: fio.h -rsli.o: lio.h +rsli.o: rsli.c lio.h rsne.o: fio.h -rsne.o: lio.h -sfe.o: fio.h -sue.o: fio.h -uio.o: fio.h -util.o: fio.h +rsne.o: rsne.c lio.h +sfe.o: sfe.c fio.h +sue.o: sue.c fio.h +typesize.o: typesize.c +uio.o: uio.c fio.h +util.o: util.c fio.h wref.o: fio.h wref.o: fmt.h -wref.o: fp.h +wref.o: wref.c fp.h wrtfmt.o: fio.h -wrtfmt.o: fmt.h +wrtfmt.o: wrtfmt.c fmt.h wsfe.o: fio.h -wsfe.o: fmt.h +wsfe.o: wsfe.c fmt.h wsle.o: fio.h wsle.o: fmt.h -wsle.o: lio.h +wsle.o: wsle.c lio.h wsne.o: fio.h -wsne.o: lio.h +wsne.o: wsne.c lio.h xwsne.o: fio.h xwsne.o: lio.h -xwsne.o: fmt.h +xwsne.o: xwsne.c fmt.h # May be pessimistic: $(OBJ): $(F2C_H_DIR)/f2c.h $(G2C_H_DIR)/g2c.h @@ -146,7 +149,7 @@ mostlyclean: rm -f *.o clean: mostlyclean - rm -f config.log + rm -f config.log ../s-libi77 distclean: clean rm -f config.cache config.status Makefile ../s-libi77 configure diff --git a/contrib/libf2c/libI77/Version.c b/contrib/libf2c/libI77/Version.c index 1a5acc2..a056dff 100644 --- a/contrib/libf2c/libI77/Version.c +++ b/contrib/libf2c/libI77/Version.c @@ -1,9 +1,9 @@ -static char junk[] = "\n@(#) LIBI77 VERSION pjw,dmg-mods 19980617\n"; +static char junk[] = "\n@(#) LIBI77 VERSION pjw,dmg-mods 19990503\n"; /* */ -char __G77_LIBI77_VERSION__[] = "0.5.24-19981021"; +char __G77_LIBI77_VERSION__[] = "0.5.25 19990816 (release)"; /* 2.01 $ format added @@ -293,6 +293,14 @@ wrtfmt.c: floating-point numbers (containing either a decimal point or an exponent field) as errors when they appear as list input for integer data. */ +/* 7 Sept. 1998: move e_wdfe from sfe.c to dfe.c, where it was originally. + Why did it ever move to sfe.c? */ +/* 2 May 1999: open.c: set f__external (to get "external" versus "internal" + right in the error message if we cannot open the file). + err.c: cast a pointer difference to (int) for %d. + rdfmt.c: omit fixed-length buffer that could be overwritten + by formats Inn or Lnn with nn > 83. */ +/* 3 May 1999: open.c: insert two casts for machines with 64-bit longs. */ diff --git a/contrib/libf2c/libI77/backspace.c b/contrib/libf2c/libI77/backspace.c index 1da686d..eca1708 100644 --- a/contrib/libf2c/libI77/backspace.c +++ b/contrib/libf2c/libI77/backspace.c @@ -27,6 +27,7 @@ integer f_back(alist *a) } if(b->uwrt) { (void) t_runc(a); + f = b->ufd; /* t_runc might change b->ufd */ if (f__nowreading(b)) err(a->aerr,errno,"backspace"); } diff --git a/contrib/libf2c/libI77/configure b/contrib/libf2c/libI77/configure index 79e566e..69868c5 100755 --- a/contrib/libf2c/libI77/configure +++ b/contrib/libf2c/libI77/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12.1 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -333,7 +333,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12.1" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -503,9 +503,11 @@ ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross +ac_exeext= +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; 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 @@ -525,15 +527,16 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:529: checking for $ac_word" >&5 +echo "configure:531: checking for $ac_word" >&5 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}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -554,16 +557,17 @@ 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 -echo "configure:558: checking for $ac_word" >&5 +echo "configure:561: checking for $ac_word" >&5 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}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then @@ -598,25 +602,61 @@ else echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:612: checking for $ac_word" >&5 +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=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +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 + ;; + esac + fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:606: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:644: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -cat > conftest.$ac_ext <<EOF -#line 616 "configure" +cat > conftest.$ac_ext << EOF + +#line 655 "configure" #include "confdefs.h" + main(){return(0);} EOF -if { (eval echo configure:620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -630,18 +670,24 @@ else ac_cv_prog_cc_works=no fi rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:640: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:686: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:645: checking whether we are using GNU C" >&5 +echo "configure:691: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -650,7 +696,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -661,11 +707,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6 if test $ac_cv_prog_gcc = yes; then GCC=yes - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:669: checking whether ${CC-cc} accepts -g" >&5 +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:719: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -680,23 +730,27 @@ rm -f conftest* fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-O2" + CFLAGS="-g" fi else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi test "$AR" || AR=ar echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:700: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:754: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -726,7 +780,7 @@ fi # Sanity check for the cross-compilation case: echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:730: checking how to run the C preprocessor" >&5 +echo "configure:784: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -741,14 +795,14 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 745 "configure" +#line 799 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -758,14 +812,31 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 762 "configure" +#line 816 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext <<EOF +#line 833 "configure" +#include "confdefs.h" +#include <assert.h> +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -778,6 +849,8 @@ fi rm -f conftest* fi rm -f conftest* +fi +rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" @@ -788,18 +861,18 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stdio.h""... $ac_c" 1>&6 -echo "configure:792: checking for stdio.h" >&5 +echo "configure:865: checking for stdio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 797 "configure" +#line 870 "configure" #include "confdefs.h" #include <stdio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -826,12 +899,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:830: checking for ANSI C header files" >&5 +echo "configure:903: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 835 "configure" +#line 908 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -839,8 +912,8 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes @@ -856,7 +929,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 860 "configure" +#line 933 "configure" #include "confdefs.h" #include <string.h> EOF @@ -874,7 +947,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 878 "configure" +#line 951 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -895,7 +968,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 899 "configure" +#line 972 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -906,7 +979,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -931,12 +1004,12 @@ fi echo $ac_n "checking for posix""... $ac_c" 1>&6 -echo "configure:935: checking for posix" >&5 +echo "configure:1008: checking for posix" >&5 if eval "test \"`echo '$''{'g77_cv_header_posix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 940 "configure" +#line 1013 "configure" #include "confdefs.h" #include <sys/types.h> #include <unistd.h> @@ -962,12 +1035,12 @@ echo "$ac_t""$g77_cv_header_posix" 1>&6 # We can rely on the GNU library being posix-ish. I guess checking the # header isn't actually like checking the functions, though... echo $ac_n "checking for GNU library""... $ac_c" 1>&6 -echo "configure:966: checking for GNU library" >&5 +echo "configure:1039: checking for GNU library" >&5 if eval "test \"`echo '$''{'g77_cv_lib_gnu'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 971 "configure" +#line 1044 "configure" #include "confdefs.h" #include <stdio.h> #ifdef __GNU_LIBRARY__ @@ -991,12 +1064,12 @@ echo "$ac_t""$g77_cv_lib_gnu" 1>&6 # Apparently cygwin needs to be special-cased. echo $ac_n "checking for cyg\`win'32""... $ac_c" 1>&6 -echo "configure:995: checking for cyg\`win'32" >&5 +echo "configure:1068: checking for cyg\`win'32" >&5 if eval "test \"`echo '$''{'g77_cv_sys_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1000 "configure" +#line 1073 "configure" #include "confdefs.h" #ifdef __CYGWIN32__ yes @@ -1019,12 +1092,12 @@ echo "$ac_t""$g77_cv_sys_cygwin32" 1>&6 # ditto for mingw32. echo $ac_n "checking for mingw32""... $ac_c" 1>&6 -echo "configure:1023: checking for mingw32" >&5 +echo "configure:1096: checking for mingw32" >&5 if eval "test \"`echo '$''{'g77_cv_sys_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1028 "configure" +#line 1101 "configure" #include "confdefs.h" #ifdef __MINGW32__ yes @@ -1048,18 +1121,18 @@ echo "$ac_t""$g77_cv_sys_mingw32" 1>&6 ac_safe=`echo "fcntl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for fcntl.h""... $ac_c" 1>&6 -echo "configure:1052: checking for fcntl.h" >&5 +echo "configure:1125: checking for fcntl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1057 "configure" +#line 1130 "configure" #include "confdefs.h" #include <fcntl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -1091,12 +1164,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1095: checking for working const" >&5 +echo "configure:1168: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1100 "configure" +#line 1173 "configure" #include "confdefs.h" int main() { @@ -1145,7 +1218,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:1149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1166,12 +1239,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1170: checking for size_t" >&5 +echo "configure:1243: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1175 "configure" +#line 1248 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1180,7 +1253,7 @@ else #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_size_t=yes else @@ -1204,12 +1277,12 @@ fi # Apparently positive result on cygwin loses re. NON_UNIX_STDIO # (as of cygwin b18). Likewise on mingw. echo $ac_n "checking for fstat""... $ac_c" 1>&6 -echo "configure:1208: checking for fstat" >&5 +echo "configure:1281: checking for fstat" >&5 if eval "test \"`echo '$''{'ac_cv_func_fstat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1213 "configure" +#line 1286 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char fstat(); below. */ @@ -1232,7 +1305,7 @@ fstat(); ; return 0; } EOF -if { (eval echo configure:1236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_fstat=yes" else @@ -1252,7 +1325,7 @@ else fi echo $ac_n "checking need for NON_UNIX_STDIO""... $ac_c" 1>&6 -echo "configure:1256: checking need for NON_UNIX_STDIO" >&5 +echo "configure:1329: checking need for NON_UNIX_STDIO" >&5 if test $g77_cv_sys_cygwin32 = yes \ || test $g77_cv_sys_mingw32 = yes \ || test $ac_cv_func_fstat = no; then @@ -1268,12 +1341,12 @@ fi for ac_func in tempnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1272: checking for $ac_func" >&5 +echo "configure:1345: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1277 "configure" +#line 1350 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1296,7 +1369,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1326,19 +1399,19 @@ done # However, on my sunos4/gcc setup unistd.h leads us wrongly to believe # we're posix-conformant, so always do the test. echo $ac_n "checking for ansi/posix sprintf result""... $ac_c" 1>&6 -echo "configure:1330: checking for ansi/posix sprintf result" >&5 +echo "configure:1403: checking for ansi/posix sprintf result" >&5 if test "$cross_compiling" = yes; then g77_cv_sys_sprintf_ansi=no else cat > conftest.$ac_ext <<EOF -#line 1335 "configure" +#line 1408 "configure" #include "confdefs.h" #include <stdio.h> /* does sprintf return the number of chars transferred? */ main () {char foo[2]; (sprintf(foo, "1") == 1) ? exit(0) : exit(1);} EOF -if { (eval echo configure:1342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then g77_cv_sys_sprintf_ansi=yes else @@ -1369,9 +1442,9 @@ fi # define NON_ANSI_RW_MODES on unix (can't hurt) echo $ac_n "checking NON_ANSI_RW_MODES""... $ac_c" 1>&6 -echo "configure:1373: checking NON_ANSI_RW_MODES" >&5 +echo "configure:1446: checking NON_ANSI_RW_MODES" >&5 cat > conftest.$ac_ext <<EOF -#line 1375 "configure" +#line 1448 "configure" #include "confdefs.h" #ifdef unix yes @@ -1443,7 +1516,7 @@ EOF # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1 | grep ac_space` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -1522,7 +1595,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" 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.12.1" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1545,6 +1618,7 @@ s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g diff --git a/contrib/libf2c/libI77/configure.in b/contrib/libf2c/libI77/configure.in index e5fc32d..2b34830 100644 --- a/contrib/libf2c/libI77/configure.in +++ b/contrib/libf2c/libI77/configure.in @@ -19,6 +19,7 @@ #the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #02111-1307, USA. +AC_PREREQ(2.12.1) AC_INIT(ftell_.c) dnl Checks for programs. diff --git a/contrib/libf2c/libI77/dfe.c b/contrib/libf2c/libI77/dfe.c index f8c1fc1..f639ab5 100644 --- a/contrib/libf2c/libI77/dfe.c +++ b/contrib/libf2c/libI77/dfe.c @@ -81,7 +81,7 @@ c_dfe(cilist *a) f__fmtbuf=a->cifmt; if(a->cirec <= 0) err(a->cierr,130,"dfe"); - fseek(f__cf,(long)f__curunit->url * (a->cirec-1),SEEK_SET); + (void) fseek(f__cf,(long)f__curunit->url * (a->cirec-1),SEEK_SET); f__curunit->uend = 0; return(0); } @@ -138,3 +138,9 @@ integer e_rdfe(Void) en_fio(); return(0); } + +integer e_wdfe(Void) +{ + f__init = 1; + return en_fio(); +} diff --git a/contrib/libf2c/libI77/endfile.c b/contrib/libf2c/libI77/endfile.c index 0b785a9..0e4ac03 100644 --- a/contrib/libf2c/libI77/endfile.c +++ b/contrib/libf2c/libI77/endfile.c @@ -87,7 +87,9 @@ t_runc(alist *a) } if (!(bf = fopen(b->ufnm, f__r_mode[0])) || !(tf = tmpfile())) { +#ifdef NON_UNIX_STDIO bad: +#endif rc = 1; goto done; } diff --git a/contrib/libf2c/libI77/err.c b/contrib/libf2c/libI77/err.c index 56d82ac..e7ac23a 100644 --- a/contrib/libf2c/libI77/err.c +++ b/contrib/libf2c/libI77/err.c @@ -163,7 +163,8 @@ f__fatal(int n, char *s) dead = 1; if (f__init & 1) { if (f__curunit) { - fprintf(stderr,"apparent state: unit %d ",f__curunit-f__units); + fprintf(stderr,"apparent state: unit %d ", + (int)(f__curunit-f__units)); fprintf(stderr, f__curunit->ufnm ? "named %s\n" : "(unnamed)\n", f__curunit->ufnm); } diff --git a/contrib/libf2c/libI77/lread.c b/contrib/libf2c/libI77/lread.c index 24b621d..3d40059 100644 --- a/contrib/libf2c/libI77/lread.c +++ b/contrib/libf2c/libI77/lread.c @@ -24,14 +24,17 @@ int (*f__lioproc)(), (*l_getc)(), (*l_ungetc)(); #undef min #undef max #include <stdlib.h> -int (*f__lioproc)(ftnint*, char*, ftnlen, ftnint), (*l_getc)(void), - (*l_ungetc)(int,FILE*); #endif #include "fmt.h" #include "lio.h" #include "fp.h" +#ifndef KR_headers +int (*f__lioproc)(ftnint*, char*, ftnlen, ftnint), (*l_getc)(void), + (*l_ungetc)(int,FILE*); +#endif + int l_eof; #define isblnk(x) (f__ltab[x+1]&B) diff --git a/contrib/libf2c/libI77/open.c b/contrib/libf2c/libI77/open.c index 7c8f3de..3e4c8bc 100644 --- a/contrib/libf2c/libI77/open.c +++ b/contrib/libf2c/libI77/open.c @@ -141,6 +141,7 @@ integer f_open(olist *a) int n; #endif if(f__init != 1) f_init(); + f__external = 1; if(a->ounit>=MXUNIT || a->ounit<0) err(a->oerr,101,"open"); f__curunit = b = &f__units[a->ounit]; @@ -186,7 +187,7 @@ integer f_open(olist *a) opnerr(a->oerr,107,"open"); } else - sprintf(buf, "fort.%ld", a->ounit); + sprintf(buf, "fort.%ld", (long)a->ounit); b->uscrtch = 0; b->uend=0; b->uwrt = 0; @@ -280,7 +281,7 @@ fk_open(int seq, int fmt, ftnint n) int rtn; int save_init; - (void) sprintf(nbuf,"fort.%ld",n); + (void) sprintf(nbuf,"fort.%ld",(long)n); a.oerr=1; a.ounit=n; a.ofnm=nbuf; diff --git a/contrib/libf2c/libI77/rdfmt.c b/contrib/libf2c/libI77/rdfmt.c index b03bcc5..08ff0e8 100644 --- a/contrib/libf2c/libI77/rdfmt.c +++ b/contrib/libf2c/libI77/rdfmt.c @@ -99,60 +99,125 @@ rd_I(n,w,len, base) Uint *n; int w; ftnlen len; register int base; #else rd_I(Uint *n, int w, ftnlen len, register int base) #endif -{ longint x; - int sign,ch; - char s[84], *ps; - ps=s; x=0; - while (w) - { +{ + int bad, ch, sign; + longint x = 0; + + if (w <= 0) + goto have_x; + for(;;) { GET(ch); - if (ch==',' || ch=='\n') break; - *ps=ch; ps++; w--; - } - *ps='\0'; - ps=s; - while (*ps==' ') ps++; - if (*ps=='-') { sign=1; ps++; } - else { sign=0; if (*ps=='+') ps++; } -loop: while (*ps>='0' && *ps<='9') { x=x*base+(*ps-'0'); ps++; } - if (*ps==' ') {if (f__cblank) x *= base; ps++; goto loop;} - if(sign) x = -x; - if(len==sizeof(integer)) n->il=x; - else if(len == sizeof(char)) n->ic = (char)x; + if (ch != ' ') + break; + if (!--w) + goto have_x; + } + sign = 0; + switch(ch) { + case ',': + case '\n': + w = 0; + goto have_x; + case '-': + sign = 1; + case '+': + break; + default: + if (ch >= '0' && ch <= '9') { + x = ch - '0'; + break; + } + goto have_x; + } + while(--w) { + GET(ch); + if (ch >= '0' && ch <= '9') { + x = x*base + ch - '0'; + continue; + } + if (ch != ' ') { + if (ch == '\n' || ch == ',') + w = 0; + break; + } + if (f__cblank) + x *= base; + } + if (sign) + x = -x; + have_x: + if(len == sizeof(integer)) + n->il=x; + else if(len == sizeof(char)) + n->ic = (char)x; #ifdef Allow_TYQUAD - else if (len == sizeof(longint)) n->ili = x; + else if (len == sizeof(longint)) + n->ili = x; #endif - else n->is = (short)x; - if (*ps) return(errno=115); else return(0); + else + n->is = (short)x; + if (w) { + while(--w) + GET(ch); + return errno = 115; + } + return 0; } + static int #ifdef KR_headers rd_L(n,w,len) ftnint *n; ftnlen len; #else rd_L(ftnint *n, int w, ftnlen len) #endif -{ int ch, lv; - char s[84], *ps; - ps=s; - while (w) { +{ int ch, dot, lv; + + if (w <= 0) + goto bad; + for(;;) { GET(ch); - if (ch==','||ch=='\n') break; - *ps=ch; - ps++; w--; + --w; + if (ch != ' ') + break; + if (!w) + goto bad; } - *ps='\0'; - ps=s; while (*ps==' ') ps++; - if (*ps=='.') ps++; - if (*ps=='t' || *ps == 'T') + dot = 0; + retry: + switch(ch) { + case '.': + if (dot++ || !w) + goto bad; + GET(ch); + --w; + goto retry; + case 't': + case 'T': lv = 1; - else if (*ps == 'f' || *ps == 'F') + break; + case 'f': + case 'F': lv = 0; - else return(errno=116); + break; + default: + bad: + for(; w > 0; --w) + GET(ch); + /* no break */ + case ',': + case '\n': + return errno = 116; + } switch(len) { case sizeof(char): *(char *)n = (char)lv; break; case sizeof(short): *(short *)n = (short)lv; break; default: *n = lv; } + while(w-- > 0) { + GET(ch); + if (ch == ',' || ch == '\n') + break; + } return 0; } diff --git a/contrib/libf2c/libI77/rsne.c b/contrib/libf2c/libI77/rsne.c index 86bb216..c9d5f10 100644 --- a/contrib/libf2c/libI77/rsne.c +++ b/contrib/libf2c/libI77/rsne.c @@ -530,10 +530,10 @@ x_rsne(cilist *a) no1 = (ivae - iva)/size; if (no1 > f__lcount) no1 = f__lcount; - iva += no1 * dn0->delta; if (k = l_read(&no1, vaddr + iva, size, type)) return k; + iva += no1 * dn0->delta; } } mustend: diff --git a/contrib/libf2c/libI77/sfe.c b/contrib/libf2c/libI77/sfe.c index eb6260f..f7c3b83 100644 --- a/contrib/libf2c/libI77/sfe.c +++ b/contrib/libf2c/libI77/sfe.c @@ -32,9 +32,3 @@ integer e_wsfe(Void) f__fmtbuf=NULL; return n; } - -integer e_wdfe(Void) -{ - f__init = 1; - return en_fio(); -} diff --git a/contrib/libf2c/libU77/Makefile.in b/contrib/libf2c/libU77/Makefile.in index c90cb61..3468a82 100644 --- a/contrib/libf2c/libU77/Makefile.in +++ b/contrib/libf2c/libU77/Makefile.in @@ -164,6 +164,7 @@ rename_.o: rename_.c fputc_.o: fputc_.c fgetc_.o: fgetc_.c sys_clock_.o: sys_clock_.c +date_.o: date_.c umask_.o: umask_.c flush1_.o: flush1_.c mclock_.o: mclock_.c @@ -180,7 +181,7 @@ mostlyclean: rm -f *.o a.out clean: mostlyclean - rm -f config.log + rm -f config.log ../s-libu77 distclean: clean rm -f config.cache config.status Makefile config.h stamp.h \ diff --git a/contrib/libf2c/libU77/Version.c b/contrib/libf2c/libU77/Version.c index 6fb0b42..de0964d 100644 --- a/contrib/libf2c/libU77/Version.c +++ b/contrib/libf2c/libU77/Version.c @@ -1,6 +1,6 @@ static char junk[] = "\n@(#) LIBU77 VERSION 19980709\n"; -char __G77_LIBU77_VERSION__[] = "0.5.24-19990305"; +char __G77_LIBU77_VERSION__[] = "0.5.25 19990816 (release)"; #include <stdio.h> diff --git a/contrib/libf2c/libU77/acconfig.h b/contrib/libf2c/libU77/acconfig.h index 12bba85..1400ba5 100644 --- a/contrib/libf2c/libU77/acconfig.h +++ b/contrib/libf2c/libU77/acconfig.h @@ -1,2 +1,6 @@ /* Define as the path of the `chmod' program. */ #undef CHMOD_PATH + +/* Define if your sys/time.h defines struct timezone. */ +#undef HAVE_STRUCT_TIMEZONE + diff --git a/contrib/libf2c/libU77/aclocal.m4 b/contrib/libf2c/libU77/aclocal.m4 new file mode 100644 index 0000000..d230dad --- /dev/null +++ b/contrib/libf2c/libU77/aclocal.m4 @@ -0,0 +1,16 @@ +dnl See whether we have struct timezone +dnl LIBU77_HAVE_STRUCT_TIMEZONE +AC_DEFUN(LIBU77_HAVE_STRUCT_TIMEZONE, +[AC_MSG_CHECKING([whether struct timezone exists]) +AC_CACHE_VAL(libu77_cv_have_struct_timezone, +[AC_TRY_COMPILE([#include <sys/time.h>], +[struct timezone tz;], +libu77_ac_have_struct_timezone=yes, libu77_ac_have_struct_timezone=no)]) +if test $libu77_ac_have_struct_timezone = yes; then + AC_MSG_RESULT(yes) + AC_DEFINE_UNQUOTED(HAVE_STRUCT_TIMEZONE) +else + AC_MSG_RESULT(no) +fi +])dnl + diff --git a/contrib/libf2c/libU77/config.hin b/contrib/libf2c/libU77/config.hin index 8c3ba6b..27a89c05 100644 --- a/contrib/libf2c/libU77/config.hin +++ b/contrib/libf2c/libU77/config.hin @@ -33,6 +33,9 @@ /* Define as the path of the `chmod' program. */ #undef CHMOD_PATH +/* Define if your sys/time.h defines struct timezone. */ +#undef HAVE_STRUCT_TIMEZONE + /* Define if you have the alarm function. */ #undef HAVE_ALARM diff --git a/contrib/libf2c/libU77/configure b/contrib/libf2c/libU77/configure index 07424cb..fc8a490 100755 --- a/contrib/libf2c/libU77/configure +++ b/contrib/libf2c/libU77/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12.1 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -333,7 +333,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12.1" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -503,9 +503,11 @@ ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross +ac_exeext= +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; 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 @@ -526,15 +528,16 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:530: checking for $ac_word" >&5 +echo "configure:532: checking for $ac_word" >&5 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}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -555,16 +558,17 @@ 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 -echo "configure:559: checking for $ac_word" >&5 +echo "configure:562: checking for $ac_word" >&5 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}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then @@ -599,25 +603,61 @@ else echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:613: checking for $ac_word" >&5 +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=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +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 + ;; + esac + fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:607: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:645: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -cat > conftest.$ac_ext <<EOF -#line 617 "configure" +cat > conftest.$ac_ext << EOF + +#line 656 "configure" #include "confdefs.h" + main(){return(0);} EOF -if { (eval echo configure:621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -631,18 +671,24 @@ else ac_cv_prog_cc_works=no fi rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:641: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:687: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:646: checking whether we are using GNU C" >&5 +echo "configure:692: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -651,7 +697,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:701: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -662,11 +708,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6 if test $ac_cv_prog_gcc = yes; then GCC=yes - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:670: checking whether ${CC-cc} accepts -g" >&5 +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:720: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -681,16 +731,20 @@ rm -f conftest* fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-O2" + CFLAGS="-g" fi else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi if test "$CROSS";then @@ -702,7 +756,7 @@ fi test "$AR" || AR=ar echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:706: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:760: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -732,7 +786,7 @@ fi # Extract the first word of "chmod", so it can be a program name with args. set dummy chmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:736: checking for $ac_word" >&5 +echo "configure:790: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ac_cv_prog_chmod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -744,8 +798,9 @@ else ac_cv_path_ac_cv_prog_chmod="$ac_cv_prog_chmod" # Let the user override the test with a dos path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_ac_cv_prog_chmod="$ac_dir/$ac_word" @@ -775,7 +830,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:779: checking how to run the C preprocessor" >&5 +echo "configure:834: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -790,14 +845,14 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 794 "configure" +#line 849 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -807,14 +862,31 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 811 "configure" +#line 866 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext <<EOF +#line 883 "configure" +#include "confdefs.h" +#include <assert.h> +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -827,6 +899,8 @@ fi rm -f conftest* fi rm -f conftest* +fi +rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" @@ -836,12 +910,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:840: checking for ANSI C header files" >&5 +echo "configure:914: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 845 "configure" +#line 919 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -849,8 +923,8 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes @@ -866,7 +940,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 870 "configure" +#line 944 "configure" #include "confdefs.h" #include <string.h> EOF @@ -884,7 +958,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 888 "configure" +#line 962 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -905,7 +979,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 909 "configure" +#line 983 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -916,7 +990,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -941,12 +1015,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:945: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1019: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 950 "configure" +#line 1024 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -955,7 +1029,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -980,18 +1054,18 @@ for ac_hdr in limits.h unistd.h sys/time.h string.h stdlib.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:984: checking for $ac_hdr" >&5 +echo "configure:1058: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 989 "configure" +#line 1063 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -1018,12 +1092,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1022: checking for working const" >&5 +echo "configure:1096: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1027 "configure" +#line 1101 "configure" #include "confdefs.h" int main() { @@ -1072,7 +1146,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:1076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1093,12 +1167,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1097: checking for size_t" >&5 +echo "configure:1171: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1102 "configure" +#line 1176 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1107,7 +1181,7 @@ else #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_size_t=yes else @@ -1126,12 +1200,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:1130: checking for mode_t" >&5 +echo "configure:1204: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1135 "configure" +#line 1209 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1140,7 +1214,7 @@ else #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_mode_t=yes else @@ -1160,12 +1234,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1164: checking for pid_t" >&5 +echo "configure:1238: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1169 "configure" +#line 1243 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1174,7 +1248,7 @@ else #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_pid_t=yes else @@ -1193,12 +1267,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:1197: checking for st_blksize in struct stat" >&5 +echo "configure:1271: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1202 "configure" +#line 1276 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -1206,7 +1280,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:1210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -1227,12 +1301,12 @@ EOF fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:1231: checking for st_blocks in struct stat" >&5 +echo "configure:1305: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1236 "configure" +#line 1310 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -1240,7 +1314,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:1244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -1259,16 +1333,16 @@ if test $ac_cv_struct_st_blocks = yes; then EOF else - LIBOBJS="$LIBOBJS fileblocks.o" + LIBOBJS="$LIBOBJS fileblocks.${ac_objext}" fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:1267: checking for st_rdev in struct stat" >&5 +echo "configure:1341: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1272 "configure" +#line 1346 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -1276,7 +1350,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:1280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -1297,12 +1371,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:1301: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:1375: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1306 "configure" +#line 1380 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -1310,7 +1384,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -1332,7 +1406,7 @@ fi echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:1336: checking for gethostname in -lsocket" >&5 +echo "configure:1410: checking for gethostname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1340,7 +1414,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 1344 "configure" +#line 1418 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1351,7 +1425,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:1355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1378,12 +1452,12 @@ for ac_func in symlink getcwd getwd lstat gethostname strerror clock \ gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1382: checking for $ac_func" >&5 +echo "configure:1456: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1387 "configure" +#line 1461 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -1406,7 +1480,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:1410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1436,6 +1510,41 @@ test $ac_cv_func_gethostname = yes && MAYBES="$MAYBES hostnm_.o" test $ac_cv_func_clock = yes && MAYBES="$MAYBES mclock_.o" +echo $ac_n "checking whether struct timezone exists""... $ac_c" 1>&6 +echo "configure:1515: checking whether struct timezone exists" >&5 +if eval "test \"`echo '$''{'libu77_cv_have_struct_timezone'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1520 "configure" +#include "confdefs.h" +#include <sys/time.h> +int main() { +struct timezone tz; +; return 0; } +EOF +if { (eval echo configure:1527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + libu77_ac_have_struct_timezone=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + libu77_ac_have_struct_timezone=no +fi +rm -f conftest* +fi + +if test $libu77_ac_have_struct_timezone = yes; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<EOF +#define HAVE_STRUCT_TIMEZONE 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + @@ -1463,7 +1572,7 @@ EOF # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1 | grep ac_space` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -1530,7 +1639,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" 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.12.1" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1553,6 +1662,7 @@ s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g diff --git a/contrib/libf2c/libU77/configure.in b/contrib/libf2c/libU77/configure.in index 2e6e608..1262645 100644 --- a/contrib/libf2c/libU77/configure.in +++ b/contrib/libf2c/libU77/configure.in @@ -19,6 +19,7 @@ #to Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, #USA. +AC_PREREQ(2.12.1) AC_INIT(access_.c) AC_CONFIG_HEADER(config.h:config.hin) @@ -93,6 +94,7 @@ test $ac_cv_func_gethostname = yes && MAYBES="$MAYBES hostnm_.o" test $ac_cv_func_clock = yes && MAYBES="$MAYBES mclock_.o" AC_SUBST(MAYBES) +LIBU77_HAVE_STRUCT_TIMEZONE AC_SUBST(CROSS) AC_SUBST(RANLIB) diff --git a/contrib/libf2c/libU77/date_.c b/contrib/libf2c/libU77/date_.c index 8426edc..4f8254d 100644 --- a/contrib/libf2c/libU77/date_.c +++ b/contrib/libf2c/libU77/date_.c @@ -9,11 +9,12 @@ static integer c__5 = 5; -/* Subroutine */ int G77_date_0 (char *buf, ftnlen buf_len) +/* Subroutine */ int G77_date_y2kbug_0 (char *buf, ftnlen buf_len) { /* System generated locals */ address a__1[5]; - integer i__1, i__2[5]; + longint i__1; + integer i__2[5]; char ch__1[24]; /* Builtin functions */ @@ -21,7 +22,7 @@ static integer c__5 = 5; /* Local variables */ static char cbuf[24]; - extern integer G77_time_0 (); + extern longint G77_time_0 (); extern /* Character */ VOID G77_ctime_0 (); i__1 = G77_time_0 (); diff --git a/contrib/libf2c/libU77/datetime_.c b/contrib/libf2c/libU77/datetime_.c index 35f0d1c..faf773a 100644 --- a/contrib/libf2c/libU77/datetime_.c +++ b/contrib/libf2c/libU77/datetime_.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of GNU Fortran libU77 library. This library is free software; you can redistribute it and/or modify it @@ -62,8 +62,16 @@ int G77_date_and_time_0 (char *date, char *fftime, char *zone, #if HAVE_GETTIMEOFDAY { struct timeval tp; +#if HAVE_STRUCT_TIMEZONE struct timezone tzp; + /* This is still not strictly correct on some systems such as HPUX, + which does have struct timezone, but gettimeofday takes void* as + the 2nd arg. However, the effect of passing anything other than a null + pointer is unspecified on HPUX. */ if (! gettimeofday (&tp, &tzp)) +#else + if (! gettimeofday (&tp, (void *) 0)) +#endif vals[7] = tp.tv_usec/1000; } #endif diff --git a/contrib/libf2c/libU77/dtime_.c b/contrib/libf2c/libU77/dtime_.c index 8bcfde8..aa34bc0 100644 --- a/contrib/libf2c/libU77/dtime_.c +++ b/contrib/libf2c/libU77/dtime_.c @@ -33,6 +33,11 @@ Boston, MA 02111-1307, USA. */ # include <sys/time.h> # include <sys/resource.h> #endif +#if defined (_WIN32) +# include <windows.h> +# undef min +# undef max +#endif #include <errno.h> /* for ENOSYS */ #include "f2c.h" @@ -50,7 +55,73 @@ double G77_dtime_0 (tarray) double G77_dtime_0 (real tarray[2]) #endif { -#if defined (HAVE_GETRUSAGE) || defined (HAVE_TIMES) +#if defined (_WIN32) + static int win32_platform = -1; + + if (win32_platform == -1) + { + OSVERSIONINFO osv; + osv.dwOSVersionInfoSize = sizeof (osv); + GetVersionEx (&osv); + win32_platform = osv.dwPlatformId; + } + + /* We need to use this hack on non-NT platforms, where the first call + returns 0.0 and subsequent ones return the correct value. */ + if (win32_platform != VER_PLATFORM_WIN32_NT) + { + static unsigned long long clock_freq; + static unsigned long long old_count; + unsigned long long count; + double delta; + LARGE_INTEGER counter_val; + + if (clock_freq == 0) + { + LARGE_INTEGER freq; + if (! QueryPerformanceFrequency (&freq)) + { + errno = ENOSYS; + return 0.0; + } + else + { + clock_freq = ((unsigned long long) freq.HighPart << 32) + + ((unsigned) freq.LowPart); + } + } + + if (! QueryPerformanceCounter (&counter_val)) + return -1.0; + + count = ((unsigned long long) counter_val.HighPart << 32) + + (unsigned) counter_val.LowPart; + delta = ((double) (count - old_count)) / clock_freq; + tarray[0] = (float) delta; + tarray[1] = 0.0; + old_count = count; + } + else + { + static unsigned long long old_utime, old_stime; + unsigned long long utime, stime; + FILETIME creation_time, exit_time, kernel_time, user_time; + + GetProcessTimes (GetCurrentProcess (), &creation_time, &exit_time, + &kernel_time, &user_time); + utime = ((unsigned long long) user_time.dwHighDateTime << 32) + + (unsigned) user_time.dwLowDateTime; + stime = ((unsigned long long) kernel_time.dwHighDateTime << 32) + + (unsigned) kernel_time.dwLowDateTime; + + tarray[0] = (utime - old_utime) / 1.0e7; + tarray[1] = (stime - old_stime) / 1.0e7; + old_utime = utime; + old_stime = stime; + } + return tarray[0] + tarray[1]; + +#elif defined (HAVE_GETRUSAGE) || defined (HAVE_TIMES) /* The getrusage version is only the default for convenience. */ #ifdef HAVE_GETRUSAGE float utime, stime; @@ -84,7 +155,7 @@ double G77_dtime_0 (real tarray[2]) # else #error Dont know clock tick length # endif - if (times(&buffer) < 0) return -1.0; + if (times(&buffer) == (clock_t)-1) return -1.0; utime = buffer.tms_utime; stime = buffer.tms_stime; tarray[0] = ((float)(utime - old_utime)) / (float)clk_tck; tarray[1] = ((float)(stime - old_stime)) / (float)clk_tck; diff --git a/contrib/libf2c/libU77/etime_.c b/contrib/libf2c/libU77/etime_.c index 269d964..eae559f 100644 --- a/contrib/libf2c/libU77/etime_.c +++ b/contrib/libf2c/libU77/etime_.c @@ -33,6 +33,11 @@ Boston, MA 02111-1307, USA. */ # include <sys/time.h> # include <sys/resource.h> #endif +#if defined (_WIN32) +# include <windows.h> +# undef min +# undef max +#endif #include <errno.h> /* for ENOSYS */ #include "f2c.h" @@ -50,7 +55,72 @@ double G77_etime_0 (tarray) double G77_etime_0 (real tarray[2]) #endif { -#if defined (HAVE_GETRUSAGE) || defined (HAVE_TIMES) +#if defined (_WIN32) + static int win32_platform = -1; + double usertime, systime; + + if (win32_platform == -1) + { + OSVERSIONINFO osv; + osv.dwOSVersionInfoSize = sizeof (osv); + GetVersionEx (&osv); + win32_platform = osv.dwPlatformId; + } + + /* non-NT platforms don't have a clue as to how long a process has + been running, so simply return the uptime. Bad judgement call? */ + if (win32_platform != VER_PLATFORM_WIN32_NT) + { + static unsigned long long clock_freq; + static unsigned long long old_count; + unsigned long long count; + LARGE_INTEGER counter_val; + + if (clock_freq == 0) + { + LARGE_INTEGER freq; + if (! QueryPerformanceFrequency (&freq)) + { + errno = ENOSYS; + return 0.0; + } + else + { + clock_freq = ((unsigned long long) freq.HighPart << 32) + + ((unsigned) freq.LowPart); + if (! QueryPerformanceCounter (&counter_val)) + return -1.0; + old_count = ((unsigned long long) counter_val.HighPart << 32) + + (unsigned) counter_val.LowPart; + } + } + + if (! QueryPerformanceCounter (&counter_val)) + return -1.0; + + count = ((unsigned long long) counter_val.HighPart << 32) + + (unsigned) counter_val.LowPart; + tarray[0] = usertime = (double) (count - old_count) / clock_freq; + tarray[1] = systime = 0.0; + } + else + { + FILETIME creation_time, exit_time, kernel_time, user_time; + unsigned long long utime, stime; + + GetProcessTimes (GetCurrentProcess (), &creation_time, &exit_time, + &kernel_time, &user_time); + utime = ((unsigned long long) user_time.dwHighDateTime << 32) + + (unsigned) user_time.dwLowDateTime; + stime = ((unsigned long long) kernel_time.dwHighDateTime << 32) + + (unsigned) kernel_time.dwLowDateTime; + + tarray[0] = usertime = utime / 1.0e7; + tarray[1] = systime = stime / 1.0e7; + } + return usertime + systime; + +#elif defined (HAVE_GETRUSAGE) || defined (HAVE_TIMES) /* The getrusage version is only the default for convenience. */ #ifdef HAVE_GETRUSAGE struct rusage rbuff; @@ -78,7 +148,7 @@ double G77_etime_0 (real tarray[2]) # else #error Dont know clock tick length # endif - if (times(&buffer) < 0) return -1.0; + if (times(&buffer) == (clock_t)-1) return -1.0; tarray[0] = (float) buffer.tms_utime / (float)clk_tck; tarray[1] = (float) buffer.tms_stime / (float)clk_tck; #endif /* HAVE_GETRUSAGE */ diff --git a/contrib/libf2c/libU77/sys_clock_.c b/contrib/libf2c/libU77/sys_clock_.c index 7b7a9d0..d0d2a77 100644 --- a/contrib/libf2c/libU77/sys_clock_.c +++ b/contrib/libf2c/libU77/sys_clock_.c @@ -57,7 +57,7 @@ int G77_system_clock_0 (integer *count, integer *count_rate, integer *count_max) #elif defined CLK_TCK *count_rate = CLK_TCK; #elif defined HZ - *count_rate = HZ; + *count_rate = HZ; #else #error Dont know clock tick length #endif diff --git a/contrib/libf2c/libU77/u77-test.f b/contrib/libf2c/libU77/u77-test.f index 07963c9..65e972a 100644 --- a/contrib/libf2c/libU77/u77-test.f +++ b/contrib/libf2c/libU77/u77-test.f @@ -2,35 +2,102 @@ * hard to test things where you can't guarantee the result. Have a * good squint at what it prints, though detected errors will cause * starred messages. +* +* Currently not tested: +* ALARM +* CHDIR (func) +* CHMOD (func) +* FGET (func/subr) +* FGETC (func) +* FPUT (func/subr) +* FPUTC (func) +* FSTAT (subr) +* GETCWD (subr) +* HOSTNM (subr) +* IRAND +* KILL +* LINK (func) +* LSTAT (subr) +* RENAME (func/subr) +* SIGNAL (subr) +* SRAND +* STAT (subr) +* SYMLNK (func/subr) +* UMASK (func) +* UNLINK (func) +* +* NOTE! This is the libU77 version, so it should be a bit more +* "interactive" than the testsuite version, which is in +* gcc/testsuite/g77.f-torture/execute/u77-test.f. +* This version purposely exits with a "failure" status, to test +* returning of non-zero status, and it doesn't call the ABORT +* intrinsic (it substitutes an EXTERNAL stub, so the code can be +* kept nearly the same in both copies). Also, it goes ahead and +* tests the HOSTNM intrinsic. Please keep the other copy up-to-date when +* you modify this one. implicit none + +* external hostnm + intrinsic hostnm + integer hostnm + integer i, j, k, ltarray (9), idat (3), count, rate, count_max, + pid, mask - real tarray1(2), tarray2(2), r1, r2, sum - intrinsic getpid, getuid, getgid, ierrno, gerror, - + fnum, isatty, getarg, access, unlink, fstat, - + stat, lstat, getcwd, gmtime, hostnm, etime, chmod, + real tarray1(2), tarray2(2), r1, r2 + double precision d1 + integer(kind=2) bigi + logical issum + intrinsic getpid, getuid, getgid, ierrno, gerror, time8, + + fnum, isatty, getarg, access, unlink, fstat, iargc, + + stat, lstat, getcwd, gmtime, etime, chmod, itime, date, + chdir, fgetc, fputc, system_clock, second, idate, secnds, - + time, ctime, fdate, ttynam, date_and_time - external lenstr + + time, ctime, fdate, ttynam, date_and_time, mclock, mclock8, + + cpu_time, dtime, ftell, abort + external lenstr, ctrlc integer lenstr logical l character gerr*80, c*1 character ctim*25, line*80, lognam*20, wd*100, line2*80, ddate*8, - + ttime*10, zone*5 + + ttime*10, zone*5, ctim2*25 integer fstatb (13), statb (13) integer *2 i2zero integer values(8) + integer(kind=7) sigret - ctim = ctime(time()) - WRITE (6,'(A/)') '1 GNU libU77 test at: ' // ctim + i = time () + ctim = ctime (i) + WRITE (6,'(A/)') '1 GNU libU77 test at: ' // ctim(:lenstr (ctim)) write (6,'(A,I3,'', '',I3)') + ' Logical units 5 and 6 correspond (FNUM) to' + // ' Unix i/o units ', fnum(5), fnum(6) if (lnblnk('foo ').ne.3 .or. len_trim('foo ').ne.3) then print *, 'LNBLNK or LEN_TRIM failed' - call exit(1) + call abort + end if + + bigi = time8 () + + call ctime (i, ctim2) + if (ctim .ne. ctim2) then + write (6, *) '*** CALL CTIME disagrees with CTIME(): ', + + ctim2(:lenstr (ctim2)), ' vs. ', ctim(:lenstr (ctim)) + call doabort end if + + j = time () + if (i .gt. bigi .or. bigi .gt. j) then + write (6, *) '*** TIME/TIME8/TIME sequence failures: ', + + i, bigi, j + call doabort + end if + + print *, 'Command-line arguments: ', iargc () + do i = 0, iargc () + call getarg (i, line) + print *, 'Arg ', i, ' is: ', line(:lenstr (line)) + end do + l= isatty(6) line2 = ttynam(6) if (l) then @@ -39,6 +106,15 @@ line = 'and 6 isn''t a tty device (ISATTY)' end if write (6,'(1X,A)') line(:lenstr(line)) + call ttynam (6, line) + if (line .ne. line2) then + print *, '*** CALL TTYNAM disagrees with TTYNAM: ', + + line(:lenstr (line)) + call doabort + end if + +* regression test for compiler crash fixed by JCB 1998-08-04 com.c + sigret = signal(2, ctrlc) pid = getpid() WRITE (6,'(A,I10)') ' Process id (GETPID): ', pid @@ -49,23 +125,34 @@ call flush(6) CALL SYSTEM ('echo " " `id`') call flush + lognam = 'blahblahblah' call getlog (lognam) - write (6,*) 'Login name (GETLOG): ', lognam + write (6,*) 'Login name (GETLOG): ', lognam(:lenstr (lognam)) + + wd = 'blahblahblah' + call getenv ('LOGNAME', wd) + write (6,*) 'Login name (GETENV of LOGNAME): ', wd(:lenstr (wd)) + call umask(0, mask) write(6,*) 'UMASK returns', mask call umask(mask) ctim = fdate() - write (6,*) 'FDATE returns: ', ctim + write (6,*) 'FDATE returns: ', ctim(:lenstr (ctim)) + call fdate (ctim) + write (6,*) 'CALL FDATE returns: ', ctim(:lenstr (ctim)) + j=time() call ltime (j, ltarray) write (6,'(1x,a,9i4)') 'LTIME returns:', ltarray call gmtime (j, ltarray) write (6,'(1x,a,9i4)') 'GMTIME returns:', ltarray + call system_clock(count) ! omitting optional args call system_clock(count, rate, count_max) write(6,*) 'SYSTEM_CLOCK returns: ', count, rate, count_max + call date_and_time(ddate) ! omitting optional args call date_and_time(ddate, ttime, zone, values) write(6, *) 'DATE_AND_TIME returns: ', ddate, ' ', ttime, ' ', @@ -76,21 +163,23 @@ c consistency-check etime vs. dtime for first call r1 = etime (tarray1) - if (r1.ne.tarray1(1)+tarray1(2)) - + write (6,*) '*** ETIME didn''t return sum of the array: ', - + r1, ' /= ', tarray1(1), '+', tarray1(2) r2 = dtime (tarray2) - if (abs (r1-r2).gt.1.0) write (6,*) - + 'Results of ETIME and DTIME differ by more than a second:', - + r1, r2 - call sgladd (sum, tarray1(1), tarray1(2)) - if (r1 .ne. sum) - + write (6,*) '*** ETIME didn''t return sum of the array: ', - + r1, ' /= ', tarray1(1), '+', tarray1(2) - call sgladd (sum, tarray2(1), tarray2(2)) - if (r2 .ne. sum) - + write (6,*) '*** DTIME didn''t return sum of the array: ', - + r2, ' /= ', tarray2(1), '+', tarray2(2) + if (abs (r1-r2).gt.1.0) then + write (6,*) + + 'Results of ETIME and DTIME differ by more than a second:', + + r1, r2 + call doabort + end if + if (.not. issum (r1, tarray1(1), tarray1(2))) then + write (6,*) '*** ETIME didn''t return sum of the array: ', + + r1, ' /= ', tarray1(1), '+', tarray1(2) + call doabort + end if + if (.not. issum (r2, tarray2(1), tarray2(2))) then + write (6,*) '*** DTIME didn''t return sum of the array: ', + + r2, ' /= ', tarray2(1), '+', tarray2(2) + call doabort + end if write (6, '(A,3F10.3)') + ' Elapsed total, user, system time (ETIME): ', + r1, tarray1 @@ -100,18 +189,20 @@ c now try to get times to change enough to see in etime/dtime do i = 1,1000 do j = 1,1000 end do - r2 = dtime (tarray2) + call dtime (tarray2, r2) if (tarray2(1) .ne. 0. .or. tarray2(2) .ne. 0.) exit end do - r1 = etime (tarray1) - call sgladd (sum, tarray1(1), tarray1(2)) - if (r1 .ne. sum) - + write (6,*) '*** ETIME didn''t return sum of the array: ', - + r1, ' /= ', tarray1(1), '+', tarray1(2) - call sgladd (sum, tarray2(1), tarray2(2)) - if (r2 .ne. sum) - + write (6,*) '*** DTIME didn''t return sum of the array: ', - + r2, ' /= ', tarray2(1), '+', tarray2(2) + call etime (tarray1, r1) + if (.not. issum (r1, tarray1(1), tarray1(2))) then + write (6,*) '*** ETIME didn''t return sum of the array: ', + + r1, ' /= ', tarray1(1), '+', tarray1(2) + call doabort + end if + if (.not. issum (r2, tarray2(1), tarray2(2))) then + write (6,*) '*** DTIME didn''t return sum of the array: ', + + r2, ' /= ', tarray2(1), '+', tarray2(2) + call doabort + end if write (6, '(A,3F10.3)') + ' Differences in total, user, system time (DTIME): ', + r2, tarray2 @@ -122,29 +213,56 @@ c now try to get times to change enough to see in etime/dtime call idate (i,j,k) call idate (idat) - write (6,*) 'IDATE d,m,y: ',idat - print *, '... and the VXT version: ', i,j,k + write (6,*) 'IDATE (date,month,year): ',idat + print *, '... and the VXT version (month,date,year): ', i,j,k + if (i/=idat(2) .or. j/=idat(1) .or. k/=mod(idat(3),100)) then + print *, '*** VXT and U77 versions don''t agree' + call doabort + end if + + call date (ctim) + write (6,*) 'DATE (dd-mmm-yy): ', ctim(:lenstr (ctim)) + + call itime (idat) + write (6,*) 'ITIME (hour,minutes,seconds): ', idat + call time(line(:8)) print *, 'TIME: ', line(:8) + write (6,*) 'SECNDS(0.0) returns: ',secnds(0.0) + write (6,*) 'SECOND returns: ', second() call dumdum(r1) call second(r1) write (6,*) 'CALL SECOND returns: ', r1 + +* compiler crash fixed by 1998-10-01 com.c change + if (rand(0).lt.0.0 .or. rand(0).gt.1.0) then + write (6,*) '*** rand(0) error' + call doabort() + end if + i = getcwd(wd) if (i.ne.0) then call perror ('*** getcwd') + call doabort else write (6,*) 'Current directory is "'//wd(:lenstr(wd))//'"' end if call chdir ('.',i) - if (i.ne.0) write (6,*) '***CHDIR to ".": ', i + if (i.ne.0) then + write (6,*) '***CHDIR to ".": ', i + call doabort + end if + i=hostnm(wd) if(i.ne.0) then call perror ('*** hostnm') + call doabort else write (6,*) 'Host name is ', wd(:lenstr(wd)) end if + i = access('/dev/null ', 'rw') if (i.ne.0) write (6,*) '***Read/write ACCESS to /dev/null: ', i write (6,*) 'Creating file "foo" for testing...' @@ -160,42 +278,83 @@ C the better to test with, my dear! (-- burley) call fseek(3,0,0,*10) go to 20 10 write(6,*) '***FSEEK failed' + call doabort 20 call fgetc(3, c,i) - if (i.ne.0) write(6,*) '***FGETC: ', i - if (c.ne.'c') write(6,*) '***FGETC read the wrong thing: ', - + ichar(c) + if (i.ne.0) then + write(6,*) '***FGETC: ', i + call doabort + end if + if (c.ne.'c') then + write(6,*) '***FGETC read the wrong thing: ', ichar(c) + call doabort + end if i= ftell(3) - if (i.ne.1) write(6,*) '***FTELL offset: ', i + if (i.ne.1) then + write(6,*) '***FTELL offset: ', i + call doabort + end if + call ftell(3, i) + if (i.ne.1) then + write(6,*) '***CALL FTELL offset: ', i + call doabort + end if call chmod ('foo', 'a+w',i) - if (i.ne.0) write (6,*) '***CHMOD of "foo": ', i + if (i.ne.0) then + write (6,*) '***CHMOD of "foo": ', i + call doabort + end if i = fstat (3, fstatb) - if (i.ne.0) write (6,*) '***FSTAT of "foo": ', i + if (i.ne.0) then + write (6,*) '***FSTAT of "foo": ', i + call doabort + end if i = stat ('foo', statb) - if (i.ne.0) write (6,*) '***STAT of "foo": ', i + if (i.ne.0) then + write (6,*) '***STAT of "foo": ', i + call doabort + end if write (6,*) ' with stat array ', statb - if (statb(5).ne.getuid () .or. statb(6).ne.getgid() .or. statb(4) - + .ne. 1) write (6,*) '*** FSTAT uid, gid or nlink is wrong' + if (statb(6) .ne. getgid ()) then + write (6,*) 'Note: FSTAT gid wrong (happens on some systems).' + end if + if (statb(5) .ne. getuid () .or. statb(4) .ne. 1) then + write (6,*) '*** FSTAT uid or nlink is wrong' + call doabort + end if do i=1,13 - if (fstatb (i) .ne. statb (i)) - + write (6,*) '*** FSTAT and STAT don''t agree on '// ' - + array element ', i, ' value ', fstatb (i), statb (i) + if (fstatb (i) .ne. statb (i)) then + write (6,*) '*** FSTAT and STAT don''t agree on '// ' + + array element ', i, ' value ', fstatb (i), statb (i) + call doabort + end if end do i = lstat ('foo', fstatb) do i=1,13 - if (fstatb (i) .ne. statb (i)) - + write (6,*) '*** LSTAT and STAT don''t agree on '// ' - + array element ', i, ' value ', fstatb (i), statb (i) + if (fstatb (i) .ne. statb (i)) then + write (6,*) '*** LSTAT and STAT don''t agree on '// + + 'array element ', i, ' value ', fstatb (i), statb (i) + call doabort + end if end do C in case it exists already: call unlink ('bar',i) call link ('foo ', 'bar ',i) - if (i.ne.0) - + write (6,*) '***LINK "foo" to "bar" failed: ', i + if (i.ne.0) then + write (6,*) '***LINK "foo" to "bar" failed: ', i + call doabort + end if call unlink ('foo',i) - if (i.ne.0) write (6,*) '***UNLINK "foo" failed: ', i + if (i.ne.0) then + write (6,*) '***UNLINK "foo" failed: ', i + call doabort + end if call unlink ('foo',i) - if (i.eq.0) write (6,*) '***UNLINK "foo" again: ', i + if (i.eq.0) then + write (6,*) '***UNLINK "foo" again: ', i + call doabort + end if + call gerror (gerr) i = ierrno() write (6,'(A,I3,A/1X,A)') ' The current error number is: ', @@ -205,27 +364,52 @@ C in case it exists already: call getarg (0, line) call perror (line (:lenstr (line))) call unlink ('bar') + + print *, 'MCLOCK returns ', mclock () + print *, 'MCLOCK8 returns ', mclock8 () + + call cpu_time (d1) + print *, 'CPU_TIME returns ', d1 + WRITE (6,*) 'You should see exit status 1' CALL EXIT(1) 99 END +* Return length of STR not including trailing blanks, but always > 0. integer function lenstr (str) -C return length of STR not including trailing blanks, but always -C return >0 - character *(*) str + character*(*) str if (str.eq.' ') then lenstr=1 else lenstr = lnblnk (str) end if end -* just make sure SECOND() doesn't "magically" work the second time. + +* Just make sure SECOND() doesn't "magically" work the second time. subroutine dumdum(r) r = 3.14159 end -* do an add that is most likely to be done in single precision. - subroutine sgladd(sum,left,right) + +* Test whether sum is approximately left+right. + logical function issum (sum, left, right) implicit none - real sum,left,right - sum = left+right + real sum, left, right + real mysum, delta, width + mysum = left + right + delta = abs (mysum - sum) + width = abs (left) + abs (right) + issum = (delta .le. .0001 * width) + end + +* Signal handler + subroutine ctrlc + print *, 'Got ^C' + call doabort + end + +* A problem has been noticed, so maybe abort the test. + subroutine doabort +* For this version, print out all problems noticed. +* intrinsic abort +* call abort end diff --git a/contrib/libf2c/libU77/vxtidate_.c b/contrib/libf2c/libU77/vxtidate_.c index 03133ff..dc817a7 100644 --- a/contrib/libf2c/libU77/vxtidate_.c +++ b/contrib/libf2c/libU77/vxtidate_.c @@ -38,10 +38,10 @@ Boston, MA 02111-1307, USA. */ /* Subroutine */ #ifdef KR_headers -int G77_vxtidate_0 (m, d, y) +int G77_vxtidate_y2kbug_0 (m, d, y) integer *y, *m, *d; #else -int G77_vxtidate_0 (integer *m, integer *d, integer *y) +int G77_vxtidate_y2kbug_0 (integer *m, integer *d, integer *y) #endif { struct tm *lt; diff --git a/contrib/libf2c/readme.netlib b/contrib/libf2c/readme.netlib index 8ad697c..406a753 100644 --- a/contrib/libf2c/readme.netlib +++ b/contrib/libf2c/readme.netlib @@ -619,50 +619,145 @@ either a decimal point or an exponent field) are treated as errors when they appear as list input for integer data. Compile lread.c with -DALLOW_FLOAT_IN_INTEGER_LIST_INPUT to restore the old behavior. +Mon Aug 31 10:38:54 EDT 1998 + formatdata.c: if possible, and assuming doubles must be aligned on +double boundaries, use existing holes in DATA for common blocks to +force alignment of the block. For example, + block data + common /abc/ a, b + double precision a + integer b(2) + data b(2)/1/ + end +used to generate + struct { + integer fill_1[3]; + integer e_2; + doublereal e_3; + } abc_ = { {0}, 1, 0. }; +and now generates + struct { + doublereal fill_1[1]; + integer fill_2[1]; + integer e_3; + } abc_ = { {0}, {0}, 1 }; +In the old generated C, e_3 was added to force alignment; in the new C, +fill_1 does this job. + +Mon Sep 7 19:48:51 EDT 1998 + libi77: move e_wdfe from sfe.c to dfe.c, where it was originally. +Why did it ever move to sfe.c? + +Tue Sep 8 10:22:50 EDT 1998 + Treat dreal as a synonym for dble unless -cd is specified on the +command line. + +Sun Sep 13 22:23:41 EDT 1998 + format.c: fix bug in writing prototypes under f2c -A ... *.P: +under some circumstances involving external functions with no known +type, a null pointer was passed to printf. + +Tue Oct 20 23:25:54 EDT 1998 + Comments added to libf2c/README and libF77/README, pointing out +the need to modify signal1.h on some systems. + +Thu Nov 12 15:34:09 EST 1998 + libf77, libf2c.zip: minor tweaks to [de]time_.c and the makefiles, +so makefile.sy, makefile.vc, and makefile.wat deal with [de]time_.c. + +Wed Feb 10 22:59:52 EST 1999 + defs.h lex.c: permit long names (up to at least roughly +MAX_SHARPLINE_LEN = 1000 characters long) in #line lines (which only +matters under -g). + fc: add -U option; recognize .so files. + +Sat Feb 13 10:18:27 EST 1999 + libf2c: endfile.c, lread.c, signal1.h0: minor tweaks to make some +(C++) compilers happier; f77_aloc.c: make exit_() visible to C++ +compilers. Version strings not changed. + +Thu Mar 11 23:14:02 EST 1999 + Modify f2c (exec.c, expr.c) to diagnose incorrect mixing of types +when (f2c extended) intrinsic functions are involved, as in +(not(17) .and. 4). Catching this in the first executable statement +is a bit tricky, as some checking must be postponed until all statement +function declarations have been parsed. Thus there is a chance of +today's changes introducing bugs under (let us hope) unusual conditions. + +Sun Mar 28 13:17:44 EST 1999 + lex.c: tweak to get the file name right in error messages caused +by statements just after a # nnn "filename" line emitted by the C +preprocessor. (The trouble is that the line following the # nnn line +must be read to see if it is a continuation of the stuff that preceded +the # nnn line.) When # nnn "filename" lines appear among the lines +for a Fortran statement, the filename reported in an error message for +the statement should now be the file that was current when the first +line of the statement was read. + +Sun May 2 22:38:25 EDT 1999 + libf77, libi77, libf2c.zip: make getenv_() more portable (call +getenv() rather than knowing about char **environ); adjust some +complex intrinsics to work with overlapping arguments (caused by +inappropriate use of equivalence); open.c: get "external" versus +"internal" right in the error message if a file cannot be opened; +err.c: cast a pointer difference to (int) for %d; rdfmt.c: omit +fixed-length buffer that could be overwritten by formats Inn or Lnn +with nn > 83. + +Mon May 3 13:14:07 EDT 1999 + "Invisible" changes to omit a few compiler warnings in f2c and +libf2c; two new casts in libf2c/open.c that matter with 64-bit longs, +and one more tweak (libf2c/c_log.c) for pathological equivalences. + Minor update to "fc" script: new -L flag and comment correction. + +Tue May 4 10:06:26 EDT 1999 + libf77, libf2c.zip: forgot to copy yesterday's latest updates to +netlib. + Current timestamps of files in "all from f2c/src", sorted by time, appear below (mm/dd/year hh:mm:ss). To bring your source up to date, obtain source files with a timestamp later than the time shown in your version.c. Note that the time shown in the current version.c is the timestamp of the source module that immediately follows version.c below: - 5/16/1998 19:07:45 xsum0.out - 5/16/1998 17:17:01 f2c.1 - 5/16/1998 17:16:53 f2c.1t - 5/16/1998 16:56:15 version.c + 5/03/1999 12:46:15 version.c + 5/03/1999 12:39:35 formatdata.c + 5/03/1999 12:31:14 format.c + 5/03/1999 12:27:17 p1output.c + 5/03/1999 12:27:17 data.c + 5/03/1999 10:01:12 xsum0.out + 5/03/1999 9:59:36 io.c + 5/03/1999 9:59:36 misc.c + 5/03/1999 9:59:36 init.c + 3/26/1999 23:18:11 lex.c + 3/11/1999 16:44:17 expr.c + 3/11/1999 16:42:42 exec.c + 2/10/1999 17:43:01 defs.h + 9/08/1998 10:16:51 f2c.1 + 9/08/1998 10:16:48 f2c.1t + 9/08/1998 10:14:53 intr.c 5/16/1998 16:55:49 output.c 4/03/1998 17:15:05 gram.c 4/03/1998 17:14:59 gram.dcl 3/09/1998 0:30:23 putpcc.c 2/25/1998 8:18:04 makefile -12/04/1997 17:44:11 format.c 12/04/1997 17:44:11 niceprintf.c -12/04/1997 17:14:05 lex.c 8/05/1997 10:31:26 malloc.c 7/24/1997 17:10:55 README 7/24/1997 16:06:19 Notice 7/21/1997 12:58:44 proc.c 2/11/1997 23:39:14 vax.c 12/04/1996 13:07:53 gram.exec -10/01/1996 14:36:18 defs.h -10/01/1996 14:36:18 init.c -10/01/1996 14:36:17 data.c - 9/17/1996 17:29:44 expr.c 9/12/1996 12:12:46 equiv.c - 8/27/1996 8:30:32 intr.c 8/26/1996 9:41:13 sysdep.c 7/09/1996 10:40:45 names.c - 7/04/1996 9:58:31 formatdata.c 7/04/1996 9:55:45 sysdep.h 7/04/1996 9:55:43 put.c 7/04/1996 9:55:41 pread.c 7/04/1996 9:55:40 parse_args.c - 7/04/1996 9:55:40 p1output.c - 7/04/1996 9:55:37 misc.c - 7/04/1996 9:55:36 memset.c 7/04/1996 9:55:36 mem.c + 7/04/1996 9:55:36 memset.c 7/04/1996 9:55:35 main.c - 7/04/1996 9:55:33 io.c - 7/04/1996 9:55:30 exec.c 7/04/1996 9:55:29 error.c 7/04/1996 9:55:27 cds.c 7/03/1996 15:47:49 xsum.c |
