diff options
| author | Steve Chamberlain <sac@cygnus> | 1992-08-25 22:16:39 +0000 |
|---|---|---|
| committer | Steve Chamberlain <sac@cygnus> | 1992-08-25 22:16:39 +0000 |
| commit | ab737e518da3aa6f05c0ca2de40d9a6d81783643 (patch) | |
| tree | 7cc7cc2c5612da4ba5306dfcc8aa1227f6d3d8c9 /gas | |
| parent | 163107a143737d849de4dd64a270fcf2e07c089d (diff) | |
| download | gdb-ab737e518da3aa6f05c0ca2de40d9a6d81783643.zip gdb-ab737e518da3aa6f05c0ca2de40d9a6d81783643.tar.gz gdb-ab737e518da3aa6f05c0ca2de40d9a6d81783643.tar.bz2 | |
* listing.c (buffer_line): rewind to the start of include
files, they might be included twice.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/configure.in | 6 | ||||
| -rw-r--r-- | gas/listing.c | 10 |
3 files changed, 17 insertions, 5 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index c476184..4e9a69a 100644 --- 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 977b0ec..cfb2f66 100644 --- 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 a4465e7..ef88c0d 100644 --- 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 |