From 365221f7285c0e392f573deaab3b1e00b12bc293 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Fri, 10 Oct 2014 23:46:16 -0700 Subject: gcc: backport patch for gcc bug 61144 This fixes gcc bug 6144, which in my case exhibited itself as a kernel module that failed to load. This was because static platform_data structures were being corrupted with the optimiser being set to any value other than -O0. Originally-submitted-by: Peter Urbanec Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-4.9.inc | 1 + .../0056-top-level-reorder_gcc-bug-61144.patch | 31 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0056-top-level-reorder_gcc-bug-61144.patch diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index 25778bd272..9a66cd294f 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc @@ -70,6 +70,7 @@ SRC_URI = "\ file://0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch \ file://0054-gcc-Makefile.in-fix-parallel-building-failure.patch \ file://0055-PR-rtl-optimization-61801.patch \ + file://0056-top-level-reorder_gcc-bug-61144.patch \ " SRC_URI[md5sum] = "fddf71348546af523353bd43d34919c1" SRC_URI[sha256sum] = "d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e" diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0056-top-level-reorder_gcc-bug-61144.patch b/meta/recipes-devtools/gcc/gcc-4.9/0056-top-level-reorder_gcc-bug-61144.patch new file mode 100644 index 0000000000..f44893251c --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0056-top-level-reorder_gcc-bug-61144.patch @@ -0,0 +1,31 @@ + +Upstream-Status: Backport + +Originally-submitted-by: Peter Urbanec +Signed-off-by: Saul Wold + +--- /dev/null ++++ b/meta/recipes-devtools/gcc/gcc-4.9/0056-top-level-reorder_gcc-bug-61144.patch +@@ -0,0 +1,21 @@ ++--- a/gcc/varpool.c 2014/10/05 02:50:01 215895 +++++ b/gcc/varpool.c 2014/10/05 04:52:19 215896 ++@@ -329,8 +329,16 @@ ++ ++ /* 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; ++ + -- cgit 1.2.3-korg