* listing.c (buffer_line): rewind to the start of include

	files, they might be included twice.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c476184d7c46af44a987bb4bc1b51efa0d6673d7..4e9a69a42bd9cd1c59d6c857c01694709c7e5e6c 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 25 15:13:48 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+       * listing.c (buffer_line): rewind to the start of include
+       files, they might be included twice.
+
 Mon Aug 24 12:45:43 1992  Ian Lance Taylor  (ian@cygnus.com)
 
        * Makefile.in: defined TARGET_CPU for C code so that it can choose
@@ -141,6 +146,7 @@ Tue Jun 30 20:25:54 1992  D. V. Henkel-Wallace  (gumby@cygnus.com)
 
        * Makefile.in: Add program_suffix (parallel to program_prefix)
 
+>>>>>>> 1.83
 Wed Jun 24 10:57:54 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
 
        * app.c (process_escape): new function to handle escapes the right

diff --git a/gas/configure.in b/gas/configure.in
index 977b0ec74c9441eb99f32a2df5ebd1478b62d8ca..cfb2f667fb8503f46a43ec32ead9d1f2e2694848 100644 (file)
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -120,6 +120,12 @@ sysv32)
        emulation=sysv32
        ;;
 
+sim)   
+       obj_format=coffbfd
+       need_bfd="./../bfd/libbfd.a"
+       ;;
+
+
 coff* | sysv*)
        obj_format=coff
 

diff --git a/gas/listing.c b/gas/listing.c
index a4465e74ba2f4e83e143598e560dba2035c36bde..ef88c0d553031053d740f3518c1920ec02bb0529 100644 (file)
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -92,11 +92,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 */
 
 #include "as.h"
-<<<<<<< listing.c
-#include <ansidecl.h>
-=======
-
->>>>>>> 1.13
 #include <obstack.h>
 #include "input-file.h"
 #include "targ-cpu.h"
@@ -343,6 +338,9 @@ DEFUN(buffer_line,(file, line, size),
     return "";
   }
 
+  if (file->linenum == 0)
+   rewind(file->file);
+
   if (file->end_pending == 10) {
       *p ++ = '\n';
       fseek(file->file, 0,0 );
@@ -867,6 +865,8 @@ DEFUN_VOID(listing_eject)
 void
 DEFUN_VOID(listing_flags)
 {
+  while ( (*input_line_pointer++) && (*input_line_pointer != '\n') )
+   input_line_pointer++;
   
 }
 void