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

6 files changed, 23 insertions, 20 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0cfed4b2624..91cb1909967 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+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  Zdenek Dvorak  <dvorakz@suse.cz>
 
 	PR tree-optimization/31085
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))
diff --git a/gcc/output.h b/gcc/output.h
index 3c9bcc444f8..a5c29f0d8e0 100644
--- a/gcc/output.h
+++ b/gcc/output.h
@@ -170,10 +170,6 @@ extern void emutls_finish (void);
    Prefixes such as % are optional.  */
 extern int decode_reg_name (const char *);
 
-/* Make the rtl for variable VAR be volatile.
-   Use this only for static variables.  */
-extern void make_var_volatile (tree);
-
 extern void assemble_alias (tree, tree);
 
 extern void default_assemble_visibility (tree, int);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 30236594ce5..ba0392e8b33 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-08  Andrew Pinski  <andrew_pinski@playstation.sony.com>
+
+	PR C/31072
+	* gcc.c-torture/execute/pr31072.c: New test.
+
 2007-03-08  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* gcc.dg/builtins-55.c: Test *lceil* and *lfloor*.
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr31072.c b/gcc/testsuite/gcc.c-torture/execute/pr31072.c
new file mode 100644
index 00000000000..beb4b558e34
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr31072.c
@@ -0,0 +1,10 @@
+extern volatile int ReadyFlag_NotProperlyInitialized;
+
+volatile int ReadyFlag_NotProperlyInitialized=1;
+
+int main(void)
+{
+  if (ReadyFlag_NotProperlyInitialized != 1)
+    __builtin_abort ();
+  return 0;
+}
diff --git a/gcc/varasm.c b/gcc/varasm.c
index c92a5a08f42..7e482b3a34b 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -1403,17 +1403,6 @@ make_decl_rtl (tree decl)
   if (flag_mudflap && TREE_CODE (decl) == VAR_DECL)
     mudflap_enqueue_decl (decl);
 }
-
-/* Make the rtl for variable VAR be volatile.
-   Use this only for static variables.  */
-
-void
-make_var_volatile (tree var)
-{
-  gcc_assert (MEM_P (DECL_RTL (var)));
-
-  MEM_VOLATILE_P (DECL_RTL (var)) = 1;
-}
 
 /* Output a string of literal assembler code
    for an `asm' keyword used between functions.  */