diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4cccd2012e1..3fdbf78489a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-23  DJ Delorie  <dj@redhat.com>
+
+	* config/i386/i386.c (ix86_data_alignment): Don't specify an
+	alignment bigger than the object file can handle.
+
 2007-02-23  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR target/30825
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index e0da85a8103..a88c6152a14 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -15417,7 +15417,7 @@ ix86_constant_alignment (tree exp, int align)
 int
 ix86_data_alignment (tree type, int align)
 {
-  int max_align = optimize_size ? BITS_PER_WORD : 256;
+  int max_align = optimize_size ? BITS_PER_WORD : MIN (256, MAX_OFILE_ALIGNMENT);
 
   if (AGGREGATE_TYPE_P (type)
       && TYPE_SIZE (type)