Revert "busybox : fix do_compile failed on qemumips when DEBUG_BUILD (ICE)"
cover Revert "busybox : fix do_compile failed on qemumips when DEBUG_BUILD (ICE)"
The following changes since commit b8631416f12b8a904ce3deb036f9d5ce632937b0:
package_regex.inc: Update REGEX'es in order to find upstream versions correctly (2014-11-28 14:03:02 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib hongxu/fix-busybox-ice-mips
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-busybox-ice-mips
Hongxu Jia (2):
Revert "busybox : fix do_compile failed on qemumips when DEBUG_BUILD
(ICE)"
Revert "fixup"
.../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(-) delete mode 100644 meta/recipes-core/busybox/busybox/fix-ice-on-mips-while-compiling-with-g-O.patch
Signature · 1 line
1.9.1
PATCH 1/2 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.
--- meta/recipes-core/busybox/busybox_1.22.1.bb | 4 ---- 1 file changed, 4 deletions(-)
meta/recipes-core/busybox/busybox_1.22.1.bb +0 -4
@@ -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"
Signature · 1 line
1.9.1
PATCH 2/2 Revert "fixup"
In reply to Hongxu JiaThis reverts commit 28e3f8ca6ff681f7a88c44b5c62390fa16be816b.
Revert "busybox : fix do_compile failed on qemumips when DEBUG_BUILD (ICE)" Since the gcc has resolved this, so we revert the workaround patch.
--- .../fix-ice-on-mips-while-compiling-with-g-O.patch | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox/fix-ice-on-mips-while-compiling-with-g-O.patch
meta/recipes-core/busybox/busybox/fix-ice-on-mips-while-compiling-with-g-O.patch deleted +0 -65
@@ -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 <[email protected]> ---- - 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 -
Signature · 1 line
1.9.1
Quoted 5 lines · Hongxu Jia
Hongxu Jia (2):
Revert "busybox : fixdo_compilefailed on qemumips whenDEBUG_BUILD(ICE)"Revert "fixup"
I think you meant to squash that :) (I'll do this).
Ross
Quoted 11 lines · Ross
On 3 December 2014 at 08:07, Hongxu Jia <[email protected] <mailto:[email protected]>> wrote:
Hongxu Jia (2): Revert "busybox : fix do_compile failed on qemumips when DEBUG_BUILD (ICE)" Revert "fixup"I think you meant to squash that :) (I'll do this).
Yes, thanks
//Hongxu
Quoted 1 line
Ross