[OE-core] [RFC] [PATCH] [oe-core][dizzy]gcc-4.9: fix bug of 0056-top-level-reorder_gcc-bug-61144.patch

[Bian Naimeng]

The patch 0056-top-level-reorder_gcc-bug-61144.patch looks wrong.

It looks like a mistake, we shoud patch gcc/varpool.c not create the file
 meta/recipes-devtools/gcc/gcc-4.9/0056-top-level-reorder_gcc-bug-61144.patch

Signed-off-by: Bian Naimeng <biannm at cn.fujitsu.com>
---
 .../0056-top-level-reorder_gcc-bug-61144.patch     | 42 ++++++++++------------
 1 file changed, 19 insertions(+), 23 deletions(-)

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
index f448932..3d7b249 100644
--- 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
@@ -4,28 +4,24 @@ Upstream-Status: Backport
 Originally-submitted-by: Peter Urbanec <openembedded-devel at urbanec.net>
 Signed-off-by: Saul Wold <sgw at linux.intel.com>
 
---- /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 @@
+--- 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.
 +
-+   /* 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;
-+ 
++     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;
 
-- 
1.9.1