[oe-commits] Hongxu Jia : Revert "busybox : fix do_compile failed on qemumips when DEBUG_BUILD (ICE)"

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 39e3745c7d6bc4594c3eaf4ea6fe762ee5dc7883
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=39e3745c7d6bc4594c3eaf4ea6fe762ee5dc7883

Author: Hongxu Jia <hongxu.jia at windriver.com>
Date:   Tue Dec  2 14:01:12 2014 +0800

Revert "busybox : fix do_compile failed on qemumips when DEBUG_BUILD (ICE)"

Since the gcc has resolved this, so we revert the workaround patch.

This reverts commit f026b7a211a44acdb7fadb50b1a84aa3e369450a.

---

 .../fix-ice-on-mips-while-compiling-with-g-O.patch | 65 ----------------------
 meta/recipes-core/busybox/busybox_1.22.1.bb        |  4 --
 2 files changed, 69 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox/fix-ice-on-mips-while-compiling-with-g-O.patch b/meta/recipes-core/busybox/busybox/fix-ice-on-mips-while-compiling-with-g-O.patch
deleted file mode 100644
index d8bf5da..0000000
--- a/meta/recipes-core/busybox/busybox/fix-ice-on-mips-while-compiling-with-g-O.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-shell/ash.c: fix ice on mips while compiling with -g -O
-
-Build busybox on mips with -g -O, there is a ice failure:
-...
-shell/ash.c:8758:1: internal compiler error: in dwarf2out_var_location, at dwarf2out.c:21264
-...
-Please submit a full bug report,
-with preprocessed source if appropriate.
-See <http://gcc.gnu.org/bugs.html> for instructions.
-{standard input}: Assembler messages:
-{standard input}: Warning: missing .end at end of assembly
-{standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive
-...
-
-The following line caused the ice failure on mips:
-...
-void evaltreenr(union node *, int) __attribute__ ((alias("evaltree"),__noreturn__));
-...
-So remove evaltreenr which was a alias of evaltree, and use evaltree
-to instead.
-
-Upstream-Status: Pending
-
-Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
----
- shell/ash.c | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/shell/ash.c b/shell/ash.c
-index 71ef9a6..4462e40 100644
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -8490,11 +8490,6 @@ evaltree(union node *n, int flags)
- 	TRACE(("leaving evaltree (no interrupts)\n"));
- }
- 
--#if !defined(__alpha__) || (defined(__GNUC__) && __GNUC__ >= 3)
--static
--#endif
--void evaltreenr(union node *, int) __attribute__ ((alias("evaltree"),__noreturn__));
--
- static void
- evalloop(union node *n, int flags)
- {
-@@ -8621,7 +8616,7 @@ evalsubshell(union node *n, int flags)
- 			flags &= ~EV_TESTED;
-  nofork:
- 		redirect(n->nredir.redirect, 0);
--		evaltreenr(n->nredir.n, flags);
-+		evaltree(n->nredir.n, flags);
- 		/* never returns */
- 	}
- 	status = 0;
-@@ -8740,7 +8735,7 @@ evalpipe(union node *n, int flags)
- 				dup2(pip[1], 1);
- 				close(pip[1]);
- 			}
--			evaltreenr(lp->n, flags);
-+			evaltree(lp->n, flags);
- 			/* never returns */
- 		}
- 		if (prevfd >= 0)
--- 
-1.9.1
-
diff --git a/meta/recipes-core/busybox/busybox_1.22.1.bb b/meta/recipes-core/busybox/busybox_1.22.1.bb
index 7a50a30..8879e52 100644
--- a/meta/recipes-core/busybox/busybox_1.22.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.22.1.bb
@@ -34,10 +34,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://busybox-cross-menuconfig.patch \
 "
 
-SRC_URI_append_mips = " \
-    ${@base_conditional( "DEBUG_BUILD", "1", "file://fix-ice-on-mips-while-compiling-with-g-O.patch", "", d )} \
-"
-
 SRC_URI[tarball.md5sum] = "337d1a15ab1cb1d4ed423168b1eb7d7e"
 SRC_URI[tarball.sha256sum] = "ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b"