From b87acf1fa000441dd855228a0f9dc8f1aaf310d7 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 18 Mar 2011 10:46:51 +0000 Subject: [PATCH] * read.c (read_a_source_file): Remove md_after_pass_hook. Move "quit" label before set of dot_symbol. * config/tc-d10v.h (md_after_pass_hook): Don't define. * config/tc-d30v.h (md_after_pass_hook): Likewise. * config/tc-m32r.h (md_after_pass_hook): Likewise. (md_cleanup): Define to call m32r_fill_insn. --- gas/ChangeLog | 9 +++++++++ gas/config/tc-d10v.h | 3 +-- gas/config/tc-d30v.h | 3 +-- gas/config/tc-m32r.h | 5 ++--- gas/read.c | 6 +----- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 33e030538..db6499db8 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,12 @@ +2011-03-18 Alan Modra + + * read.c (read_a_source_file): Remove md_after_pass_hook. + Move "quit" label before set of dot_symbol. + * config/tc-d10v.h (md_after_pass_hook): Don't define. + * config/tc-d30v.h (md_after_pass_hook): Likewise. + * config/tc-m32r.h (md_after_pass_hook): Likewise. + (md_cleanup): Define to call m32r_fill_insn. + 2011-03-18 Andreas Krebbel * config/tc-s390.c (md_parse_option): Add -march=all option which diff --git a/gas/config/tc-d10v.h b/gas/config/tc-d10v.h index 930f3a185..3c326248f 100644 --- a/gas/config/tc-d10v.h +++ b/gas/config/tc-d10v.h @@ -1,6 +1,6 @@ /* tc-d10v.h -- Header file for tc-d10v.c. Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2007, 2009, - 2010 Free Software Foundation, Inc. + 2010, 2011 Free Software Foundation, Inc. Written by Martin Hunt, Cygnus Support. This file is part of GAS, the GNU Assembler. @@ -47,7 +47,6 @@ long md_pcrel_from_section (struct fix *, segT); int d10v_cleanup (void); void d10v_frob_label (symbolS *); -#define md_after_pass_hook() d10v_cleanup () #define md_cleanup() d10v_cleanup () #define md_do_align(a,b,c,d,e) d10v_cleanup () #define tc_frob_label(sym) d10v_frob_label (sym) diff --git a/gas/config/tc-d30v.h b/gas/config/tc-d30v.h index 51935502d..e75f3d81d 100644 --- a/gas/config/tc-d30v.h +++ b/gas/config/tc-d30v.h @@ -1,5 +1,5 @@ /* tc-310v.h -- Header file for tc-d30v.c. - Copyright 1997, 1998, 2000, 2001, 2002, 2005, 2007, 2009 + Copyright 1997, 1998, 2000, 2001, 2002, 2005, 2007, 2009, 2011 Free Software Foundation, Inc. Written by Martin Hunt, Cygnus Support. @@ -46,7 +46,6 @@ extern long md_pcrel_from_section (struct fix *, segT); #define md_number_to_chars number_to_chars_bigendian int d30v_cleanup (int); -#define md_after_pass_hook() d30v_cleanup (FALSE) #define md_cleanup() d30v_cleanup (FALSE) #define TC_START_LABEL(ch, s, ptr) (ch == ':' && d30v_cleanup (FALSE)) void d30v_start_line (void); diff --git a/gas/config/tc-m32r.h b/gas/config/tc-m32r.h index 9def7ba2c..326571227 100644 --- a/gas/config/tc-m32r.h +++ b/gas/config/tc-m32r.h @@ -1,6 +1,6 @@ /* tc-m32r.h -- Header file for tc-m32r.c. Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2007, 2009 Free Software Foundation, Inc. + 2007, 2009, 2011 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -101,10 +101,9 @@ extern int m32r_force_relocation (struct fix *); /* Ensure insns at labels are aligned to 32 bit boundaries. */ int m32r_fill_insn (int); -#define md_after_pass_hook() m32r_fill_insn (1) #define TC_START_LABEL(ch, s, ptr) (ch == ':' && m32r_fill_insn (0)) -#define md_cleanup m32r_elf_section_change_hook +#define md_cleanup() m32r_fill_insn (1) #define md_elf_section_change_hook m32r_elf_section_change_hook extern void m32r_elf_section_change_hook (void); diff --git a/gas/read.c b/gas/read.c index 68b66bc4f..5cca366ce 100644 --- a/gas/read.c +++ b/gas/read.c @@ -1123,14 +1123,10 @@ read_a_source_file (char *name) /* Report unknown char as error. */ demand_empty_rest_of_line (); } - -#ifdef md_after_pass_hook - md_after_pass_hook (); -#endif } - symbol_set_value_now (&dot_symbol); quit: + symbol_set_value_now (&dot_symbol); #ifdef md_cleanup md_cleanup (); -- 2.11.4.GIT