From 8efed14f10274335e47b3223a49e77a89e86a1d2 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 22 Oct 1993 19:15:20 +0000 Subject: [PATCH] * input-scrub.c (physical_input_file, logical_input_file, physical_input_line, logical_input_line): Made static. (as_where): Return current file name and line number, don't print them out. * messages.c (as_show_where): New static function. Other functions use it instead of as_where. (as_bad_internal): New static function. (as_bad): Use as_bad_internal. (as_bad_where): New function, like as_bad but taking a file name and line number. * as.h (as_bad_where): Declare. (as_where): Change prototype for new arguments. * write.h (fixS): Added fields fx_file and fx_line. * write.c (fix_new_internal): Save file and line number in fix. (fixup_segment): Use as_bad_where, not as_bad. * input-file.c (f_in, file_name): Made static. * cond.c (struct file_line): Just use file and line fields. (s_else): Use as_where and as_bad_where, not get_file_line and set_file_line. (get_file_line, set_file_line): Removed. * listing.c (listing_newline): Use as_where. * config/obj-coffbfd.c (obj_coff_init_stab_section): Use as_where. * config/obj-ecoff.c (add_file): Use as_where. * config/obj-elf.c (obj_elf_init_stab_section): Use as_where. * config/tc-m68k.c (md_apply_fix_2): Use as_bad_where. * config/tc-mips.c (tc_gen_reloc): Use as_bad_where, not assert. --- gas/ChangeLog | 29 +++++++++++++++++++++++++++++ gas/config/obj-coffbfd.c | 9 ++------- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 863b15c3199..ebbb35add27 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,32 @@ +Fri Oct 22 14:45:49 1993 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * input-scrub.c (physical_input_file, logical_input_file, + physical_input_line, logical_input_line): Made static. + (as_where): Return current file name and line number, don't print + them out. + * messages.c (as_show_where): New static function. Other + functions use it instead of as_where. + (as_bad_internal): New static function. + (as_bad): Use as_bad_internal. + (as_bad_where): New function, like as_bad but taking a file name + and line number. + * as.h (as_bad_where): Declare. + (as_where): Change prototype for new arguments. + * write.h (fixS): Added fields fx_file and fx_line. + * write.c (fix_new_internal): Save file and line number in fix. + (fixup_segment): Use as_bad_where, not as_bad. + * input-file.c (f_in, file_name): Made static. + * cond.c (struct file_line): Just use file and line fields. + (s_else): Use as_where and as_bad_where, not get_file_line and + set_file_line. + (get_file_line, set_file_line): Removed. + * listing.c (listing_newline): Use as_where. + * config/obj-coffbfd.c (obj_coff_init_stab_section): Use as_where. + * config/obj-ecoff.c (add_file): Use as_where. + * config/obj-elf.c (obj_elf_init_stab_section): Use as_where. + * config/tc-m68k.c (md_apply_fix_2): Use as_bad_where. + * config/tc-mips.c (tc_gen_reloc): Use as_bad_where, not assert. + Thu Oct 21 12:52:01 1993 Ken Raeburn (raeburn@cygnus.com) * config/tc-m68k.h: Don't define REGISTER_PREFIX or diff --git a/gas/config/obj-coffbfd.c b/gas/config/obj-coffbfd.c index d0318844955..f88dbb532d0 100644 --- a/gas/config/obj-coffbfd.c +++ b/gas/config/obj-coffbfd.c @@ -2662,18 +2662,13 @@ void obj_coff_init_stab_section (seg) segT seg; { - extern char *logical_input_file, *physical_input_file; + char *file; char *p; - const char *file; unsigned int stroff; /* Make space for this first symbol. */ p = frag_more (12); - file = logical_input_file; - if (file == NULL) - file = physical_input_file; - if (file == NULL) - file = "UNKNOWN"; + as_where (&file, (unsigned int *) NULL); stroff = get_stab_string_offset (file, segment_info[seg].scnhdr.s_name); know (stroff == 1); md_number_to_chars (p, stroff, 4); -- 2.30.2