Update to 990629 snapshot

closer to gcc 2.95 release.

18 files changed, 185 insertions, 100 deletions

diff --git a/gnu/egcs/libf2c/ChangeLog b/gnu/egcs/libf2c/ChangeLog
index 43ebb7a6c39..b532aac2645 100644
--- a/gnu/egcs/libf2c/ChangeLog
+++ b/gnu/egcs/libf2c/ChangeLog
@@ -1,3 +1,15 @@
+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:
diff --git a/gnu/egcs/libf2c/libI77/Version.c b/gnu/egcs/libf2c/libI77/Version.c
index 12da19b1915..334ed01b095 100644
--- a/gnu/egcs/libf2c/libI77/Version.c
+++ b/gnu/egcs/libf2c/libI77/Version.c
@@ -3,7 +3,7 @@ static char junk[] = "\n@(#) LIBI77 VERSION pjw,dmg-mods 19990503\n";
 /*
 */
 
-char __G77_LIBI77_VERSION__[] = "0.5.25 19981012 (prerelease)";
+char __G77_LIBI77_VERSION__[] = "0.5.25 19990628 (prerelease)";
 
 /*
 2.01	$ format added
diff --git a/gnu/egcs/libf2c/libI77/backspace.c b/gnu/egcs/libf2c/libI77/backspace.c
index 1da686dbb48..eca1708a3c8 100644
--- a/gnu/egcs/libf2c/libI77/backspace.c
+++ b/gnu/egcs/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/gnu/egcs/libf2c/libI77/rsne.c b/gnu/egcs/libf2c/libI77/rsne.c
index 86bb2164f12..c9d5f1015f4 100644
--- a/gnu/egcs/libf2c/libI77/rsne.c
+++ b/gnu/egcs/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/gnu/egcs/libiberty/ChangeLog b/gnu/egcs/libiberty/ChangeLog
index cb77e8a5c95..7d7b8ca1fde 100644
--- a/gnu/egcs/libiberty/ChangeLog
+++ b/gnu/egcs/libiberty/ChangeLog
@@ -1,3 +1,24 @@
+Thu Jun 24 22:30:22 1999  "Philippe De Muyter" <phdm@macqel.be>
+
+	* setenv.c (sys/types.h, stdio.h): Files included.
+	* xstrdup.c (sys/types.h): File included.
+
+1999-06-21  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* configure.in (checkfuncs): Add gettimeofday.
+	* config.in, configure: Regenerated.
+
+Mon Jun 21 05:56:01 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* configure.in (*-*-uwin*): UWIN has sys_{errlist,nerr} even if
+	the test fails.
+	* configure: Regenerate.
+
+1999-06-10  Mike Stump  <mrs@wrs.com>
+
+	* Makefile.in (setenv.o): Add config.h dep for setenv.o to fix
+	parallel builds.
+
 1999-05-28  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* putenv.c: Include ansidecl.h to define `const'.
diff --git a/gnu/egcs/libiberty/Makefile.in b/gnu/egcs/libiberty/Makefile.in
index 6aaac7f17d1..b4cd7d035d0 100644
--- a/gnu/egcs/libiberty/Makefile.in
+++ b/gnu/egcs/libiberty/Makefile.in
@@ -248,6 +248,7 @@ mkstemps.o: config.h
 objalloc.o: $(INCDIR)/objalloc.h
 obstack.o: config.h $(INCDIR)/obstack.h
 pexecute.o: config.h $(INCDIR)/libiberty.h
+setenv.o: config.h
 spaces.o: $(INCDIR)/libiberty.h
 splay-tree.o: config.h $(INCDIR)/libiberty.h $(INCDIR)/splay-tree.h $(INCDIR)/ansidecl.h
 strerror.o: config.h $(INCDIR)/libiberty.h
diff --git a/gnu/egcs/libiberty/config.in b/gnu/egcs/libiberty/config.in
index 520729f894e..7869127ecce 100644
--- a/gnu/egcs/libiberty/config.in
+++ b/gnu/egcs/libiberty/config.in
@@ -85,6 +85,9 @@
 /* Define if you have the getrusage function.  */
 #undef HAVE_GETRUSAGE
 
+/* Define if you have the gettimeofday function.  */
+#undef HAVE_GETTIMEOFDAY
+
 /* Define if you have the index function.  */
 #undef HAVE_INDEX
 
@@ -115,6 +118,9 @@
 /* Define if you have the psignal function.  */
 #undef HAVE_PSIGNAL
 
+/* Define if you have the putenv function.  */
+#undef HAVE_PUTENV
+
 /* Define if you have the random function.  */
 #undef HAVE_RANDOM
 
@@ -127,6 +133,9 @@
 /* Define if you have the sbrk function.  */
 #undef HAVE_SBRK
 
+/* Define if you have the setenv function.  */
+#undef HAVE_SETENV
+
 /* Define if you have the sigsetmask function.  */
 #undef HAVE_SIGSETMASK
 
@@ -202,6 +211,9 @@
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
 
+/* Define if you have the <sys/resource.h> header file.  */
+#undef HAVE_SYS_RESOURCE_H
+
 /* Define if you have the <sys/time.h> header file.  */
 #undef HAVE_SYS_TIME_H
 
diff --git a/gnu/egcs/libiberty/configure b/gnu/egcs/libiberty/configure
index fe898a5e807..25daa27c372 100644
--- a/gnu/egcs/libiberty/configure
+++ b/gnu/egcs/libiberty/configure
@@ -1185,7 +1185,7 @@ funcs="$funcs waitpid"
 
 vars="sys_errlist sys_nerr sys_siglist"
 
-checkfuncs="getrusage on_exit psignal strerror strsignal sysconf times sbrk"
+checkfuncs="getrusage on_exit psignal strerror strsignal sysconf times sbrk gettimeofday"
 
 # These are neither executed nor required, but they help keep
 # autoheader happy without adding a bunch of text to acconfig.h.
@@ -1532,7 +1532,7 @@ else
 fi
 done
 
-  for ac_func in sbrk
+  for ac_func in sbrk gettimeofday
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:1539: checking for $ac_func" >&5
@@ -1727,6 +1727,17 @@ EOF
     # can hang configure; on other versions, vfork exists just as a stub.
     # FIXME: This should be removed once vfork in uwin's runtime is fixed.
     ac_cv_func_vfork_works=no
+    # Under uwin 2.0+, sys_nerr and sys_errlist exist, but they are
+    # macros (actually, these are imported from a DLL, but the end effect 
+    # is the same), so the test below won't find them.
+    cat >> confdefs.h <<\EOF
+#define HAVE_SYS_NERR 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define HAVE_SYS_ERRLIST 1
+EOF
+
     ;;
 
   esac
@@ -1734,7 +1745,7 @@ EOF
   # We haven't set the list of objects yet.  Use the standard autoconf
   # tests.  This will only work if the compiler works.
   echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1738: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1749: 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.
@@ -1745,12 +1756,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1749 "configure"
+#line 1760 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1765: \"$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
@@ -1776,19 +1787,19 @@ 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:1780: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1791: 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
 
   for ac_func in $funcs
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1787: checking for $ac_func" >&5
+echo "configure:1798: 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 1792 "configure"
+#line 1803 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1811,7 +1822,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1826: \"$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
@@ -1858,19 +1869,19 @@ EOF
     # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:1862: checking for working alloca.h" >&5
+echo "configure:1873: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1867 "configure"
+#line 1878 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -1891,12 +1902,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1895: checking for alloca" >&5
+echo "configure:1906: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1900 "configure"
+#line 1911 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1924,7 +1935,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:1928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -1956,12 +1967,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1960: checking whether alloca needs Cray hooks" >&5
+echo "configure:1971: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1965 "configure"
+#line 1976 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1986,12 +1997,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1990: checking for $ac_func" >&5
+echo "configure:2001: 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 1995 "configure"
+#line 2006 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2014,7 +2025,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2029: \"$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
@@ -2041,7 +2052,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2045: checking stack direction for C alloca" >&5
+echo "configure:2056: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2049,7 +2060,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2053 "configure"
+#line 2064 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -2068,7 +2079,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:2072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -2093,12 +2104,12 @@ fi
   esac
 
   echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2097: checking for ANSI C header files" >&5
+echo "configure:2108: 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 2102 "configure"
+#line 2113 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2106,7 +2117,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2121: \"$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*
@@ -2123,7 +2134,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 2127 "configure"
+#line 2138 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2141,7 +2152,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 2145 "configure"
+#line 2156 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2162,7 +2173,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2166 "configure"
+#line 2177 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2173,7 +2184,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:2177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2197,12 +2208,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:2201: checking for pid_t" >&5
+echo "configure:2212: 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 2206 "configure"
+#line 2217 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2231,17 +2242,17 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:2235: checking for vfork.h" >&5
+echo "configure:2246: checking for vfork.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 2240 "configure"
+#line 2251 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2256: \"$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*
@@ -2266,18 +2277,18 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:2270: checking for working vfork" >&5
+echo "configure:2281: checking for working vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
   echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:2276: checking for vfork" >&5
+echo "configure:2287: checking for vfork" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2281 "configure"
+#line 2292 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -2300,7 +2311,7 @@ vfork();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vfork=yes"
 else
@@ -2322,7 +2333,7 @@ fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF
-#line 2326 "configure"
+#line 2337 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -2417,7 +2428,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:2421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_vfork_works=yes
 else
@@ -2444,19 +2455,19 @@ fi
   fi
   for v in $vars; do
     echo $ac_n "checking for $v""... $ac_c" 1>&6
-echo "configure:2448: checking for $v" >&5
+echo "configure:2459: checking for $v" >&5
     if eval "test \"`echo '$''{'libiberty_cv_var_$v'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2453 "configure"
+#line 2464 "configure"
 #include "confdefs.h"
 int *p;
 int main() {
 extern int $v; p = &$v;
 ; return 0; }
 EOF
-if { (eval echo configure:2460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "libiberty_cv_var_$v=yes"
 else
@@ -2482,12 +2493,12 @@ EOF
   for ac_func in $checkfuncs
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2486: checking for $ac_func" >&5
+echo "configure:2497: 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 2491 "configure"
+#line 2502 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2510,7 +2521,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2525: \"$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
diff --git a/gnu/egcs/libiberty/configure.in b/gnu/egcs/libiberty/configure.in
index f194e2619b9..843a9dd94e9 100644
--- a/gnu/egcs/libiberty/configure.in
+++ b/gnu/egcs/libiberty/configure.in
@@ -156,7 +156,7 @@ funcs="$funcs waitpid"
 
 vars="sys_errlist sys_nerr sys_siglist"
 
-checkfuncs="getrusage on_exit psignal strerror strsignal sysconf times sbrk"
+checkfuncs="getrusage on_exit psignal strerror strsignal sysconf times sbrk gettimeofday"
 
 # These are neither executed nor required, but they help keep
 # autoheader happy without adding a bunch of text to acconfig.h.
@@ -170,7 +170,7 @@ if test "x" = "y"; then
   AC_DEFINE(HAVE_SYS_NERR)
   AC_DEFINE(HAVE_SYS_SIGLIST)
   AC_CHECK_FUNCS(getrusage on_exit psignal strerror strsignal sysconf times)
-  AC_CHECK_FUNCS(sbrk)
+  AC_CHECK_FUNCS(sbrk gettimeofday)
 fi
 
 # For each of these functions, if the host does not provide the
@@ -293,6 +293,11 @@ if test -z "${setobjs}"; then
     # can hang configure; on other versions, vfork exists just as a stub.
     # FIXME: This should be removed once vfork in uwin's runtime is fixed.
     ac_cv_func_vfork_works=no
+    # Under uwin 2.0+, sys_nerr and sys_errlist exist, but they are
+    # macros (actually, these are imported from a DLL, but the end effect 
+    # is the same), so the test below won't find them.
+    AC_DEFINE(HAVE_SYS_NERR)
+    AC_DEFINE(HAVE_SYS_ERRLIST)
     ;;
 
   esac
diff --git a/gnu/egcs/libiberty/setenv.c b/gnu/egcs/libiberty/setenv.c
index 8a039d18fa8..ba35aabadc2 100644
--- a/gnu/egcs/libiberty/setenv.c
+++ b/gnu/egcs/libiberty/setenv.c
@@ -30,6 +30,9 @@ extern int errno;
 
 #if HAVE_STDLIB_H
 # include <stdlib.h>
+#else
+#include <sys/types.h> /* For `size_t' */
+#include <stdio.h>     /* For `NULL' */
 #endif
 #if HAVE_STRING_H
 # include <string.h>
diff --git a/gnu/egcs/libiberty/xstrdup.c b/gnu/egcs/libiberty/xstrdup.c
index e16aba08554..342412806da 100644
--- a/gnu/egcs/libiberty/xstrdup.c
+++ b/gnu/egcs/libiberty/xstrdup.c
@@ -5,6 +5,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <sys/types.h> /* For `size_t' */
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
diff --git a/gnu/egcs/libio/ChangeLog b/gnu/egcs/libio/ChangeLog
index e7b75a1861f..ec6f2347fcc 100644
--- a/gnu/egcs/libio/ChangeLog
+++ b/gnu/egcs/libio/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 28 09:25:23 1999  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* configure.in (post-target): Use "$(topsrcdir)", not "$(srcdir)/..".
+
 1999-05-20  Angela Marie Thomas <angela@cygnus.com>
 
 	* configure.in: Test for ${compiler_name}.exe as well.
diff --git a/gnu/egcs/libio/configure.in b/gnu/egcs/libio/configure.in
index 9139a1d6a74..ac494296fe2 100644
--- a/gnu/egcs/libio/configure.in
+++ b/gnu/egcs/libio/configure.in
@@ -188,7 +188,7 @@ if test x${gxx_include_dir} = x; then
   if test x${enable_version_specific_runtime_libs} = xyes; then
     gxx_include_dir='${libsubdir}/include/g++'
   else
-    topsrcdir=${srcdir}/.. . ${srcdir}/../config.if
+    . ${topsrcdir}/config.if
     gxx_include_dir='${prefix}/include/g++'-${libstdcxx_interface}
   fi
 fi
diff --git a/gnu/egcs/libobjc/ChangeLog b/gnu/egcs/libobjc/ChangeLog
index f4002b928ea..6591f75cc28 100644
--- a/gnu/egcs/libobjc/ChangeLog
+++ b/gnu/egcs/libobjc/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 21 05:40:15 1999  John David Anglin <dave@hiauly1>
+
+	* init.c (__objc_force_linking): Make global.
+
 Thu May 20 03:20:59 1999  Jeffrey A Law  (law@cygnus.com)
 
 	* configure.in (AC_EXEEXT): Remove call.
diff --git a/gnu/egcs/libobjc/init.c b/gnu/egcs/libobjc/init.c
index f1fea812318..954fc9240ae 100644
--- a/gnu/egcs/libobjc/init.c
+++ b/gnu/egcs/libobjc/init.c
@@ -368,16 +368,16 @@ class_is_subclass_of_class (Class class, Class superclass)
    superclasses are not yet know to the runtime. */
 static struct objc_list* unresolved_classes = 0;
 
-/* Static function used to reference the Object and NXConstantString classes.
+/* Extern function used to reference the Object and NXConstantString classes.
  */
-static void
+
+extern void __objc_force_linking (void);
+
+void
 __objc_force_linking (void)
 {
   extern void __objc_linking (void);
   __objc_linking ();
-
-  /* Call the function to avoid compiler warning */
-  __objc_force_linking ();
 }
 
 /* Run through the statics list, removing modules as soon as all its statics
diff --git a/gnu/egcs/libstdc++/stl/ChangeLog b/gnu/egcs/libstdc++/stl/ChangeLog
index f23f4fb1937..32bb031df8c 100644
--- a/gnu/egcs/libstdc++/stl/ChangeLog
+++ b/gnu/egcs/libstdc++/stl/ChangeLog
@@ -1,3 +1,13 @@
+1999-06-18  Martin von Löwis  <loewis@informatik.hu-berlin.de>
+
+	* stl_queue.h: Rename _M_c to c, and _M_comp to comp.
+
+1999-06-17  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+	* stl_algo.h (transform): Rename __opr to __oper, as __opr is used 
+	internally by egcs.
+	Reported by Harri Porten <porten@tu-harburg.de>
+
 1999-05-17  Mark Kettenis  <kettenis@gnu.org>
 
 	* stl_config.h: Only define __STL_PTHREADS with GLIBC >= 2 for
diff --git a/gnu/egcs/libstdc++/stl/stl_algo.h b/gnu/egcs/libstdc++/stl/stl_algo.h
index 57607ba5d49..e9beaee15f1 100644
--- a/gnu/egcs/libstdc++/stl/stl_algo.h
+++ b/gnu/egcs/libstdc++/stl/stl_algo.h
@@ -446,9 +446,9 @@ _ForwardIter2 swap_ranges(_ForwardIter1 __first1, _ForwardIter1 __last1,
 
 template <class _InputIter, class _OutputIter, class _UnaryOperation>
 _OutputIter transform(_InputIter __first, _InputIter __last,
-                      _OutputIter __result, _UnaryOperation __opr) {
+                      _OutputIter __result, _UnaryOperation __oper) {
   for ( ; __first != __last; ++__first, ++__result)
-    *__result = __opr(*__first);
+    *__result = __oper(*__first);
   return __result;
 }
 
diff --git a/gnu/egcs/libstdc++/stl/stl_queue.h b/gnu/egcs/libstdc++/stl/stl_queue.h
index 489cc4ac442..c1e2b698440 100644
--- a/gnu/egcs/libstdc++/stl/stl_queue.h
+++ b/gnu/egcs/libstdc++/stl/stl_queue.h
@@ -49,33 +49,33 @@ public:
   typedef typename _Sequence::reference       reference;
   typedef typename _Sequence::const_reference const_reference;
 protected:
-  _Sequence _M_c;
+  _Sequence c;
 public:
-  queue() : _M_c() {}
-  explicit queue(const _Sequence& __c) : _M_c(__c) {}
-
-  bool empty() const { return _M_c.empty(); }
-  size_type size() const { return _M_c.size(); }
-  reference front() { return _M_c.front(); }
-  const_reference front() const { return _M_c.front(); }
-  reference back() { return _M_c.back(); }
-  const_reference back() const { return _M_c.back(); }
-  void push(const value_type& __x) { _M_c.push_back(__x); }
-  void pop() { _M_c.pop_front(); }
+  queue() : c() {}
+  explicit queue(const _Sequence& __c) : c(__c) {}
+
+  bool empty() const { return c.empty(); }
+  size_type size() const { return c.size(); }
+  reference front() { return c.front(); }
+  const_reference front() const { return c.front(); }
+  reference back() { return c.back(); }
+  const_reference back() const { return c.back(); }
+  void push(const value_type& __x) { c.push_back(__x); }
+  void pop() { c.pop_front(); }
 };
 
 template <class _Tp, class _Sequence>
 bool 
 operator==(const queue<_Tp, _Sequence>& __x, const queue<_Tp, _Sequence>& __y)
 {
-  return __x._M_c == __y._M_c;
+  return __x.c == __y.c;
 }
 
 template <class _Tp, class _Sequence>
 bool
 operator<(const queue<_Tp, _Sequence>& __x, const queue<_Tp, _Sequence>& __y)
 {
-  return __x._M_c < __y._M_c;
+  return __x.c < __y.c;
 }
 
 #ifdef __STL_FUNCTION_TMPL_PARTIAL_ORDER
@@ -125,69 +125,69 @@ public:
   typedef typename _Sequence::reference       reference;
   typedef typename _Sequence::const_reference const_reference;
 protected:
-  _Sequence _M_c;
-  _Compare _M_comp;
+  _Sequence c;
+  _Compare comp;
 public:
-  priority_queue() : _M_c() {}
-  explicit priority_queue(const _Compare& __x) :  _M_c(), _M_comp(__x) {}
+  priority_queue() : c() {}
+  explicit priority_queue(const _Compare& __x) :  c(), comp(__x) {}
   priority_queue(const _Compare& __x, const _Sequence& __s) 
-    : _M_c(__s), _M_comp(__x) 
-    { make_heap(_M_c.begin(), _M_c.end(), _M_comp); }
+    : c(__s), comp(__x) 
+    { make_heap(c.begin(), c.end(), comp); }
 
 #ifdef __STL_MEMBER_TEMPLATES
   template <class _InputIterator>
   priority_queue(_InputIterator __first, _InputIterator __last) 
-    : _M_c(__first, __last) { make_heap(_M_c.begin(), _M_c.end(), _M_comp); }
+    : c(__first, __last) { make_heap(c.begin(), c.end(), comp); }
 
   template <class _InputIterator>
   priority_queue(_InputIterator __first, 
                  _InputIterator __last, const _Compare& __x)
-    : _M_c(__first, __last), _M_comp(__x) 
-    { make_heap(_M_c.begin(), _M_c.end(), _M_comp); }
+    : c(__first, __last), comp(__x) 
+    { make_heap(c.begin(), c.end(), comp); }
 
   template <class _InputIterator>
   priority_queue(_InputIterator __first, _InputIterator __last,
                  const _Compare& __x, const _Sequence& __s)
-  : _M_c(__s), _M_comp(__x)
+  : c(__s), comp(__x)
   { 
-    _M_c.insert(_M_c.end(), __first, __last);
-    make_heap(_M_c.begin(), _M_c.end(), _M_comp);
+    c.insert(c.end(), __first, __last);
+    make_heap(c.begin(), c.end(), comp);
   }
 
 #else /* __STL_MEMBER_TEMPLATES */
   priority_queue(const value_type* __first, const value_type* __last) 
-    : _M_c(__first, __last) { make_heap(_M_c.begin(), _M_c.end(), _M_comp); }
+    : c(__first, __last) { make_heap(c.begin(), c.end(), comp); }
 
   priority_queue(const value_type* __first, const value_type* __last, 
                  const _Compare& __x) 
-    : _M_c(__first, __last), _M_comp(__x)
-    { make_heap(_M_c.begin(), _M_c.end(), _M_comp); }
+    : c(__first, __last), comp(__x)
+    { make_heap(c.begin(), c.end(), comp); }
 
   priority_queue(const value_type* __first, const value_type* __last, 
                  const _Compare& __x, const _Sequence& __c)
-    : _M_c(__c), _M_comp(__x) 
+    : c(__c), comp(__x) 
   { 
-    _M_c.insert(_M_c.end(), __first, __last);
-    make_heap(_M_c.begin(), _M_c.end(), _M_comp);
+    c.insert(c.end(), __first, __last);
+    make_heap(c.begin(), c.end(), comp);
   }
 #endif /* __STL_MEMBER_TEMPLATES */
 
-  bool empty() const { return _M_c.empty(); }
-  size_type size() const { return _M_c.size(); }
-  const_reference top() const { return _M_c.front(); }
+  bool empty() const { return c.empty(); }
+  size_type size() const { return c.size(); }
+  const_reference top() const { return c.front(); }
   void push(const value_type& __x) {
     __STL_TRY {
-      _M_c.push_back(__x); 
-      push_heap(_M_c.begin(), _M_c.end(), _M_comp);
+      c.push_back(__x); 
+      push_heap(c.begin(), c.end(), comp);
     }
-    __STL_UNWIND(_M_c.clear());
+    __STL_UNWIND(c.clear());
   }
   void pop() {
     __STL_TRY {
-      pop_heap(_M_c.begin(), _M_c.end(), _M_comp);
-      _M_c.pop_back();
+      pop_heap(c.begin(), c.end(), comp);
+      c.pop_back();
     }
-    __STL_UNWIND(_M_c.clear());
+    __STL_UNWIND(c.clear());
   }
 };