diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0edcc7af4f2..9bc153f3afd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-08  James E Wilson  <wilson@specifixinc.com>
+
+	PR target/15790
+	* config/i386/i386-coff.h (ASM_OUTPUT_ALIGN): Define.
+
 2004-06-08  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	* fold-const.c (fold_convert): Treat OFFSET_TYPE like
diff --git a/gcc/config/i386/i386-coff.h b/gcc/config/i386/i386-coff.h
index 85a519310b4..1299cea1c24 100644
--- a/gcc/config/i386/i386-coff.h
+++ b/gcc/config/i386/i386-coff.h
@@ -60,4 +60,11 @@ Boston, MA 02111-1307, USA.  */
 #define ASM_GENERATE_INTERNAL_LABEL(BUF,PREFIX,NUMBER)	\
   sprintf ((BUF), ".%s%ld", (PREFIX), (long)(NUMBER))
 
+/* GNU as expects alignment to be the number of bytes instead of the log for
+   COFF targets.  */
+
+#undef ASM_OUTPUT_ALIGN
+#define ASM_OUTPUT_ALIGN(FILE,LOG) \
+  if ((LOG)!=0) fprintf ((FILE), "\t.align %d\n", 1<<(LOG))
+
 /* end of i386-coff.h */