From 8560c588b8e703a936e09b8b1c5381289b6fe2a8 Mon Sep 17 00:00:00 2001 From: bstarynk Date: Mon, 27 Sep 2010 11:57:01 +0000 Subject: 2010-09-27 Basile Starynkevitch MELT branch merged with trunk rev 164647 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@164648 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/langhooks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gcc/langhooks.c') diff --git a/gcc/langhooks.c b/gcc/langhooks.c index 7a585085ef0..ce7522b1585 100644 --- a/gcc/langhooks.c +++ b/gcc/langhooks.c @@ -176,7 +176,7 @@ lhd_set_decl_assembler_name (tree decl) is less than the whole compilation. Concatenate a distinguishing number - we use the DECL_UID. */ - if (TREE_PUBLIC (decl) || DECL_CONTEXT (decl) == NULL_TREE) + if (TREE_PUBLIC (decl) || DECL_FILE_SCOPE_P (decl)) id = targetm.mangle_decl_assembler_name (decl, DECL_NAME (decl)); else { -- cgit v1.2.1