diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1d5f9a6d6b3f..a78dda5f2bce 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-06  Richard Sandiford  <rsandifo@redhat.com>
+
+	* config/frv/frv.h (ASM_OUTPUT_ALIGN_WITH_NOP): Define.
+
 2003-11-06  Momchil Velikov  <velco@fadata.bg>
 
 	* config/mips/mips.c (override_options): Set MASK_SOFT_FLOAT
diff --git a/gcc/config/frv/frv.h b/gcc/config/frv/frv.h
index 2f958da582b8..336e253086d0 100644
--- a/gcc/config/frv/frv.h
+++ b/gcc/config/frv/frv.h
@@ -2970,6 +2970,9 @@ do {                                                                    \
 #define ASM_OUTPUT_ALIGN(STREAM, POWER) \
   fprintf ((STREAM), "\t.p2align %d\n", (POWER))
 
+/* Inside the text section, align with unpacked nops rather than zeros.  */
+#define ASM_OUTPUT_ALIGN_WITH_NOP(STREAM, POWER) \
+  fprintf ((STREAM), "\t.p2alignl %d,0x80880000\n", (POWER))
 
 /* Macros Affecting all Debug Formats.  */