aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-19 16:18:56 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-19 16:18:56 +0000
commit663ddf8f17c06717d0b223ab3b133fea996a7afb (patch)
tree46e773c61abf63c702da401709d06ef99fffe5db
parentfedcfd030383e0096200d5aba8f18987def72014 (diff)
downloadupstream-663ddf8f17c06717d0b223ab3b133fea996a7afb.tar.gz
upstream-663ddf8f17c06717d0b223ab3b133fea996a7afb.tar.bz2
upstream-663ddf8f17c06717d0b223ab3b133fea996a7afb.zip
gcc: backport an upstream fix for extern vars with local weak definitions
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 42962
-rw-r--r--toolchain/gcc/patches/4.9-linaro/020-fix_pr61144.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/toolchain/gcc/patches/4.9-linaro/020-fix_pr61144.patch b/toolchain/gcc/patches/4.9-linaro/020-fix_pr61144.patch
new file mode 100644
index 0000000000..a6b320d881
--- /dev/null
+++ b/toolchain/gcc/patches/4.9-linaro/020-fix_pr61144.patch
@@ -0,0 +1,21 @@
+--- a/gcc/varpool.c
++++ b/gcc/varpool.c
+@@ -329,8 +329,16 @@ ctor_for_folding (tree decl)
+
+ /* Variables declared 'const' without an initializer
+ have zero as the initializer if they may not be
+- overridden at link or run time. */
+- if (!DECL_INITIAL (real_decl)
++ overridden at link or run time.
++
++ It is actually requirement for C++ compiler to optimize const variables
++ consistently. As a GNU extension, do not enfore this rule for user defined
++ weak variables, so we support interposition on:
++ static const int dummy = 0;
++ extern const int foo __attribute__((__weak__, __alias__("dummy")));
++ */
++ if ((!DECL_INITIAL (real_decl)
++ || (DECL_WEAK (decl) && !DECL_COMDAT (decl)))
+ && (DECL_EXTERNAL (decl) || decl_replaceable_p (decl)))
+ return error_mark_node;
+