From: chunrong guo <b40290@freescale.com>
Date: Wed, 28 Aug 2013 09:29:43 +0000 (+0000)
Subject: Revert "e500v2: workaround for ICE of gcc-4.8.x"
X-Git-Tag: 2.1~534^2~233
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0eb052b1852c4c4c83cdf56ec0c0d868ccfdfcd8;p=meta-freescale.git

Revert "e500v2: workaround for ICE of gcc-4.8.x"

*This reverts commit 	93c57323edc118eb8905980348ad3888664f2382
   and commit efd344473c277eab8c1bae56120779983aba6176
  *The reason for reverting this is:
   the below patch fix this problem.
   the patch url is : http://patches.openembedded.org/patch/56803/

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---

diff --git a/meta-fsl-ppc/conf/machine/e500v2.inc b/meta-fsl-ppc/conf/machine/e500v2.inc
index aabca6e2..96887845 100644
--- a/meta-fsl-ppc/conf/machine/e500v2.inc
+++ b/meta-fsl-ppc/conf/machine/e500v2.inc
@@ -3,12 +3,6 @@ require conf/machine/include/tune-ppce500v2.inc
 MACHINE_FEATURES = "kernel26 pci ext2 ext3 serial"
 MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf"
 
-# FIXME
-# Workaround for ICE of gcc-4.8.x when passing -mfloat-gprs=double
-# Bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57717#c1
-# Replace double-float with single-float, revert the commit when above bug is fixed
-TUNE_CCARGS := "${@d.getVar('TUNE_CCARGS', True).replace('-mfloat-gprs=double', '-mfloat-gprs=single')}"
-
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
diff --git a/meta-fsl-ppc/recipes-core/coreutils/coreutils_8.21.bbappend b/meta-fsl-ppc/recipes-core/coreutils/coreutils_8.21.bbappend
deleted file mode 100644
index 37d3ce26..00000000
--- a/meta-fsl-ppc/recipes-core/coreutils/coreutils_8.21.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI_append_e500v2 = " file://coreutils-fix-dd-segfault-for-e500v2.patch \
-"
diff --git a/meta-fsl-ppc/recipes-core/coreutils/files/coreutils-fix-dd-segfault-for-e500v2.patch b/meta-fsl-ppc/recipes-core/coreutils/files/coreutils-fix-dd-segfault-for-e500v2.patch
deleted file mode 100644
index dbeb9b2c..00000000
--- a/meta-fsl-ppc/recipes-core/coreutils/files/coreutils-fix-dd-segfault-for-e500v2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream-Status: Pending
-
-Fix the segmentation fault issue when using dd on e500v2 targets,
-use %f instead of $Lf, since single-float is used for e500v2 due to
-an ICE of gcc-4.8.1.
-
-Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
-
---- coreutils-8.21/lib/human.c.orig	2013-08-16 05:17:24.466225177 -0500
-+++ coreutils-8.21/lib/human.c	2013-08-16 05:17:52.007225123 -0500
-@@ -228,7 +228,7 @@
- 
-     if (! (opts & human_autoscale))
-       {
--        sprintf (buf, "%.0Lf", adjust_value (inexact_style, damt));
-+        sprintf (buf, "%.0f", adjust_value (inexact_style, damt));
-         buflen = strlen (buf);
-         nonintegerlen = 0;
-       }
-@@ -246,7 +246,7 @@
- 
-         damt /= e;
- 
--        sprintf (buf, "%.1Lf", adjust_value (inexact_style, damt));
-+        sprintf (buf, "%.1f", adjust_value (inexact_style, damt));
-         buflen = strlen (buf);
-         nonintegerlen = decimal_pointlen + 1;
- 
-@@ -254,7 +254,7 @@
-             || ((opts & human_suppress_point_zero)
-                 && buf[buflen - 1] == '0'))
-           {
--            sprintf (buf, "%.0Lf",
-+            sprintf (buf, "%.0f",
-                      adjust_value (inexact_style, damt * 10) / 10);
-             buflen = strlen (buf);
-             nonintegerlen = 0;