* config/tc-m88k.c (m88k_do_align): Don't use a special nop

	alignment if a zero fill pattern was explicitly specified.
	* config/tc-sh.c (sh_do_align): Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 505cb941b30f2e059d1af9d79899957c8f1f65cc..d0edc33a7e2ea4f75fcfa5242c2edb0bce5839ab 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,9 @@
 Tue Mar 11 01:13:31 1997  Ian Lance Taylor  <ian@cygnus.com>
 
+       * config/tc-m88k.c (m88k_do_align): Don't use a special nop
+       alignment if a zero fill pattern was explicitly specified.
+       * config/tc-sh.c (sh_do_align): Likewise.
+
        * read.c (equals): Always permit register names to be redefined.
 
        * config/tc-mips.c (mips_fix_adjustable): Permit a reloc against a
@@ -88,7 +92,7 @@ Thu Feb 27 15:39:16 1997  Fred Fish  <fnf@cygnus.com>
 end-sanitize-tic80
 Thu Feb 27 13:29:04 1997  Ian Lance Taylor  <ian@cygnus.com>
 
-       * config/tc-m68k.c (md_assemble): Handle a reloc width of 'W'.n
+       * config/tc-m68k.c (md_assemble): Handle a reloc width of 'W'.
 
        * gasp.c (hash_add_to_string_table): Correct misspelling in error
        message, and add newline.

diff --git a/gas/config/tc-m88k.c b/gas/config/tc-m88k.c
index 47b154d48de6ad1f10f6db37c92170d818ecec51..ae55fedb7ebbd0d2fefe99cfb2810c781a147343 100644 (file)
--- a/gas/config/tc-m88k.c
+++ b/gas/config/tc-m88k.c
@@ -1440,7 +1440,7 @@ m88k_do_align (n, fill, max, len)
      int len;
      int max;
 {
-  if ((fill == NULL || (*fill == 0 && len == 1))
+  if (fill == NULL
       && strcmp (obj_segment_name (now_seg), ".init") == 0)
     {
       static const unsigned char nop_pattern[] = { 0xf4, 0x00, 0x58, 0x00 };