summaryrefslogtreecommitdiff
path: root/gcc/c-decl.c
diff options
context:
space:
mode:
authorpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2007-03-09 00:32:34 +0000
committerpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2007-03-09 00:32:34 +0000
commitebef29ebbcc73905a75a6f506c5e5e2d732ca000 (patch)
tree00b828664fda1c04e56f45ffb7f17ee5c3ffab4e /gcc/c-decl.c
parent9cf0d8a5ee5bd1de7b71dc6064b7f1f76d56e177 (diff)
downloadgcc-ebef29ebbcc73905a75a6f506c5e5e2d732ca000.tar.gz
2007-03-08 Andrew Pinski <andrew_pinski@playstation.sony.com>
PR C/31072 * c-decl.c (merge_decls): Don't call make_var_volatile. * varasm.c (make_var_volatile): Remove. * output.h (make_var_volatile): Remove. 2007-03-08 Andrew Pinski <andrew_pinski@playstation.sony.com> PR C/31072 * gcc.c-torture/execute/pr31072.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122736 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-decl.c')
-rw-r--r--gcc/c-decl.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 0d9fce559e7..fd5b065c193 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -1690,11 +1690,7 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
TREE_READONLY (olddecl) = 1;
if (TREE_THIS_VOLATILE (newdecl))
- {
- TREE_THIS_VOLATILE (olddecl) = 1;
- if (TREE_CODE (newdecl) == VAR_DECL)
- make_var_volatile (newdecl);
- }
+ TREE_THIS_VOLATILE (olddecl) = 1;
/* Merge deprecatedness. */
if (TREE_DEPRECATED (newdecl))