From: Georg-Johann Lay Date: Thu, 11 Jul 2013 08:50:09 +0000 (+0000) Subject: backport: re PR target/57631 (Use assembler name for sanity checking of ISR names... X-Git-Tag: releases/gcc-4.7.4~575 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41b9ae2942593256a2d17393339a168945f346ff;p=thirdparty%2Fgcc.git backport: re PR target/57631 (Use assembler name for sanity checking of ISR names provided it is set) Backport from 2013-07-11 trunk r200901. PR target/57631 * config/avr/avr.c (avr_set_current_function): Sanity-check signal name seen by assembler/linker if available. From-SVN: r200903 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 907e3b7d4196..cca738fbeacf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2013-07-11 Georg-Johann Lay + + Backport from 2013-07-11 trunk r200901. + + PR target/57631 + * config/avr/avr.c (avr_set_current_function): Sanity-check signal + name seen by assembler/linker if available. + 2013-07-10 Georg-Johann Lay Backport from 2013-07-10 trunk r200872. diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c index bac87e8e174f..93a4cc2d7554 100644 --- a/gcc/config/avr/avr.c +++ b/gcc/config/avr/avr.c @@ -549,7 +549,12 @@ avr_set_current_function (tree decl) { tree args = TYPE_ARG_TYPES (TREE_TYPE (decl)); tree ret = TREE_TYPE (TREE_TYPE (decl)); - const char *name = IDENTIFIER_POINTER (DECL_NAME (decl)); + const char *name; + + name = DECL_ASSEMBLER_NAME_SET_P (decl) + /* Remove the leading '*' added in set_user_assembler_name. */ + ? 1 + IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl)) + : IDENTIFIER_POINTER (DECL_NAME (decl)); /* Silently ignore 'signal' if 'interrupt' is present. AVR-LibC startet using this when it switched from SIGNAL and INTERRUPT to ISR. */