From 4377fad9da8478d4683dd7412459fe4d7bbd29fa Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Sun, 16 Jan 2011 21:52:37 +0000 Subject: [PATCH] mips.c (mips_classify_symbol): Don't return SYMBOL_PC_RELATIVE for nonlocal labels. gcc/ * config/mips/mips.c (mips_classify_symbol): Don't return SYMBOL_PC_RELATIVE for nonlocal labels. From-SVN: r168874 --- gcc/ChangeLog | 5 +++++ gcc/config/mips/mips.c | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 105d5a41cdb..a3706fb7b55 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-01-16 Richard Sandiford + + * config/mips/mips.c (mips_classify_symbol): Don't return + SYMBOL_PC_RELATIVE for nonlocal labels. + 2011-01-15 Eric Botcazou * config/sparc/sol2-bi.h (CC1_SPEC): Fix typo. diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index 35705469192..a534638541d 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -1669,10 +1669,13 @@ mips_classify_symbol (const_rtx x, enum mips_symbol_context context) if (GET_CODE (x) == LABEL_REF) { - /* LABEL_REFs are used for jump tables as well as text labels. - Only return SYMBOL_PC_RELATIVE if we know the label is in - the text section. */ - if (TARGET_MIPS16_SHORT_JUMP_TABLES) + /* Only return SYMBOL_PC_RELATIVE if we are generating MIPS16 + code and if we know that the label is in the current function's + text section. LABEL_REFs are used for jump tables as well as + text labels, so we must check whether jump tables live in the + text section. */ + if (TARGET_MIPS16_SHORT_JUMP_TABLES + && !LABEL_REF_NONLOCAL_P (x)) return SYMBOL_PC_RELATIVE; if (TARGET_ABICALLS && !TARGET_ABSOLUTE_ABICALLS) -- 2.30.2