aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/gcc
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
commit78bf28895b9b1d93361f267889baca8ea973c8b5 (patch)
treebf4f95faf7ebceb0bbc2b354bee6617c8f122ac7 /toolchain/gcc
parent5e574fc33fa10c457ee7f823381febce2fdc3c80 (diff)
downloadupstream-78bf28895b9b1d93361f267889baca8ea973c8b5.tar.gz
upstream-78bf28895b9b1d93361f267889baca8ea973c8b5.tar.bz2
upstream-78bf28895b9b1d93361f267889baca8ea973c8b5.zip
gcc: backport an upstream fix for extern vars with local weak definitions
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42962 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/gcc')
-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;
+