From 20868ec6471a8307f1c8650aa274437919136d6c Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 31 Dec 1996 22:11:23 +0000 Subject: [PATCH] * read.c (read_a_source_file): Check mri_pending_align after checking for a macro. From Ronald F. Guilmette . --- gas/ChangeLog | 4 ++++ gas/read.c | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 5b4fe167bb4..91499edf4d0 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -8,6 +8,10 @@ Tue Dec 31 15:12:35 1996 Michael Meissner end-sanitize-v850 Tue Dec 31 12:56:41 1996 Ian Lance Taylor + * read.c (read_a_source_file): Check mri_pending_align after + checking for a macro. From Ronald F. Guilmette + . + * Makefile.in (ALL_CFLAGS): Add -D_GNU_SOURCE. * config/tc-sparc.c (md_apply_fix3): Rename from md_apply_fix, and diff --git a/gas/read.c b/gas/read.c index 12bfa6e93b1..08084af7111 100644 --- a/gas/read.c +++ b/gas/read.c @@ -44,7 +44,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307 #include "subsegs.h" #include "sb.h" #include "macro.h" -#include "libiberty.h" #include "obstack.h" #include "listing.h" #include "ecoff.h" @@ -727,15 +726,9 @@ read_a_source_file (name) goto quit; } else - { /* machine instruction */ + { int inquote = 0; - if (mri_pending_align) - { - do_align (1, (char *) NULL, 0); - mri_pending_align = 0; - } - /* WARNING: c has char, which may be end-of-line. */ /* Also: input_line_pointer->`\0` where c was. */ *input_line_pointer = c; @@ -789,6 +782,12 @@ read_a_source_file (name) } } + if (mri_pending_align) + { + do_align (1, (char *) NULL, 0); + mri_pending_align = 0; + } + md_assemble (s); /* Assemble 1 instruction. */ *input_line_pointer++ = c; @@ -975,6 +974,10 @@ read_a_source_file (name) } /* while (more buffers to scan) */ quit: + +#ifdef md_cleanup + md_cleanup(); +#endif input_scrub_close (); /* Close the input file */ } -- 2.30.2