Merge branch 'busybox' into merge

1 files changed, 10 insertions, 8 deletions

diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 645a05f57..75e14ef7d 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -218,7 +218,14 @@ struct globals {
 
         bool not_first;
         bool prev_pair_equal;
+
+        char address_fmt[sizeof("%0n"OFF_FMT"xc")];
 } FIX_ALIASING;
+/* Corresponds to 'x' above */
+#define address_base_char G.address_fmt[sizeof(G.address_fmt)-3]
+/* Corresponds to 'n' above */
+#define address_pad_len_char G.address_fmt[2]
+
 #if !ENABLE_LONG_OPTS
 enum { G_pseudo_offset = 0 };
 #endif
@@ -227,6 +234,7 @@ enum { G_pseudo_offset = 0 };
         setup_common_bufsiz(); \
         BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
         G.bytes_per_block = 32; \
+        strcpy(G.address_fmt, "%0n"OFF_FMT"xc"); \
 } while (0)
 
 
@@ -851,18 +859,12 @@ format_address_none(off_t address UNUSED_PARAM, char c UNUSED_PARAM)
 {
 }
 
-static char address_fmt[] ALIGN1 = "%0n"OFF_FMT"xc";
-/* Corresponds to 'x' above */
-#define address_base_char address_fmt[sizeof(address_fmt)-3]
-/* Corresponds to 'n' above */
-#define address_pad_len_char address_fmt[2]
-
 static void
 format_address_std(off_t address, char c)
 {
         /* Corresponds to 'c' */
-        address_fmt[sizeof(address_fmt)-2] = c;
-        printf(address_fmt, address);
+        G.address_fmt[sizeof(G.address_fmt)-2] = c;
+        printf(G.address_fmt, address);
 }
 
 #if ENABLE_LONG_OPTS