| 1 | diff -u -r ../busybox-1.24.1/arch/i386/Makefile ./arch/i386/Makefile |
| 2 | --- ../busybox-1.24.1/arch/i386/Makefile 2015-07-12 22:18:46.000000000 -0400 |
| 3 | +++ ./arch/i386/Makefile 2015-12-25 19:05:56.660211464 -0500 |
| 4 | @@ -4,4 +4,5 @@ |
| 5 | |
| 6 | # -mpreferred-stack-boundary=2 is essential in preventing gcc 4.2.x |
| 7 | # from aligning stack to 16 bytes. (Which is gcc's way of supporting SSE). |
| 8 | -CFLAGS += $(call cc-option,-march=i386 -mpreferred-stack-boundary=2,) |
| 9 | +# This fixes crashing e.g. running busybox sed -e "s#'#'\"'\"'#g" |
| 10 | +# on the x86_64 emulator. |
| 11 | +# CFLAGS += $(call cc-option,-march=i386 -mpreferred-stack-boundary=2,) |