diff options
| author | Jason Merrill <jason@redhat.com> | 2012-01-22 15:56:34 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-01-22 15:56:34 -0500 |
| commit | bbe04f213da2a9ec4bbbaa4b50bed4c8b53a3e98 (patch) | |
| tree | f649c0692e0f80c39d30d4564c32b19a2b1dfd09 | |
| parent | ca10595cf475579d19b0bf6fe5399cdf6f9b89f4 (diff) | |
| download | gcc-bbe04f213da2a9ec4bbbaa4b50bed4c8b53a3e98.zip gcc-bbe04f213da2a9ec4bbbaa4b50bed4c8b53a3e98.tar.gz gcc-bbe04f213da2a9ec4bbbaa4b50bed4c8b53a3e98.tar.bz2 | |
re PR c++/51832 (Rev.182970 causes LTO link errors (multiple definitions of allocator_traits))
PR c++/51832
* varpool.c (varpool_analyze_pending_decls): Copy DECL_EXTERNAL
for extra name aliases.
From-SVN: r183396
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/lto/pr51832.h | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/lto/pr51832_0.C | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/lto/pr51832_1.C | 1 | ||||
| -rw-r--r-- | gcc/varpool.c | 1 |
6 files changed, 28 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 71df98e..be82859 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-01-22 Jason Merrill <jason@redhat.com> + + PR c++/51832 + * varpool.c (varpool_analyze_pending_decls): Copy DECL_EXTERNAL + for extra name aliases. + 2012-01-22 Eric Botcazou <ebotcazou@adacore.com> PR rtl-optimization/51924 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 07b1fef..248578f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2012-01-22 Jason Merrill <jason@redhat.com> + + PR c++/51832 + * g++.dg/lto/pr51832.h: New. + * g++.dg/lto/pr51832_0.C: New. + * g++.dg/lto/pr51832_1.C: New. + 2012-01-22 Eric Botcazou <ebotcazou@adacore.com> * gcc.dg/ext-elim-1.c: New test. diff --git a/gcc/testsuite/g++.dg/lto/pr51832.h b/gcc/testsuite/g++.dg/lto/pr51832.h new file mode 100644 index 0000000..fee3693 --- /dev/null +++ b/gcc/testsuite/g++.dg/lto/pr51832.h @@ -0,0 +1,6 @@ +template<class...T> struct A +{ + static int i; +}; + +inline void f() { A<int>::i = 0; } diff --git a/gcc/testsuite/g++.dg/lto/pr51832_0.C b/gcc/testsuite/g++.dg/lto/pr51832_0.C new file mode 100644 index 0000000..f8fd7ab --- /dev/null +++ b/gcc/testsuite/g++.dg/lto/pr51832_0.C @@ -0,0 +1,7 @@ +// PR c++/51832 +// { dg-lto-do link } +// { dg-lto-options { "-std=c++11 -flto -fabi-version=2" } } + +#include "pr51832.h" + +int main() { } diff --git a/gcc/testsuite/g++.dg/lto/pr51832_1.C b/gcc/testsuite/g++.dg/lto/pr51832_1.C new file mode 100644 index 0000000..6f0137b --- /dev/null +++ b/gcc/testsuite/g++.dg/lto/pr51832_1.C @@ -0,0 +1 @@ +#include "pr51832.h" diff --git a/gcc/varpool.c b/gcc/varpool.c index 74fc1ba..e01accb 100644 --- a/gcc/varpool.c +++ b/gcc/varpool.c @@ -484,6 +484,7 @@ varpool_analyze_pending_decls (void) { DECL_WEAK (node->decl) = DECL_WEAK (node->alias_of); TREE_PUBLIC (node->decl) = TREE_PUBLIC (node->alias_of); + DECL_EXTERNAL (node->decl) = DECL_EXTERNAL (node->alias_of); DECL_VISIBILITY (node->decl) = DECL_VISIBILITY (node->alias_of); if (TREE_PUBLIC (node->decl)) { |