diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e88615fe11d..b243eb4436c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+1997-11-13  Dave Love  <d.love@dl.ac.uk>
+
+	* i386/linux.h (STACK_BOUNDARY): Define as 64 for glibc2.
+	* i386/gnu.h (STACK_BOUNDARY): Define as 64.
+
 Thu Dec 11 23:55:17 1997  Manfred Hollstein  <manfred@s-direktnet.de>
 
 	* fixincludes (str{len,spn,cspn} return value): Handle different
diff --git a/gcc/config/i386/gnu.h b/gcc/config/i386/gnu.h
index bdce3ed000b..c86155a3e42 100644
--- a/gcc/config/i386/gnu.h
+++ b/gcc/config/i386/gnu.h
@@ -3,6 +3,9 @@
 /* This does it mostly for us.  */
 #include <i386/linux.h>
 
+#undef STACK_BOUNDARY
+#define STACK_BOUNDARY 64       /* glibc2's crt ensures this */
+
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES GNU_CPP_PREDEFINES("i386")
 
diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
index 8f0671d1faa..9b7dc8001c2 100644
--- a/gcc/config/i386/linux.h
+++ b/gcc/config/i386/linux.h
@@ -1,4 +1,4 @@
-/* Definitions for Intel 386 running Linux with ELF format
+/* Definitions for Intel 386 running Linux-based GNU systems with ELF format.
    Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
    Contributed by Eric Youngdale.
    Modified for stabs-in-ELF by H.J. Lu.
@@ -30,13 +30,19 @@ Boston, MA 02111-1307, USA.  */
 #include <linux.h>	/* some common stuff */
 
 #undef TARGET_VERSION
-#define TARGET_VERSION fprintf (stderr, " (i386 Linux/ELF)");
+#define TARGET_VERSION fprintf (stderr, " (i386 GNU/Linux with ELF)");
 
 /* The svr4 ABI for the i386 says that records and unions are returned
    in memory.  */
 #undef DEFAULT_PCC_STRUCT_RETURN
 #define DEFAULT_PCC_STRUCT_RETURN 1
 
+#ifndef USE_GNULIBC_1
+#undef STACK_BOUNDARY
+#define STACK_BOUNDARY 64       /* glibc2's crt ensures this, libc5
+                                   only gives you 32 */
+#endif
+
 /* This is how to output an element of a case-vector that is relative.
    This is only used for PIC code.  See comments by the `casesi' insn in
    i386.md for an explanation of the expression this outputs. */
@@ -160,7 +166,7 @@ Boston, MA 02111-1307, USA.  */
 #undef CC1_SPEC
 #define CC1_SPEC "%(cc1_cpu) %{profile:-p}"
 
-/* Provide a LINK_SPEC appropriate for Linux.  Here we provide support
+/* Provide a LINK_SPEC appropriate for GNU/Linux.  Here we provide support
    for the special GCC options -static and -shared, which allow us to
    link things in one of these three modes by applying the appropriate
    combinations of options at link-time. We like to support here for