summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-12-02 14:01:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-05 18:01:06 +0000
commit5e215923652b3bd540c305cf8294b78a7c966efa (patch)
tree520dbdd2570608fc99653038e5c4f158b9d454de
parent853e76f8bb8a82f1a8f3509a253a46df00e4b3cc (diff)
downloadpoky-5e215923652b3bd540c305cf8294b78a7c966efa.tar.gz
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox/fix-ice-on-mips-while-compiling-with-g-O.patch65
-rw-r--r--meta/recipes-core/busybox/busybox_1.22.1.bb4
2 files changed, 0 insertions, 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 d8bf5da696..0000000000
--- a/meta/recipes-core/busybox/busybox/fix-ice-on-mips-while-compiling-with-g-O.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1shell/ash.c: fix ice on mips while compiling with -g -O
2
3Build busybox on mips with -g -O, there is a ice failure:
4...
5shell/ash.c:8758:1: internal compiler error: in dwarf2out_var_location, at dwarf2out.c:21264
6...
7Please submit a full bug report,
8with preprocessed source if appropriate.
9See <http://gcc.gnu.org/bugs.html> for instructions.
10{standard input}: Assembler messages:
11{standard input}: Warning: missing .end at end of assembly
12{standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive
13...
14
15The following line caused the ice failure on mips:
16...
17void evaltreenr(union node *, int) __attribute__ ((alias("evaltree"),__noreturn__));
18...
19So remove evaltreenr which was a alias of evaltree, and use evaltree
20to instead.
21
22Upstream-Status: Pending
23
24Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
25---
26 shell/ash.c | 9 ++-------
27 1 file changed, 2 insertions(+), 7 deletions(-)
28
29diff --git a/shell/ash.c b/shell/ash.c
30index 71ef9a6..4462e40 100644
31--- a/shell/ash.c
32+++ b/shell/ash.c
33@@ -8490,11 +8490,6 @@ evaltree(union node *n, int flags)
34 TRACE(("leaving evaltree (no interrupts)\n"));
35 }
36
37-#if !defined(__alpha__) || (defined(__GNUC__) && __GNUC__ >= 3)
38-static
39-#endif
40-void evaltreenr(union node *, int) __attribute__ ((alias("evaltree"),__noreturn__));
41-
42 static void
43 evalloop(union node *n, int flags)
44 {
45@@ -8621,7 +8616,7 @@ evalsubshell(union node *n, int flags)
46 flags &= ~EV_TESTED;
47 nofork:
48 redirect(n->nredir.redirect, 0);
49- evaltreenr(n->nredir.n, flags);
50+ evaltree(n->nredir.n, flags);
51 /* never returns */
52 }
53 status = 0;
54@@ -8740,7 +8735,7 @@ evalpipe(union node *n, int flags)
55 dup2(pip[1], 1);
56 close(pip[1]);
57 }
58- evaltreenr(lp->n, flags);
59+ evaltree(lp->n, flags);
60 /* never returns */
61 }
62 if (prevfd >= 0)
63--
641.9.1
65
diff --git a/meta/recipes-core/busybox/busybox_1.22.1.bb b/meta/recipes-core/busybox/busybox_1.22.1.bb
index 7a50a304a7..8879e52962 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 \
34 file://busybox-cross-menuconfig.patch \ 34 file://busybox-cross-menuconfig.patch \
35" 35"
36 36
37SRC_URI_append_mips = " \
38 ${@base_conditional( "DEBUG_BUILD", "1", "file://fix-ice-on-mips-while-compiling-with-g-O.patch", "", d )} \
39"
40
41SRC_URI[tarball.md5sum] = "337d1a15ab1cb1d4ed423168b1eb7d7e" 37SRC_URI[tarball.md5sum] = "337d1a15ab1cb1d4ed423168b1eb7d7e"
42SRC_URI[tarball.sha256sum] = "ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b" 38SRC_URI[tarball.sha256sum] = "ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b"
43 39