diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e456fe1ea72..454c7f6ab47 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Tue Dec 23 12:56:46 1997 Paul Eggert <eggert@twinsun.com>:
+
+	* genattrtab.c (main): Check HAVE_{G,S}ETRLIMIT in addition to
+	RLIMIT_STACK.  This maintains consistency with the recent, similar
+	patch to cccp.c and toplev.c.
+
 Tue Dec 23 05:17:28 1997  Richard Henderson  <rth@cygnus.com>
 
 	* genattrtab.c (expand_units): For large nr opclasses, expand
diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c
index 8655c0602be..8166ab84b26 100644
--- a/gcc/genattrtab.c
+++ b/gcc/genattrtab.c
@@ -5803,7 +5803,7 @@ main (argc, argv)
   rtx tem;
   int i;
 
-#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;