diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 696361fa6a9..712dfaab34a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-27  Richard Guenther  <rguenther@suse.de>
+
+	* dbxout.c (dbxout_symbol): Use DECL_FILE_SCOPE_P.
+
 2010-09-27  Jie Zhang  <jie@codesourcery.com>
 
 	* print-tree.c (print_node): Print in-constant-pool.
diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index 0b4c050c056..572fa64eb8c 100644
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -2822,7 +2822,7 @@ dbxout_symbol (tree decl, int local ATTRIBUTE_UNUSED)
 	  && DECL_INITIAL (decl) != 0
 	  && host_integerp (DECL_INITIAL (decl), 0)
 	  && ! TREE_ASM_WRITTEN (decl)
-	  && (DECL_CONTEXT (decl) == NULL_TREE
+	  && (DECL_FILE_SCOPE_P (decl)
 	      || TREE_CODE (DECL_CONTEXT (decl)) == BLOCK
 	      || TREE_CODE (DECL_CONTEXT (decl)) == NAMESPACE_DECL)
 	  && TREE_PUBLIC (decl) == 0)