From 71ef6f79bc8926dfd6e1b49456a67795af9e2069 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 11 Oct 2010 08:35:53 +0000 Subject: [PATCH] gas: blackfin: fix LOOP_BEGIN/LOOP_END pseudo insns handling of local labels The current LOOP_BEGIN/LOOP_END pseudo insns hit "Internal errors" when using local labels as the loop names due to attempts at removing them. Signed-off-by: David Gibson Signed-off-by: Mike Frysinger --- gas/ChangeLog | 4 ++++ gas/config/tc-bfin.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index b14aa6c5e22..66853b9c3b5 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2010-09-11 David Gibson + + * config/tc-bfin.c (bfin_gen_loop): Check symbol before removing. + 2010-10-08 Pierre Muller Fix build with -DDEBUG=7 diff --git a/gas/config/tc-bfin.c b/gas/config/tc-bfin.c index ccd14cbb908..e854dce059e 100644 --- a/gas/config/tc-bfin.c +++ b/gas/config/tc-bfin.c @@ -1874,6 +1874,7 @@ bfin_gen_loop (Expr_Node *exp, REG_T reg, int rop, REG_T preg) char *lbeginsym, *lendsym; Expr_Node_Value lbeginval, lendval; Expr_Node *lbegin, *lend; + symbolS *sym; loopsym = exp->value.s_value; lbeginsym = (char *) xmalloc (strlen (loopsym) + strlen ("__BEGIN") + 5); @@ -1896,9 +1897,11 @@ bfin_gen_loop (Expr_Node *exp, REG_T reg, int rop, REG_T preg) lbegin = Expr_Node_Create (Expr_Node_Reloc, lbeginval, NULL, NULL); lend = Expr_Node_Create (Expr_Node_Reloc, lendval, NULL, NULL); - symbol_remove (symbol_find (loopsym), &symbol_rootP, &symbol_lastP); + sym = symbol_find(loopsym); + if (!S_IS_LOCAL (sym) || (S_IS_LOCAL (sym) && !symbol_used_p (sym))) + symbol_remove (sym, &symbol_rootP, &symbol_lastP); - return bfin_gen_loopsetup(lbegin, reg, rop, lend, preg); + return bfin_gen_loopsetup (lbegin, reg, rop, lend, preg); } void -- 2.30.2