From: prathamesh3492 <prathamesh3492@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 2 Jun 2015 16:42:27 +0000 (+0000)
Subject: 2015-06-02  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b9761f58bf4e15d10c7c22918decda9ea9463ba;p=thirdparty%2Fgcc.git

2015-06-02  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>

        PR c/49551
        * c-decl.c (merge_decls): Merge DECL_COMMON.
        * gcc.dg/pr49551.c: New test-case.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224033 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index bcad7b7b826e..20122e60f9e5 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-02  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	PR c/49551
+	* c-decl.c (merge_decls): Merge DECL_COMMON.
+
 2015-05-22  Jim Wilson  <jim.wilson@linaro.org>
 
 	* Make-lang.in (check_gcc_pallelize): Define.
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index a2edefc5f340..68c79df63e6f 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -2631,6 +2631,12 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
   else if (DECL_PRESERVE_P (newdecl))
     DECL_PRESERVE_P (olddecl) = 1;
 
+  /* Merge DECL_COMMON */
+  if (VAR_P (olddecl) && VAR_P (newdecl)
+      && !lookup_attribute ("common", DECL_ATTRIBUTES (newdecl))
+      && !lookup_attribute ("nocommon", DECL_ATTRIBUTES (newdecl)))
+    DECL_COMMON (newdecl) = DECL_COMMON (newdecl) && DECL_COMMON (olddecl);
+
   /* Copy most of the decl-specific fields of NEWDECL into OLDDECL.
      But preserve OLDDECL's DECL_UID, DECL_CONTEXT and
      DECL_ARGUMENTS (if appropriate).  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4dd3014c91e6..5060c5339449 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-02  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	PR c/49551
+	* gcc.dg/pr49551.c: New testcase.
+
 2015-06-02  Richard Biener  <rguenther@suse.de>
 
 	PR debug/65549
diff --git a/gcc/testsuite/gcc.dg/pr49551.c b/gcc/testsuite/gcc.dg/pr49551.c
new file mode 100644
index 000000000000..204f06deb4e8
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr49551.c
@@ -0,0 +1,7 @@
+/* { dg-do compile } */
+/* { dg-options "-O -fdata-sections" } */
+
+int x = 1;
+int x;
+
+/* { dg-final { scan-assembler-not {comm[\t ]+x} } } */