diff options
| -rw-r--r-- | gcc/c/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c/c-decl.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr49551.c | 7 |
4 files changed, 23 insertions, 0 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index bcad7b7b826..20122e60f9e 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 a2edefc5f34..68c79df63e6 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 4dd3014c91e..5060c533944 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 00000000000..204f06deb4e --- /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} } } */ |