Merge branch 'busybox' into merge

Conflicts:
	coreutils/od_bloaty.c
	libbb/lineedit.c

1 files changed, 1 insertions, 4 deletions

diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 34ceefb1c..1e7c5bfa0 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -395,10 +395,10 @@ print_named_ascii(size_t n_bytes, const char *block,
         };
         // buf[N] pos:  01234 56789
         char buf[12] = "   x\0 xxx\0";
-        // share string with print_ascii.
         // [12] because we take three 32bit stack slots anyway, and
         // gcc is too dumb to initialize with constant stores,
         // it copies initializer from rodata. Oh well.
+        // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65410
 
         while (n_bytes--) {
                 unsigned masked_c = *(unsigned char *) block++;
@@ -462,9 +462,6 @@ print_ascii(size_t n_bytes, const char *block,
                 case '\v':
                         s = "  \\v";
                         break;
-                case '\x7f':
-                        s = " 177";
-                        break;
                 default:
                         buf[6] = (c >> 6 & 3) + '0';
                         buf[7] = (c >> 3 & 7) + '0';