diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index efdd2a8bb06..3bee0b380e0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec  9 09:43:59 1997  Manfred Hollstein  <manfred@s-direktnet.de>
+
+	* toplev.c (main): Check HAVE_GETRLIMIT and HAVE_SETRLIMIT in addition
+	to RLIMIT_STACK to see if we can call getrlimit and setrlimit.
+
 Tue Dec  9 09:38:58 1997  David Edelsohn  <edelsohn@mhpcc.edu>
 
 	* rs6000.h (FUNCTION_ARG_PADDING): Define.
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 7340b623b64..12d567656f0 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -3819,7 +3819,7 @@ main (argc, argv, envp)
     --p;
   progname = p;
 
-#ifdef RLIMIT_STACK
+#if defined (RLIMIT_STACK) && defined (HAVE_GETRLIMIT) && defined (HAVE_SETRLIMIT)
   /* Get rid of any avoidable limit on stack size.  */
   {
     struct rlimit rlim;