aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2000-06-04 08:30:31 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2000-06-04 08:30:31 +0000
commit14eaea6f7df0c47fa58497182ed29cfcb9a341d3 (patch)
tree6c8efa98b1dbe4422b55079f3eacc9fd3d9ebe86
parent21f6bc4b05eb3d93fce96ed4c1c1127db511c69f (diff)
downloadsrc-14eaea6f7df0c47fa58497182ed29cfcb9a341d3.tar.gz
src-14eaea6f7df0c47fa58497182ed29cfcb9a341d3.zip
Import of a GCC 2.96 SNAPSHOT taken from the trunk of the GCC anoncvs
server on 3-June-2000.
Notes
Notes: svn path=/vendor/gcc/dist/; revision=61241
-rw-r--r--contrib/libf2c/ChangeLog105
-rw-r--r--contrib/libf2c/Makefile.in2
-rw-r--r--contrib/libf2c/changes.netlib10
-rwxr-xr-xcontrib/libf2c/configure181
-rw-r--r--contrib/libf2c/configure.in120
-rw-r--r--contrib/libf2c/g2c.hin16
-rw-r--r--contrib/libf2c/libF77/Version.c12
-rw-r--r--contrib/libf2c/libF77/c_div.c12
-rwxr-xr-xcontrib/libf2c/libF77/configure4
-rw-r--r--contrib/libf2c/libF77/configure.in1
-rw-r--r--contrib/libf2c/libF77/s_rnge.c6
-rw-r--r--contrib/libf2c/libF77/z_div.c10
-rw-r--r--contrib/libf2c/libI77/Version.c17
-rw-r--r--contrib/libf2c/libI77/backspace.c6
-rw-r--r--contrib/libf2c/libI77/endfile.c2
-rw-r--r--contrib/libf2c/libI77/sfe.c4
-rw-r--r--contrib/libf2c/libU77/Version.c2
-rw-r--r--contrib/libf2c/libU77/acconfig.h5
-rw-r--r--contrib/libf2c/libU77/aclocal.m480
-rw-r--r--contrib/libf2c/libU77/config.hin7
-rwxr-xr-xcontrib/libf2c/libU77/configure183
-rw-r--r--contrib/libf2c/libU77/configure.in13
-rw-r--r--contrib/libf2c/libU77/datetime_.c24
-rw-r--r--contrib/libf2c/libU77/ttynam_.c2
-rw-r--r--contrib/libf2c/libU77/u77-test.f4
-rw-r--r--contrib/libf2c/readme.netlib13
-rw-r--r--contrib/libstdc++/config/beos.ml4
27 files changed, 482 insertions, 363 deletions
diff --git a/contrib/libf2c/ChangeLog b/contrib/libf2c/ChangeLog
index c3ca9a9043ba..6d0e6db5b1c1 100644
--- a/contrib/libf2c/ChangeLog
+++ b/contrib/libf2c/ChangeLog
@@ -1,28 +1,65 @@
-Mon Jan 24 20:28:35 CET 2000 David M. Gay <dmg@bell-labs.com>
+2000-05-18 Chris Demetriou <cgd@sibyte.com>
- * libI77/endfile.c (t_runc): set state to writing
- (b->uwrt = 1) when an endfile statement requires copying the file.
+ * configure.in: Test for __g77_integer, __g77_uinteger,
+ __g77_longint, and __g77_ulongint builtin types, rather
+ than mucking around with compiler headers.
+ * configure: Regenerate.
+ * g2c.hin (integer, logical, flag, ftnlen, ftnint): Use
+ __g77_integer rather than autoconfigured value.
+ (uinteger): Use __g77_uinteger rather than autoconfigured value.
+ (longint): Use __g77_longint rather than autoconfigured value.
+ (ulongint): Use __g77_ulongint rather than autoconfigured value.
-Sun Oct 24 23:54:10 PDT 1999 Jeff Law (law@cygnus.com)
+Sun Mar 12 20:12;30 2000 Toon Moene <toon@moene.indiv.nluug.nl>
+ Based on work done by David M. Gay (Bell Labs)
- * gcc-2.95.2 Released.
+ * libF77/configure.in: Define IEEE_COMPLEX_DIVIDE.
+ * libF77/[cz]_div.c: Arrange for compilation under
+ -DIEEE_COMPLEX_DIVIDE to make these routines
+ avoid calling sig_die when the denominator vanishes.
+ * libF77/s_rnge.c: Add casts for the case of
+ sizeof(ftnint) == sizeof(int) < sizeof(long).
+ * libI77/endfile.c: Set state to writing (b->uwrt = 1) when an
+ endfile statement requires copying the file
+ Also, supply a missing (long) cast in the sprintf call.
+ * libI77/sfe.c: Add #ifdef ALWAYS_FLUSH logic, for formatted I/O.
-Mon Aug 16 01:29:24 PDT 1999 Jeff Law (law@cygnus.com)
+Wed Feb 16 11:10:05 2000 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
- * gcc-2.95.1 Released.
+ * configure.in (gcc_version): When setting, narrow search to
+ lines containing `version_string'.
-Fri Aug 6 23:32:29 1999 Daniel Jacobowitz <drow@drow.them.org>
+Tue Nov 16 20:39:42 1999 Geoffrey Keating <geoffk@cygnus.com>
- * Makefile.in (FLAGS_TO_PASS): Include prefix, exec_prefix,
- libdir, libsubdir and tooldir.
+ * libU77/u77-test.f (wd): Allow for longer working directory
+ pathnames.
+
+1999-10-14 Theo Papadopoulo <Theodore.Papadopoulo@sophia.inria.fr>
+
+ * libU77/acconfig.h: Define GETTIMEOFDAY_ONE_ARGUMENT and
+ HAVE_TIMEZONE in acconfig.h.
+ * libU77/config.hin: Rebuilt.
+
+1999-10-12 Dave Love <fx@gnu.org>
-Wed Jul 28 21:39:31 PDT 1999 Jeff Law (law@cygnus.com)
+ * libU77/aclocal.m4: Re-write, defining LIBU77_GETTIMEOFDAY, not
+ LIBU77_HAVE_STRUCT_TIMEZONE.
- * gcc-2.95 Released.
+ * libU77/configure.in: Use LIBU77_GETTIMEOFDAY, not
+ LIBU77_HAVE_STRUCT_TIMEZONE. Don't check for gettimeofday
+ separately.
- * libF77/Version.c: No longer a prerelease.
- * libI77/Version.c: No longer a prerelease.
- * libU77/Version.c: No longer a prerelease.
+ * libU77/datetime_.c (G77_date_and_time_0): Use
+ GETTIMEOFDAY_ONE_ARGUMENT.
+
+Tue Sep 14 01:44:01 1999 Marc Espie <espie@cvs.openbsd.org>
+
+ * Makefile.in: Prepend $(SHELL) to move-if-change calls.
+
+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 7 15:58:16 1999 Craig Burley <craig@jcb-sc.com>
@@ -32,10 +69,28 @@ Wed Jul 7 15:58:16 1999 Craig Burley <craig@jcb-sc.com>
* libU77/Version.c: Bump version.
-Mon Jun 28 10:22:30 1999 Craig Burley <craig@jcb-sc.com>
+Mon Jun 28 21:27:08 1999 Craig Burley <craig@jcb-sc.com>
+
+ Update to Netlib version of 1999-06-28:
+ * changes.netlib, libI77/Version.c, libI77/rsne.c
+ readme.netlib: See changes.netlib for info.
+
+Fri Jun 18 11:38:07 1999 Craig Burley <craig@jcb-sc.com>
- * libI77/rsne.c: Fix NAMELIST bug by applying 19990627
- Netlib patch to release branch.
+ * libU77/ttynam_.c: if !defined (HAVE_TTYNAM),
+ write all spaces into return value instead of trying
+ to return -1 from a void function.
+
+Fri Jun 18 11:22:21 1999 Craig Burley <craig@jcb-sc.com>
+
+ Update to Netlib version of 1999-05-10:
+ * changes.netlib, libI77/Version.c, libI77/backspace.c
+ readme.netlib: See changes.netlib for info.
+
+Fri Jun 18 11:15:24 1999 Craig Burley <craig@jcb-sc.com>
+
+ * libI77/backspace.c: Undo Wednesday's change, in
+ preparation for slightly different Netlib change.
Wed Jun 16 11:38:58 1999 Craig Burley <craig@jcb-sc.com>
@@ -142,9 +197,9 @@ Sat Apr 24 11:02:48 1999 Craig Burley <craig@jcb-sc.com>
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.
+ * 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>
@@ -173,11 +228,11 @@ Wed Mar 31 13:50:24 1999 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* 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: 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_...'.
+ * configure.in: Use `g77_cv_...', not `f77_cv_...'.
Wed Mar 24 22:41:28 1999 Mumit Khan <khan@xraylith.wisc.edu>
diff --git a/contrib/libf2c/Makefile.in b/contrib/libf2c/Makefile.in
index 790e6cd86600..9075360fe9bb 100644
--- a/contrib/libf2c/Makefile.in
+++ b/contrib/libf2c/Makefile.in
@@ -179,7 +179,7 @@ g2c.h: g2c.hin config.status Makefile
# lines below, since g2c.h isn't necessarily brought up to date.
# mv g2c.h g2c.x
$(SHELL) config.status
-# $(srcdir)/../move-if-change g2c.h g2c.x && mv g2c.x g2c.h
+# $(SHELL) $(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 $(SHELL)?
diff --git a/contrib/libf2c/changes.netlib b/contrib/libf2c/changes.netlib
index a5252202bdbf..4ec0e7f58253 100644
--- a/contrib/libf2c/changes.netlib
+++ b/contrib/libf2c/changes.netlib
@@ -3014,3 +3014,13 @@ Mon May 3 13:14:07 EDT 1999
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.
+
+Fri Jun 18 02:33:08 EDT 1999
+ libf2c.zip: rename backspace.c backspac.c, and fix a glitch in it
+-- b->ufd may change in t_runc(). (For now, it's still backspace.c
+in the libi77 bundle.)
+
+Sun Jun 27 22:05:47 EDT 1999
+ libf2c.zip, libi77: rsne.c: fix bug in namelist input: a misplaced
+increment could cause wrong array elements to be assigned; e.g.,
+"&input k(5)=10*1 &end" assigned k(5) and k(15 .. 23).
diff --git a/contrib/libf2c/configure b/contrib/libf2c/configure
index a1823685fe72..a397534e2e4f 100755
--- a/contrib/libf2c/configure
+++ b/contrib/libf2c/configure
@@ -1057,171 +1057,42 @@ then the target library, then build with \`LANGUAGES=f77'." 1>&2; exit 1; }
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 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:1065: checking f2c integer type" >&5
-# Set this back later below!
-late_ac_cpp=$ac_cpp
-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 "checking for built-in g77 integer types""... $ac_c" 1>&6
+echo "configure:1062: checking for built-in g77 integer types" >&5
+if eval "test \"`echo '$''{'libf2c_cv_has_g77_builtin_types'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- echo "configure:1101: using $ac_cpp" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1103 "configure"
-#include "confdefs.h"
-#include "proj.h"
-#define FFECOM_DETERMINE_TYPES 1
-#include "com.h"
-#if FFECOM_f2cINTEGER == FFECOM_f2ccodeLONG
-F2C_INTEGER=long int
-#elif FFECOM_f2cINTEGER == FFECOM_f2ccodeINT
-F2C_INTEGER=int
-#else
-# error "Cannot find a suitable type for F2C_INTEGER"
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "F2C_INTEGER=long int" >/dev/null 2>&1; then
- rm -rf conftest*
- g77_cv_sys_f2cinteger="long int"
-fi
-rm -f conftest*
-
-if test "$g77_cv_sys_f2cinteger" = ""; then
-echo "configure:1125: using $ac_cpp" >&5
cat > conftest.$ac_ext <<EOF
-#line 1127 "configure"
+#line 1067 "configure"
#include "confdefs.h"
-#include "proj.h"
-#define FFECOM_DETERMINE_TYPES 1
-#include "com.h"
-#if FFECOM_f2cINTEGER == FFECOM_f2ccodeLONG
-F2C_INTEGER=long int
-#elif FFECOM_f2cINTEGER == FFECOM_f2ccodeINT
-F2C_INTEGER=int
-#else
-# error "Cannot find a suitable type for F2C_INTEGER"
-#endif
+int main() {
+__g77_integer g77i;
+__g77_uinteger g77ui;
+__g77_longint g77l;
+__g77_ulongint g77ul;
+; return 0; }
EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "F2C_INTEGER=int" >/dev/null 2>&1; then
+if { (eval echo configure:1077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- g77_cv_sys_f2cinteger=int
-fi
-rm -f conftest*
-
-fi
-if test "$g77_cv_sys_f2cinteger" = ""; then
- echo "$ac_t""""" 1>&6
- { echo "configure: error: Can't determine type for f2c integer; config.log may help." 1>&2; exit 1; }
-fi
-
-fi
-
-echo "$ac_t""$g77_cv_sys_f2cinteger" 1>&6
-F2C_INTEGER=$g77_cv_sys_f2cinteger
-
-
-echo $ac_n "checking f2c long int type""... $ac_c" 1>&6
-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
+ libf2c_cv_has_g77_builtin_types=yes
else
- echo "configure:1165: using $ac_cpp" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1167 "configure"
-#include "confdefs.h"
-#include "proj.h"
-#define FFECOM_DETERMINE_TYPES 1
-#include "com.h"
-#if FFECOM_f2cLONGINT == FFECOM_f2ccodeLONG
-F2C_LONGINT=long int
-#elif FFECOM_f2cLONGINT == FFECOM_f2ccodeLONGLONG
-F2C_LONGINT=long long int
-#else
-# error "Cannot find a suitable type for F2C_LONGINT"
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "F2C_LONGINT=long int" >/dev/null 2>&1; then
- rm -rf conftest*
- g77_cv_sys_f2clongint="long int"
-fi
-rm -f conftest*
-
-
-if test "$g77_cv_sys_f2clongint" = ""; then
-echo "configure:1190: using $ac_cpp" >&5
- cat > conftest.$ac_ext <<EOF
-#line 1192 "configure"
-#include "confdefs.h"
-#include "proj.h"
-#define FFECOM_DETERMINE_TYPES 1
-#include "com.h"
-#if FFECOM_f2cLONGINT == FFECOM_f2ccodeLONG
-F2C_LONGINT=long int
-#elif FFECOM_f2cLONGINT == FFECOM_f2ccodeLONGLONG
-F2C_LONGINT=long long int
-#else
-# error "Cannot find a suitable type for F2C_LONGINT"
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "F2C_LONGINT=long long int" >/dev/null 2>&1; then
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
- g77_cv_sys_f2clongint="long long int"
+ libf2c_cv_has_g77_builtin_types=no
fi
rm -f conftest*
-
-fi
-if test "$g77_cv_sys_f2clongint" = ""; then
- echo "$ac_t""""" 1>&6
- { echo "configure: error: Can't determine type for f2c long int; config.log may help." 1>&2; exit 1; }
fi
+echo "$ac_t""$libf2c_cv_has_g77_builtin_types" 1>&6
+if test $libf2c_cv_has_g77_builtin_types = no; then
+ { echo "configure: error: gcc doesn't define all of the built in types __g77_integer,
+__g77_uinteger, __g77_longint, and __g77_ulongint. You may not be using
+a new enough version of gcc, or your target may not have type sizes which
+accommodate those types." 1>&2; exit 1; }
fi
-echo "$ac_t""$g77_cv_sys_f2clongint" 1>&6
-F2C_LONGINT=$g77_cv_sys_f2clongint
-
-ac_cpp=$late_ac_cpp
-
# avoid confusion in case the `makefile's from the f2c distribution have
# got put here
test -f libF77/makefile && mv libF77/makefile libF77/makefile.ori
@@ -1231,7 +1102,7 @@ test -f libU77/makefile && mv libU77/makefile libU77/makefile.ori
# Get the version trigger filename from the toplevel
if [ "${with_gcc_version_trigger+set}" = set ]; then
gcc_version_trigger=$with_gcc_version_trigger
- gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${gcc_version_trigger}`
+ gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
else
gcc_version_trigger=
gcc_version=UNKNOWN
@@ -1267,7 +1138,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:1271: checking host system type" >&5
+echo "configure:1142: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -1288,7 +1159,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:1292: checking target system type" >&5
+echo "configure:1163: checking target system type" >&5
target_alias=$target
case "$target_alias" in
@@ -1306,7 +1177,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:1310: checking build system type" >&5
+echo "configure:1181: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -1487,8 +1358,6 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@SET_MAKE@%$SET_MAKE%g
s%@CPP@%$CPP%g
-s%@F2C_INTEGER@%$F2C_INTEGER%g
-s%@F2C_LONGINT@%$F2C_LONGINT%g
s%@gcc_version@%$gcc_version%g
s%@gcc_version_trigger@%$gcc_version_trigger%g
s%@host@%$host%g
diff --git a/contrib/libf2c/configure.in b/contrib/libf2c/configure.in
index a4c502c2424f..bf8010cd134e 100644
--- a/contrib/libf2c/configure.in
+++ b/contrib/libf2c/configure.in
@@ -89,109 +89,23 @@ including headers and, preferably, the library, before you can configure
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 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
-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,
-[#include "proj.h"
-#define FFECOM_DETERMINE_TYPES 1
-#include "com.h"
-#if FFECOM_f2cINTEGER == FFECOM_f2ccodeLONG
-F2C_INTEGER=long int
-#elif FFECOM_f2cINTEGER == FFECOM_f2ccodeINT
-F2C_INTEGER=int
-#else
-# error "Cannot find a suitable type for F2C_INTEGER"
-#endif
-],
- g77_cv_sys_f2cinteger="long int",)
-if test "$g77_cv_sys_f2cinteger" = ""; then
-echo "configure:__oline__: using $ac_cpp" >&AC_FD_CC
- AC_EGREP_CPP(F2C_INTEGER=int,
-[#include "proj.h"
-#define FFECOM_DETERMINE_TYPES 1
-#include "com.h"
-#if FFECOM_f2cINTEGER == FFECOM_f2ccodeLONG
-F2C_INTEGER=long int
-#elif FFECOM_f2cINTEGER == FFECOM_f2ccodeINT
-F2C_INTEGER=int
-#else
-# error "Cannot find a suitable type for F2C_INTEGER"
-#endif
-],
- g77_cv_sys_f2cinteger=int,)
-fi
-if test "$g77_cv_sys_f2cinteger" = ""; then
- AC_MSG_RESULT("")
- AC_MSG_ERROR([Can't determine type for f2c integer; config.log may help.])
+dnl Checks for g77 integer types built into gcc's C front end.
+AC_MSG_CHECKING(for built-in g77 integer types)
+AC_CACHE_VAL(libf2c_cv_has_g77_builtin_types,
+[AC_TRY_COMPILE(,
+ [__g77_integer g77i;
+__g77_uinteger g77ui;
+__g77_longint g77l;
+__g77_ulongint g77ul;],
+ libf2c_cv_has_g77_builtin_types=yes,
+ libf2c_cv_has_g77_builtin_types=no)])
+AC_MSG_RESULT($libf2c_cv_has_g77_builtin_types)
+if test $libf2c_cv_has_g77_builtin_types = no; then
+ AC_MSG_ERROR([gcc doesn't define all of the built in types __g77_integer,
+__g77_uinteger, __g77_longint, and __g77_ulongint. You may not be using
+a new enough version of gcc, or your target may not have type sizes which
+accommodate those types.])
fi
-)
-AC_MSG_RESULT($g77_cv_sys_f2cinteger)
-F2C_INTEGER=$g77_cv_sys_f2cinteger
-AC_SUBST(F2C_INTEGER)
-
-AC_MSG_CHECKING(f2c long int type)
-AC_CACHE_VAL(g77_cv_sys_f2clongint,
-echo "configure:__oline__: using $ac_cpp" >&AC_FD_CC
-AC_EGREP_CPP(F2C_LONGINT=long int,
-[#include "proj.h"
-#define FFECOM_DETERMINE_TYPES 1
-#include "com.h"
-#if FFECOM_f2cLONGINT == FFECOM_f2ccodeLONG
-F2C_LONGINT=long int
-#elif FFECOM_f2cLONGINT == FFECOM_f2ccodeLONGLONG
-F2C_LONGINT=long long int
-#else
-# error "Cannot find a suitable type for F2C_LONGINT"
-#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,
-[#include "proj.h"
-#define FFECOM_DETERMINE_TYPES 1
-#include "com.h"
-#if FFECOM_f2cLONGINT == FFECOM_f2ccodeLONG
-F2C_LONGINT=long int
-#elif FFECOM_f2cLONGINT == FFECOM_f2ccodeLONGLONG
-F2C_LONGINT=long long int
-#else
-# error "Cannot find a suitable type for F2C_LONGINT"
-#endif
-],
- g77_cv_sys_f2clongint="long long int",)
-fi
-if test "$g77_cv_sys_f2clongint" = ""; then
- AC_MSG_RESULT("")
- AC_MSG_ERROR([Can't determine type for f2c long int; config.log may help.])
-fi
-)
-AC_MSG_RESULT($g77_cv_sys_f2clongint)
-F2C_LONGINT=$g77_cv_sys_f2clongint
-AC_SUBST(F2C_LONGINT)
-ac_cpp=$late_ac_cpp
# avoid confusion in case the `makefile's from the f2c distribution have
# got put here
@@ -202,7 +116,7 @@ test -f libU77/makefile && mv libU77/makefile libU77/makefile.ori
# Get the version trigger filename from the toplevel
if [[ "${with_gcc_version_trigger+set}" = set ]]; then
gcc_version_trigger=$with_gcc_version_trigger
- gcc_version=`sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/' < ${gcc_version_trigger}`
+ gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/'`
else
gcc_version_trigger=
gcc_version=UNKNOWN
diff --git a/contrib/libf2c/g2c.hin b/contrib/libf2c/g2c.hin
index d8fed9c25788..57947ce6e80e 100644
--- a/contrib/libf2c/g2c.hin
+++ b/contrib/libf2c/g2c.hin
@@ -18,20 +18,20 @@
/* F2C_INTEGER will normally be `int' but would be `long' on 16-bit systems */
/* we assume short, float are OK */
-typedef @F2C_INTEGER@ /* long int */ integer;
-typedef unsigned @F2C_INTEGER@ /* long */ uinteger;
+typedef __g77_integer integer;
+typedef __g77_uinteger uinteger;
typedef char *address;
typedef short int shortint;
typedef float real;
typedef double doublereal;
typedef struct { real r, i; } complex;
typedef struct { doublereal r, i; } doublecomplex;
-typedef @F2C_INTEGER@ /* long int */ logical;
+typedef __g77_integer logical;
typedef short int shortlogical;
typedef char logical1;
typedef char integer1;
-typedef @F2C_LONGINT@ /* long long */ longint; /* system-dependent */
-typedef unsigned @F2C_LONGINT@ /* long long */ ulongint; /* system-dependent */
+typedef __g77_longint longint; /* system-dependent */
+typedef __g77_ulongint ulongint; /* system-dependent */
#define qbit_clear(a,b) ((a) & ~((ulongint)1 << (b)))
#define qbit_set(a,b) ((a) | ((ulongint)1 << (b)))
@@ -52,9 +52,9 @@ typedef short flag;
typedef short ftnlen;
typedef short ftnint;
#else
-typedef @F2C_INTEGER@ /* long int */ flag;
-typedef @F2C_INTEGER@ /* long int */ ftnlen;
-typedef @F2C_INTEGER@ /* long int */ ftnint;
+typedef __g77_integer flag;
+typedef __g77_integer ftnlen;
+typedef __g77_integer ftnint;
#endif
/*external read, write*/
diff --git a/contrib/libf2c/libF77/Version.c b/contrib/libf2c/libF77/Version.c
index 57637271a0b8..8705161c2682 100644
--- a/contrib/libf2c/libF77/Version.c
+++ b/contrib/libf2c/libF77/Version.c
@@ -1,9 +1,9 @@
-static char junk[] = "\n@(#)LIBF77 VERSION 19990503\n";
+static char junk[] = "\n@(#)LIBF77 VERSION 19991115\n";
/*
*/
-char __G77_LIBF77_VERSION__[] = "0.5.25 19991024 (release)";
+char __G77_LIBF77_VERSION__[] = "0.5.25 20000603 (prerelease)";
/*
2.00 11 June 1980. File version.c added to library.
@@ -61,6 +61,14 @@ char __G77_LIBF77_VERSION__[] = "0.5.25 19991024 (release)";
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.
+ 7 Sept. 1999: [cz]_div.c: arrange for compilation under
+ -DIEEE_COMPLEX_DIVIDE to make these routines
+ avoid calling sig_die when the denominator
+ vanishes; instead, they return pairs of NaNs
+ or Infinities, depending whether the numerator
+ also vanishes or not. VERSION not changed.
+ 15 Nov. 1999: s_rnge.c: add casts for the case of
+ sizeof(ftnint) == sizeof(int) < sizeof(long).
*/
#include <stdio.h>
diff --git a/contrib/libf2c/libF77/c_div.c b/contrib/libf2c/libF77/c_div.c
index ac963079ba29..4d153b4c4afc 100644
--- a/contrib/libf2c/libF77/c_div.c
+++ b/contrib/libf2c/libF77/c_div.c
@@ -18,8 +18,18 @@ void c_div(complex *c, complex *a, complex *b)
abi = - abi;
if( abr <= abi )
{
- if(abi == 0)
+ if(abi == 0) {
+#ifdef IEEE_COMPLEX_DIVIDE
+ float af, bf;
+ af = bf = abr;
+ if (a->i != 0 || a->r != 0)
+ af = 1.;
+ c->i = c->r = af / bf;
+ return;
+#else
sig_die("complex division by zero", 1);
+#endif
+ }
ratio = (double)b->r / b->i ;
den = b->i * (1 + ratio*ratio);
cr = (a->r*ratio + a->i) / den;
diff --git a/contrib/libf2c/libF77/configure b/contrib/libf2c/libF77/configure
index b5622e06bf41..b4ea9f3a8596 100755
--- a/contrib/libf2c/libF77/configure
+++ b/contrib/libf2c/libF77/configure
@@ -1310,6 +1310,10 @@ cat >> confdefs.h <<\EOF
#define Skip_f2c_Undefs 1
EOF
+cat >> confdefs.h <<\EOF
+#define IEEE_COMPLEX_DIVIDE 1
+EOF
+
trap '' 1 2 15
cat > confcache <<\EOF
diff --git a/contrib/libf2c/libF77/configure.in b/contrib/libf2c/libF77/configure.in
index 5a3aa1a8d83f..a9f282ee3f69 100644
--- a/contrib/libf2c/libF77/configure.in
+++ b/contrib/libf2c/libF77/configure.in
@@ -98,6 +98,7 @@ dnl Unfortunately, the message implies we're just checking for -lm...
AC_CHECK_LIB(m,drem,AC_DEFINE(IEEE_drem))
AC_DEFINE(Skip_f2c_Undefs)
+AC_DEFINE(IEEE_COMPLEX_DIVIDE)
AC_OUTPUT(Makefile)
diff --git a/contrib/libf2c/libF77/s_rnge.c b/contrib/libf2c/libF77/s_rnge.c
index fbe3219d580b..766889bbfa59 100644
--- a/contrib/libf2c/libF77/s_rnge.c
+++ b/contrib/libf2c/libF77/s_rnge.c
@@ -13,10 +13,12 @@ integer s_rnge(char *varn, ftnint offset, char *procn, ftnint line)
{
register int i;
-fprintf(stderr, "Subscript out of range on file line %ld, procedure ", line);
+fprintf(stderr, "Subscript out of range on file line %ld, procedure ",
+ (long)line);
while((i = *procn) && i != '_' && i != ' ')
putc(*procn++, stderr);
-fprintf(stderr, ".\nAttempt to access the %ld-th element of variable ", offset+1);
+fprintf(stderr, ".\nAttempt to access the %ld-th element of variable ",
+ (long)offset+1);
while((i = *varn) && i != ' ')
putc(*varn++, stderr);
sig_die(".", 1);
diff --git a/contrib/libf2c/libF77/z_div.c b/contrib/libf2c/libF77/z_div.c
index 22153fa4514a..e14df32a1f8a 100644
--- a/contrib/libf2c/libF77/z_div.c
+++ b/contrib/libf2c/libF77/z_div.c
@@ -17,8 +17,16 @@ void z_div(doublecomplex *c, doublecomplex *a, doublecomplex *b)
abi = - abi;
if( abr <= abi )
{
- if(abi == 0)
+ if(abi == 0) {
+#ifdef IEEE_COMPLEX_DIVIDE
+ if (a->i != 0 || a->r != 0)
+ abi = 1.;
+ c->i = c->r = abi / abr;
+ return;
+#else
sig_die("complex division by zero", 1);
+#endif
+ }
ratio = b->r / b->i ;
den = b->i * (1 + ratio*ratio);
cr = (a->r*ratio + a->i) / den;
diff --git a/contrib/libf2c/libI77/Version.c b/contrib/libf2c/libI77/Version.c
index ca5870c299ba..adc2311a6568 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 19990503\n";
+static char junk[] = "\n@(#) LIBI77 VERSION pjw,dmg-mods 19991115\n";
/*
*/
-char __G77_LIBI77_VERSION__[] = "0.5.25 19991024 (release)";
+char __G77_LIBI77_VERSION__[] = "0.5.25 20000603 (prerelease)";
/*
2.01 $ format added
@@ -301,6 +301,19 @@ wrtfmt.c:
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. */
+/* 18 June 1999: backspace.c: allow for b->ufd changing in t_runc */
+/* 27 June 1999: rsne.c: fix bug in namelist input: a misplaced increment */
+/* could cause wrong array elements to be assigned; e.g., */
+/* "&input k(5)=10*1 &end" assigned k(5) and k(15..23) */
+/* 15 Nov. 1999: endfile.c: set state to writing (b->uwrt = 1) when an */
+/* endfile statement requires copying the file. */
+/* (Otherwise an immediately following rewind statement */
+/* could make the file appear empty.) Also, supply a */
+/* missing (long) cast in the sprintf call. */
+/* sfe.c: add #ifdef ALWAYS_FLUSH logic, for formatted I/O: */
+/* Compiling libf2c with -DALWAYS_FLUSH should prevent losing */
+/* any data in buffers should the program fault. It also */
+/* makes the program run more slowly. */
diff --git a/contrib/libf2c/libI77/backspace.c b/contrib/libf2c/libI77/backspace.c
index eca1708a3c89..1968801aab75 100644
--- a/contrib/libf2c/libI77/backspace.c
+++ b/contrib/libf2c/libI77/backspace.c
@@ -17,7 +17,7 @@ integer f_back(alist *a)
if(a->aunit >= MXUNIT || a->aunit < 0)
err(a->aerr,101,"backspace");
if(b->useek==0) err(a->aerr,106,"backspace");
- if((f = b->ufd) == NULL) {
+ if(b->ufd == NULL) {
fk_open(1, 1, a->aunit);
return(0);
}
@@ -26,11 +26,11 @@ integer f_back(alist *a)
return(0);
}
if(b->uwrt) {
- (void) t_runc(a);
- f = b->ufd; /* t_runc might change b->ufd */
+ t_runc(a);
if (f__nowreading(b))
err(a->aerr,errno,"backspace");
}
+ f = b->ufd; /* may have changed in t_runc() */
if(b->url>0)
{
x=ftell(f);
diff --git a/contrib/libf2c/libI77/endfile.c b/contrib/libf2c/libI77/endfile.c
index 8e3e8c48fc7f..f7a78e12555c 100644
--- a/contrib/libf2c/libI77/endfile.c
+++ b/contrib/libf2c/libI77/endfile.c
@@ -29,7 +29,7 @@ integer f_end(alist *a)
b = &f__units[a->aunit];
if(b->ufd==NULL) {
char nbuf[10];
- sprintf(nbuf,"fort.%ld",a->aunit);
+ sprintf(nbuf,"fort.%ld",(long)a->aunit);
if (tf = fopen(nbuf, f__w_mode[0]))
fclose(tf);
return(0);
diff --git a/contrib/libf2c/libI77/sfe.c b/contrib/libf2c/libI77/sfe.c
index f7c3b83b734f..77ade5b5a7f5 100644
--- a/contrib/libf2c/libI77/sfe.c
+++ b/contrib/libf2c/libI77/sfe.c
@@ -30,5 +30,9 @@ integer e_wsfe(Void)
f__init = 1;
n = en_fio();
f__fmtbuf=NULL;
+#ifdef ALWAYS_FLUSH
+ if (!n && fflush(f__cf))
+ err(f__elist->cierr, errno, "write end");
+#endif
return n;
}
diff --git a/contrib/libf2c/libU77/Version.c b/contrib/libf2c/libU77/Version.c
index 0d7238180bbf..fb31ed4fa36c 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.25 19991024 (release)";
+char __G77_LIBU77_VERSION__[] = "0.5.25 20000603 (prerelease)";
#include <stdio.h>
diff --git a/contrib/libf2c/libU77/acconfig.h b/contrib/libf2c/libU77/acconfig.h
index 1400ba589b23..778e15410c85 100644
--- a/contrib/libf2c/libU77/acconfig.h
+++ b/contrib/libf2c/libU77/acconfig.h
@@ -4,3 +4,8 @@
/* Define if your sys/time.h defines struct timezone. */
#undef HAVE_STRUCT_TIMEZONE
+/* Define if your gettimeofday takes only one argument. */
+#undef GETTIMEOFDAY_ONE_ARGUMENT
+
+/* Define if your gettimeofday takes a time zome argument. */
+#undef HAVE_TIMEZONE
diff --git a/contrib/libf2c/libU77/aclocal.m4 b/contrib/libf2c/libU77/aclocal.m4
index d230dadf8079..b9a74fd82f61 100644
--- a/contrib/libf2c/libU77/aclocal.m4
+++ b/contrib/libf2c/libU77/aclocal.m4
@@ -1,16 +1,64 @@
-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
-
+dnl Check:
+dnl * If we have gettimeofday;
+dnl * If we have struct timezone for use in calling it;
+dnl * If calling it with a timezone pointer actually works -- this is deemed
+dnl obsolete or undefined on some systems which say you should use a null
+dnl pointer -- and undefine HAVE_TIMEZONE if so;
+dnl * Whether it only takes one arg.
+AC_DEFUN(LIBU77_GETTIMEOFDAY, [
+ AC_CHECK_FUNCS(gettimeofday)
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ AC_CACHE_CHECK([for struct timezone], g77_cv_struct_timezone,
+ [AC_TRY_COMPILE([#include <sys/time.h>],
+ [struct timezone tz;],
+ g77_cv_struct_timezone=yes, g77_cv_struct_timezone=no)])
+ if test $g77_cv_struct_timezone = yes; then
+ dnl It may be that we can't call gettimeofday with a non-null pointer.
+ dnl In that case we'll lie about struct timezone.
+ AC_TRY_RUN([
+#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif
+main ()
+{
+ struct timeval time;
+ struct timezone dummy;
+ if (gettimeofday (&time, &dummy))
+ exit (1);
+ else
+ exit (0);
+}],
+ [AC_DEFINE(HAVE_TIMEZONE)], ,[AC_DEFINE(HAVE_TIMEZONE)])
+ fi
+ AC_REQUIRE([AC_HEADER_TIME])
+ AC_CACHE_CHECK(whether gettimeofday can accept two arguments,
+ emacs_cv_gettimeofday_two_arguments,
+ AC_TRY_LINK([
+#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif
+ ],
+ [
+ struct timeval time;
+ struct timezone dummy;
+ gettimeofday (&time, &dummy);],
+ emacs_cv_gettimeofday_two_arguments=yes,
+ emacs_cv_gettimeofday_two_arguments=no))
+ if test $emacs_cv_gettimeofday_two_arguments = no; then
+ AC_DEFINE(GETTIMEOFDAY_ONE_ARGUMENT)
+ fi
+ fi])
diff --git a/contrib/libf2c/libU77/config.hin b/contrib/libf2c/libU77/config.hin
index 27a89c05bb99..19f5399d5385 100644
--- a/contrib/libf2c/libU77/config.hin
+++ b/contrib/libf2c/libU77/config.hin
@@ -33,8 +33,11 @@
/* 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 your gettimeofday takes only one argument. */
+#undef GETTIMEOFDAY_ONE_ARGUMENT
+
+/* Define if your gettimeofday takes a time zome argument. */
+#undef HAVE_TIMEZONE
/* Define if you have the alarm function. */
#undef HAVE_ALARM
diff --git a/contrib/libf2c/libU77/configure b/contrib/libf2c/libU77/configure
index fc8a4908c9f5..b9a3b22e05e6 100755
--- a/contrib/libf2c/libU77/configure
+++ b/contrib/libf2c/libU77/configure
@@ -1448,16 +1448,15 @@ fi
for ac_func in symlink getcwd getwd lstat gethostname strerror clock \
- getrusage times alarm getlogin getgid getuid kill link ttyname \
- gettimeofday
+ getrusage times alarm getlogin getgid getuid kill link ttyname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1456: checking for $ac_func" >&5
+echo "configure:1455: 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 1461 "configure"
+#line 1460 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1480,7 +1479,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1483: \"$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
@@ -1504,46 +1503,188 @@ else
fi
done
-test $ac_cv_func_symlink = yes && MAYBES="$MAYBES symlnk_.o"
-test $ac_cv_func_lstat = yes && MAYBES="$MAYBES lstat_.o"
-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
+ for ac_func in gettimeofday
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:1512: 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 1520 "configure"
+#line 1517 "configure"
#include "confdefs.h"
-#include <sys/time.h>
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
int main() {
-struct timezone tz;
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
; return 0; }
EOF
-if { (eval echo configure:1527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- libu77_ac_have_struct_timezone=yes
+ eval "ac_cv_func_$ac_func=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- libu77_ac_have_struct_timezone=no
+ eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
fi
-if test $libu77_ac_have_struct_timezone = yes; then
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
cat >> confdefs.h <<EOF
-#define HAVE_STRUCT_TIMEZONE 1
+#define $ac_tr_func 1
EOF
-
+
else
echo "$ac_t""no" 1>&6
fi
+done
+
+ if test "$ac_cv_func_gettimeofday" = yes; then
+ echo $ac_n "checking for struct timezone""... $ac_c" 1>&6
+echo "configure:1566: checking for struct timezone" >&5
+if eval "test \"`echo '$''{'g77_cv_struct_timezone'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1571 "configure"
+#include "confdefs.h"
+#include <sys/time.h>
+int main() {
+struct timezone tz;
+; return 0; }
+EOF
+if { (eval echo configure:1578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ g77_cv_struct_timezone=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ g77_cv_struct_timezone=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$g77_cv_struct_timezone" 1>&6
+ if test $g77_cv_struct_timezone = yes; then
+ if test "$cross_compiling" = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_TIMEZONE 1
+EOF
+
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1599 "configure"
+#include "confdefs.h"
+
+#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif
+main ()
+{
+ struct timeval time;
+ struct timezone dummy;
+ if (gettimeofday (&time, &dummy))
+ exit (1);
+ else
+ exit (0);
+}
+EOF
+if { (eval echo configure:1622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ cat >> confdefs.h <<\EOF
+#define HAVE_TIMEZONE 1
+EOF
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+fi
+rm -fr conftest*
+fi
+
+ fi
+
+ echo $ac_n "checking whether gettimeofday can accept two arguments""... $ac_c" 1>&6
+echo "configure:1638: checking whether gettimeofday can accept two arguments" >&5
+if eval "test \"`echo '$''{'emacs_cv_gettimeofday_two_arguments'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1643 "configure"
+#include "confdefs.h"
+
+#ifdef TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif
+
+int main() {
+
+ struct timeval time;
+ struct timezone dummy;
+ gettimeofday (&time, &dummy);
+; return 0; }
+EOF
+if { (eval echo configure:1664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ emacs_cv_gettimeofday_two_arguments=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ emacs_cv_gettimeofday_two_arguments=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$emacs_cv_gettimeofday_two_arguments" 1>&6
+ if test $emacs_cv_gettimeofday_two_arguments = no; then
+ cat >> confdefs.h <<\EOF
+#define GETTIMEOFDAY_ONE_ARGUMENT 1
+EOF
+
+ fi
+ fi
+
+test $ac_cv_func_symlink = yes && MAYBES="$MAYBES symlnk_.o"
+test $ac_cv_func_lstat = yes && MAYBES="$MAYBES lstat_.o"
+test $ac_cv_func_gethostname = yes && MAYBES="$MAYBES hostnm_.o"
+test $ac_cv_func_clock = yes && MAYBES="$MAYBES mclock_.o"
diff --git a/contrib/libf2c/libU77/configure.in b/contrib/libf2c/libU77/configure.in
index 1262645c932f..460e3dc8f0e9 100644
--- a/contrib/libf2c/libU77/configure.in
+++ b/contrib/libf2c/libU77/configure.in
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-# Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1998, 1999 Free Software Foundation, Inc.
# Contributed by Dave Love (d.love@dl.ac.uk).
#
#This file is part of the GNU Fortran libU77 library.
@@ -86,16 +86,19 @@ AC_CHECK_LIB(socket, gethostname, [LIBS="$LIBS -lsocket"])
dnl Checks for library functions.
AC_CHECK_FUNCS(symlink getcwd getwd lstat gethostname strerror clock \
- getrusage times alarm getlogin getgid getuid kill link ttyname \
- gettimeofday)
+ getrusage times alarm getlogin getgid getuid kill link ttyname)
+
+dnl The standard autoconf HAVE_STRUCT_TIMEZONE doesn't actually check
+dnl for struct timezone, as you might think. We also need to check how
+dnl to call gettimeofday if we have it.
+LIBU77_GETTIMEOFDAY
+
test $ac_cv_func_symlink = yes && MAYBES="$MAYBES symlnk_.o"
test $ac_cv_func_lstat = yes && MAYBES="$MAYBES lstat_.o"
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)
AC_SUBST(RANLIB_TEST)
diff --git a/contrib/libf2c/libU77/datetime_.c b/contrib/libf2c/libU77/datetime_.c
index faf773a944c2..1ea77319e968 100644
--- a/contrib/libf2c/libU77/datetime_.c
+++ b/contrib/libf2c/libU77/datetime_.c
@@ -57,24 +57,30 @@ int G77_date_and_time_0 (char *date, char *fftime, char *zone,
vals[4] = ltime.tm_hour;
vals[5] = ltime.tm_min;
vals[6] = ltime.tm_sec;
- vals[7] = 0; /* no STDC way to get this */
+ vals[7] = 0; /* no STDC/POSIX way to get this */
/* GNUish way; maybe use `ftime' on other systems. */
#if HAVE_GETTIMEOFDAY
{
struct timeval tp;
-#if HAVE_STRUCT_TIMEZONE
+# if GETTIMEOFDAY_ONE_ARGUMENT
+ if (! gettimeofday (&tp))
+# else
+# 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. */
+ /* Some systems such as HPUX, do 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. Configure checks if gettimeofday actually fails with a
+ non-NULL arg and pretends that struct timezone is missing if it
+ does fail. */
if (! gettimeofday (&tp, &tzp))
-#else
+# else
if (! gettimeofday (&tp, (void *) 0))
-#endif
+# endif /* HAVE_STRUCT_TIMEZONE */
+# endif /* GETTIMEOFDAY_ONE_ARGUMENT */
vals[7] = tp.tv_usec/1000;
}
-#endif
+#endif /* HAVE_GETTIMEOFDAY */
if (values) /* null pointer for missing optional */
for (i=0; i<=7; i++)
values[i] = vals[i];
diff --git a/contrib/libf2c/libU77/ttynam_.c b/contrib/libf2c/libU77/ttynam_.c
index cb1d1e9a35cd..c7610fb0c872 100644
--- a/contrib/libf2c/libU77/ttynam_.c
+++ b/contrib/libf2c/libU77/ttynam_.c
@@ -59,6 +59,6 @@ extern void s_copy(register char *a, register char *b, ftnlen la, ftnlen lb);
}
#else
errno = ENOSYS;
- return -1;
+ s_copy (ret_val, " ", ret_val_len, 1);
#endif
}
diff --git a/contrib/libf2c/libU77/u77-test.f b/contrib/libf2c/libU77/u77-test.f
index 65e972a4b8df..3c8151c533df 100644
--- a/contrib/libf2c/libU77/u77-test.f
+++ b/contrib/libf2c/libU77/u77-test.f
@@ -58,8 +58,8 @@
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, ctim2*25
+ character ctim*25, line*80, lognam*20, wd*1000, line2*80,
+ + ddate*8, ttime*10, zone*5, ctim2*25
integer fstatb (13), statb (13)
integer *2 i2zero
integer values(8)
diff --git a/contrib/libf2c/readme.netlib b/contrib/libf2c/readme.netlib
index 406a753cf309..1ec98865e5b3 100644
--- a/contrib/libf2c/readme.netlib
+++ b/contrib/libf2c/readme.netlib
@@ -711,9 +711,20 @@ 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
+ libf77, libf2c.zip: forgot to copy yesterday's latest updates to
netlib.
+Fri Jun 18 02:33:08 EDT 1999
+ libf2c.zip: rename backspace.c backspac.c, and fix a glitch in it
+-- b->ufd may change in t_runc(). (For now, it's still backspace.c
+in the libi77 bundle.)
+
+Sun Jun 27 22:05:47 EDT 1999
+ libf2c.zip, libi77: rsne.c: fix bug in namelist input: a misplaced
+increment could cause wrong array elements to be assigned; e.g.,
+"&input k(5)=10*1 &end" assigned k(5) and k(15 .. 23).
+
+
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
diff --git a/contrib/libstdc++/config/beos.ml b/contrib/libstdc++/config/beos.ml
new file mode 100644
index 000000000000..f90b0b023579
--- /dev/null
+++ b/contrib/libstdc++/config/beos.ml
@@ -0,0 +1,4 @@
+LIBS = $(ARLIB) $(ARLINK) $(SHLIB) mshlink $(SHLINK)
+SHFLAGS = -Wl,-soname,$(MSHLINK)
+DEPLIBS = ../$(SHLIB)
+SHOPT = -nostart