diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 12198f23542a0fb0d75affe67299507deafa2954..9ff706e653242c26d809a627582aa7080d4ee982 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-11  Jim Wilson  <wilson@redhat.com>
+
+	* config/ia64/ia64.h (FUNCTION_ARG_BOUNDARY): Return 128 if argument
+	requires more than 64 bits of alignment.
+
 2001-04-11  Neil Booth  <neil@daikokuya.demon.co.uk>
 
 	* cpplib.c (do_line): Sanity check iff enable checking.
diff --git a/gcc/config/ia64/ia64.h b/gcc/config/ia64/ia64.h
index 8acbef13127ad041f7ee5280c5eac919e8ad4ff9..956abd02a327dee96192f7ff16b3990934d70d2a 100644
--- a/gcc/config/ia64/ia64.h
+++ b/gcc/config/ia64/ia64.h
@@ -1382,11 +1382,15 @@ do {									\
 /* If defined, a C expression that gives the alignment boundary, in bits, of an
    argument with the specified mode and type.  */
 
-/* Arguments larger than 64 bits require 128 bit alignment.  */
+/* Arguments with alignment larger than 8 bytes start at the next even
+   boundary.  See ia64_function_arg.  */
 
 #define FUNCTION_ARG_BOUNDARY(MODE, TYPE) \
-  (((((MODE) == BLKmode ? int_size_in_bytes (TYPE) : GET_MODE_SIZE (MODE)) \
-     + UNITS_PER_WORD - 1) / UNITS_PER_WORD) > 1 ? 128 : PARM_BOUNDARY)
+  (((TYPE) ? (TYPE_ALIGN (TYPE) > 8 * BITS_PER_UNIT)		\
+    : (((((MODE) == BLKmode					\
+	  ? int_size_in_bytes (TYPE) : GET_MODE_SIZE (MODE))	\
+	 + UNITS_PER_WORD - 1) / UNITS_PER_WORD) > 1))		\
+    ? 128 : PARM_BOUNDARY)
 
 /* A C expression that is nonzero if REGNO is the number of a hard register in
    which function arguments are sometimes passed.  This does *not* include