aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2016-04-22 18:09:21 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2016-04-22 18:09:21 +0200
commit3e134ebf6afb5552b3619f98f6a2ffa01a07eebb (patch)
tree6cafe5f8e63a88e4ab7b2a449dc62dd3afb3c8bf
parent663d1da1e68b15397c00d6a094f78c2cf08358ea (diff)
downloadbusybox-w32-3e134ebf6afb5552b3619f98f6a2ffa01a07eebb.tar.gz
busybox-w32-3e134ebf6afb5552b3619f98f6a2ffa01a07eebb.tar.bz2
busybox-w32-3e134ebf6afb5552b3619f98f6a2ffa01a07eebb.zip
*: slap on a few ALIGN1/2s where appropriate
The result of looking at "grep -F -B2 '*fill*' busybox_unstripped.map" text data bss dec hex filename 829901 4086 1904 835891 cc133 busybox_before 829665 4086 1904 835655 cc047 busybox Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/libarchive/common.c2
-rw-r--r--archival/lzop.c2
-rw-r--r--archival/unzip.c2
-rw-r--r--coreutils/stty.c6
-rw-r--r--e2fsprogs/e2fs_lib.c4
-rw-r--r--editors/sed.c2
-rw-r--r--editors/vi.c2
-rw-r--r--init/bootchartd.c2
-rw-r--r--libbb/mode_string.c4
-rw-r--r--libbb/pw_encrypt.c2
-rw-r--r--libbb/u_signal_names.c2
-rw-r--r--miscutils/adjtimex.c6
-rw-r--r--miscutils/eject.c2
-rw-r--r--miscutils/ionice.c2
-rw-r--r--miscutils/setserial.c8
-rw-r--r--networking/libiproute/ipneigh.c2
-rw-r--r--networking/libiproute/ll_proto.c2
-rw-r--r--networking/libiproute/ll_types.c4
-rw-r--r--networking/telnetd.ctrlSQ.patch4
-rw-r--r--networking/udhcp/dhcpc.c2
-rw-r--r--networking/wget.c6
-rw-r--r--procps/top.c6
-rw-r--r--shell/ash.c6
-rw-r--r--shell/shell_common.c2
-rw-r--r--util-linux/fatattr.c2
-rw-r--r--util-linux/mount.c6
-rw-r--r--util-linux/nsenter.c2
-rw-r--r--util-linux/unshare.c2
-rw-r--r--util-linux/volume_id/bcache.c2
-rw-r--r--util-linux/volume_id/luks.c2
30 files changed, 49 insertions, 49 deletions
diff --git a/archival/libarchive/common.c b/archival/libarchive/common.c
index dd69d2222..389cb7856 100644
--- a/archival/libarchive/common.c
+++ b/archival/libarchive/common.c
@@ -6,4 +6,4 @@
6#include "libbb.h" 6#include "libbb.h"
7#include "bb_archive.h" 7#include "bb_archive.h"
8 8
9const char cpio_TRAILER[] = "TRAILER!!!"; 9const char cpio_TRAILER[] ALIGN1 = "TRAILER!!!";
diff --git a/archival/lzop.c b/archival/lzop.c
index 4afa21889..202de4d03 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -896,7 +896,7 @@ static NOINLINE int lzo_decompress(const header_t *h)
896 * chksum_out 896 * chksum_out
897 * The rest is identical. 897 * The rest is identical.
898*/ 898*/
899static const unsigned char lzop_magic[9] = { 899static const unsigned char lzop_magic[9] ALIGN1 = {
900 0x89, 0x4c, 0x5a, 0x4f, 0x00, 0x0d, 0x0a, 0x1a, 0x0a 900 0x89, 0x4c, 0x5a, 0x4f, 0x00, 0x0d, 0x0a, 0x1a, 0x0a
901}; 901};
902 902
diff --git a/archival/unzip.c b/archival/unzip.c
index be32e60e2..c540485ac 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -487,7 +487,7 @@ int unzip_main(int argc, char **argv)
487 if (overwrite == O_PROMPT) 487 if (overwrite == O_PROMPT)
488 overwrite = O_NEVER; 488 overwrite = O_NEVER;
489 } else { 489 } else {
490 static const char extn[][5] = { ".zip", ".ZIP" }; 490 static const char extn[][5] ALIGN1 = { ".zip", ".ZIP" };
491 char *ext = src_fn + strlen(src_fn); 491 char *ext = src_fn + strlen(src_fn);
492 int src_fd; 492 int src_fd;
493 493
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 0e32fc898..52967ea8f 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -318,7 +318,7 @@ enum {
318#define MI_ENTRY(N,T,F,B,M) N "\0" 318#define MI_ENTRY(N,T,F,B,M) N "\0"
319 319
320/* Mode names given on command line */ 320/* Mode names given on command line */
321static const char mode_name[] = 321static const char mode_name[] ALIGN1 =
322 MI_ENTRY("evenp", combination, REV | OMIT, 0, 0 ) 322 MI_ENTRY("evenp", combination, REV | OMIT, 0, 0 )
323 MI_ENTRY("parity", combination, REV | OMIT, 0, 0 ) 323 MI_ENTRY("parity", combination, REV | OMIT, 0, 0 )
324 MI_ENTRY("oddp", combination, REV | OMIT, 0, 0 ) 324 MI_ENTRY("oddp", combination, REV | OMIT, 0, 0 )
@@ -681,7 +681,7 @@ enum {
681#define CI_ENTRY(n,s,o) n "\0" 681#define CI_ENTRY(n,s,o) n "\0"
682 682
683/* Name given on command line */ 683/* Name given on command line */
684static const char control_name[] = 684static const char control_name[] ALIGN1 =
685 CI_ENTRY("intr", CINTR, VINTR ) 685 CI_ENTRY("intr", CINTR, VINTR )
686 CI_ENTRY("quit", CQUIT, VQUIT ) 686 CI_ENTRY("quit", CQUIT, VQUIT )
687 CI_ENTRY("erase", CERASE, VERASE ) 687 CI_ENTRY("erase", CERASE, VERASE )
@@ -723,7 +723,7 @@ static const char control_name[] =
723#undef CI_ENTRY 723#undef CI_ENTRY
724#define CI_ENTRY(n,s,o) { s, o }, 724#define CI_ENTRY(n,s,o) { s, o },
725 725
726static const struct control_info control_info[] = { 726static const struct control_info control_info[] ALIGN2 = {
727 /* This should be verbatim cut-n-paste copy of the above CI_ENTRYs */ 727 /* This should be verbatim cut-n-paste copy of the above CI_ENTRYs */
728 CI_ENTRY("intr", CINTR, VINTR ) 728 CI_ENTRY("intr", CINTR, VINTR )
729 CI_ENTRY("quit", CQUIT, VQUIT ) 729 CI_ENTRY("quit", CQUIT, VQUIT )
diff --git a/e2fsprogs/e2fs_lib.c b/e2fsprogs/e2fs_lib.c
index a6aec9484..6ce655be3 100644
--- a/e2fsprogs/e2fs_lib.c
+++ b/e2fsprogs/e2fs_lib.c
@@ -149,14 +149,14 @@ const uint32_t e2attr_flags_value[] = {
149 EXT2_TOPDIR_FL 149 EXT2_TOPDIR_FL
150}; 150};
151 151
152const char e2attr_flags_sname[] = 152const char e2attr_flags_sname[] ALIGN1 =
153#ifdef ENABLE_COMPRESSION 153#ifdef ENABLE_COMPRESSION
154 "BZXE" 154 "BZXE"
155#endif 155#endif
156 "I" 156 "I"
157 "suSDiadAcjtT"; 157 "suSDiadAcjtT";
158 158
159static const char e2attr_flags_lname[] = 159static const char e2attr_flags_lname[] ALIGN1 =
160#ifdef ENABLE_COMPRESSION 160#ifdef ENABLE_COMPRESSION
161 "Compressed_File" "\0" 161 "Compressed_File" "\0"
162 "Compressed_Dirty_File" "\0" 162 "Compressed_Dirty_File" "\0"
diff --git a/editors/sed.c b/editors/sed.c
index ed48de17f..6bce25b2c 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -473,7 +473,7 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr)
473 */ 473 */
474static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr) 474static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr)
475{ 475{
476 static const char cmd_letters[] = "saicrw:btTydDgGhHlnNpPqx={}"; 476 static const char cmd_letters[] ALIGN1 = "saicrw:btTydDgGhHlnNpPqx={}";
477 enum { 477 enum {
478 IDX_s = 0, 478 IDX_s = 0,
479 IDX_a, 479 IDX_a,
diff --git a/editors/vi.c b/editors/vi.c
index f355712ab..974f9978b 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -251,7 +251,7 @@ enum {
251// cmds modifying text[] 251// cmds modifying text[]
252// vda: removed "aAiIs" as they switch us into insert mode 252// vda: removed "aAiIs" as they switch us into insert mode
253// and remembering input for replay after them makes no sense 253// and remembering input for replay after them makes no sense
254static const char modifying_cmds[] = "cCdDJoOpPrRxX<>~"; 254static const char modifying_cmds[] ALIGN1 = "cCdDJoOpPrRxX<>~";
255#endif 255#endif
256 256
257enum { 257enum {
diff --git a/init/bootchartd.c b/init/bootchartd.c
index 7f511e650..92aaade0f 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -194,7 +194,7 @@ static char *make_tempdir(void)
194 * Since we unmount it at once, we can mount it anywhere. 194 * Since we unmount it at once, we can mount it anywhere.
195 * Try a few locations which are likely ti exist. 195 * Try a few locations which are likely ti exist.
196 */ 196 */
197 static const char dirs[] = "/mnt\0""/tmp\0""/boot\0""/proc\0"; 197 static const char dirs[] ALIGN1 = "/mnt\0""/tmp\0""/boot\0""/proc\0";
198 const char *try_dir = dirs; 198 const char *try_dir = dirs;
199 while (mount("none", try_dir, "tmpfs", MS_SILENT, "size=16m") != 0) { 199 while (mount("none", try_dir, "tmpfs", MS_SILENT, "size=16m") != 0) {
200 try_dir += strlen(try_dir) + 1; 200 try_dir += strlen(try_dir) + 1;
diff --git a/libbb/mode_string.c b/libbb/mode_string.c
index f1afe7d61..934eb6dc7 100644
--- a/libbb/mode_string.c
+++ b/libbb/mode_string.c
@@ -87,9 +87,9 @@ const char* FAST_FUNC bb_mode_string(mode_t mode)
87 87
88/* The previous version used "0pcCd?bB-?l?s???". However, the '0', 'C', 88/* The previous version used "0pcCd?bB-?l?s???". However, the '0', 'C',
89 * and 'B' types don't appear to be available on linux. So I removed them. */ 89 * and 'B' types don't appear to be available on linux. So I removed them. */
90static const char type_chars[16] = "?pc?d?b?-?l?s???"; 90static const char type_chars[16] ALIGN1 = "?pc?d?b?-?l?s???";
91/********************************** 0123456789abcdef */ 91/********************************** 0123456789abcdef */
92static const char mode_chars[7] = "rwxSTst"; 92static const char mode_chars[7] ALIGN1 = "rwxSTst";
93 93
94const char* FAST_FUNC bb_mode_string(mode_t mode) 94const char* FAST_FUNC bb_mode_string(mode_t mode)
95{ 95{
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c
index dbc15e5fc..4cdc2de76 100644
--- a/libbb/pw_encrypt.c
+++ b/libbb/pw_encrypt.c
@@ -9,7 +9,7 @@
9 9
10#include "libbb.h" 10#include "libbb.h"
11 11
12/* static const uint8_t ascii64[] = 12/* static const uint8_t ascii64[] ALIGN1 =
13 * "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; 13 * "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
14 */ 14 */
15 15
diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c
index 8c78f5e20..b49714f2a 100644
--- a/libbb/u_signal_names.c
+++ b/libbb/u_signal_names.c
@@ -19,7 +19,7 @@
19/* Believe it or not, but some arches have more than 32 SIGs! 19/* Believe it or not, but some arches have more than 32 SIGs!
20 * HPPA: SIGSTKFLT == 36. */ 20 * HPPA: SIGSTKFLT == 36. */
21 21
22static const char signals[][7] = { 22static const char signals[][7] ALIGN1 = {
23 // SUSv3 says kill must support these, and specifies the numerical values, 23 // SUSv3 says kill must support these, and specifies the numerical values,
24 // http://www.opengroup.org/onlinepubs/009695399/utilities/kill.html 24 // http://www.opengroup.org/onlinepubs/009695399/utilities/kill.html
25 // {0, "EXIT"}, {1, "HUP"}, {2, "INT"}, {3, "QUIT"}, 25 // {0, "EXIT"}, {1, "HUP"}, {2, "INT"}, {3, "QUIT"},
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index 534364a69..058aa9a5c 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -29,7 +29,7 @@
29# include <sys/timex.h> 29# include <sys/timex.h>
30#endif 30#endif
31 31
32static const uint16_t statlist_bit[] = { 32static const uint16_t statlist_bit[] ALIGN2 = {
33 STA_PLL, 33 STA_PLL,
34 STA_PPSFREQ, 34 STA_PPSFREQ,
35 STA_PPSTIME, 35 STA_PPSTIME,
@@ -45,7 +45,7 @@ static const uint16_t statlist_bit[] = {
45 STA_CLOCKERR, 45 STA_CLOCKERR,
46 0 46 0
47}; 47};
48static const char statlist_name[] = 48static const char statlist_name[] ALIGN1 =
49 "PLL" "\0" 49 "PLL" "\0"
50 "PPSFREQ" "\0" 50 "PPSFREQ" "\0"
51 "PPSTIME" "\0" 51 "PPSTIME" "\0"
@@ -61,7 +61,7 @@ static const char statlist_name[] =
61 "CLOCKERR" 61 "CLOCKERR"
62; 62;
63 63
64static const char ret_code_descript[] = 64static const char ret_code_descript[] ALIGN1 =
65 "clock synchronized" "\0" 65 "clock synchronized" "\0"
66 "insert leap second" "\0" 66 "insert leap second" "\0"
67 "delete leap second" "\0" 67 "delete leap second" "\0"
diff --git a/miscutils/eject.c b/miscutils/eject.c
index e33d79127..16ae250ff 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -40,7 +40,7 @@
40#if ENABLE_FEATURE_EJECT_SCSI 40#if ENABLE_FEATURE_EJECT_SCSI
41static void eject_scsi(const char *dev) 41static void eject_scsi(const char *dev)
42{ 42{
43 static const char sg_commands[3][6] = { 43 static const char sg_commands[3][6] ALIGN1 = {
44 { ALLOW_MEDIUM_REMOVAL, 0, 0, 0, 0, 0 }, 44 { ALLOW_MEDIUM_REMOVAL, 0, 0, 0, 0, 0 },
45 { START_STOP, 0, 0, 0, 1, 0 }, 45 { START_STOP, 0, 0, 0, 1, 0 },
46 { START_STOP, 0, 0, 0, 2, 0 } 46 { START_STOP, 0, 0, 0, 2, 0 }
diff --git a/miscutils/ionice.c b/miscutils/ionice.c
index bd300605f..0c14256ab 100644
--- a/miscutils/ionice.c
+++ b/miscutils/ionice.c
@@ -41,7 +41,7 @@ enum {
41 IOPRIO_CLASS_IDLE 41 IOPRIO_CLASS_IDLE
42}; 42};
43 43
44static const char to_prio[] = "none\0realtime\0best-effort\0idle"; 44static const char to_prio[] ALIGN1 = "none\0realtime\0best-effort\0idle";
45 45
46#define IOPRIO_CLASS_SHIFT 13 46#define IOPRIO_CLASS_SHIFT 13
47 47
diff --git a/miscutils/setserial.c b/miscutils/setserial.c
index dfed3306e..8b5c4a9c7 100644
--- a/miscutils/setserial.c
+++ b/miscutils/setserial.c
@@ -257,7 +257,7 @@ enum print_mode
257#define CTL_CLOSE (1 << 3) 257#define CTL_CLOSE (1 << 3)
258#define CTL_NODIE (1 << 4) 258#define CTL_NODIE (1 << 4)
259 259
260static const char serial_types[] = 260static const char serial_types[] ALIGN1 =
261 "unknown\0" /* 0 */ 261 "unknown\0" /* 0 */
262 "8250\0" /* 1 */ 262 "8250\0" /* 1 */
263 "16450\0" /* 2 */ 263 "16450\0" /* 2 */
@@ -288,7 +288,7 @@ static const char serial_types[] =
288# define MAX_SERIAL_TYPE 13 288# define MAX_SERIAL_TYPE 13
289#endif 289#endif
290 290
291static const char commands[] = 291static const char commands[] ALIGN1 =
292 "spd_normal\0" 292 "spd_normal\0"
293 "spd_hi\0" 293 "spd_hi\0"
294 "spd_vhi\0" 294 "spd_vhi\0"
@@ -404,8 +404,8 @@ static const uint16_t setbits[CMD_FLAG_LAST + 1] =
404 ASYNC_LOW_LATENCY 404 ASYNC_LOW_LATENCY
405}; 405};
406 406
407static const char STR_INFINITE[] = "infinite"; 407#define STR_INFINITE "infinite"
408static const char STR_NONE[] = "none"; 408#define STR_NONE "none"
409 409
410static const char *uart_type(int type) 410static const char *uart_type(int type)
411{ 411{
diff --git a/networking/libiproute/ipneigh.c b/networking/libiproute/ipneigh.c
index d2028b7b6..2a1c20e20 100644
--- a/networking/libiproute/ipneigh.c
+++ b/networking/libiproute/ipneigh.c
@@ -62,7 +62,7 @@ static unsigned nud_state_a2n(char *arg)
62 "stale\0" "incomplete\0" "delay\0" "probe\0" 62 "stale\0" "incomplete\0" "delay\0" "probe\0"
63 "failed\0" 63 "failed\0"
64 ; 64 ;
65 static uint8_t nuds[] = { 65 static uint8_t nuds[] ALIGN1 = {
66 NUD_PERMANENT,NUD_REACHABLE, NUD_NOARP,NUD_NONE, 66 NUD_PERMANENT,NUD_REACHABLE, NUD_NOARP,NUD_NONE,
67 NUD_STALE, NUD_INCOMPLETE,NUD_DELAY,NUD_PROBE, 67 NUD_STALE, NUD_INCOMPLETE,NUD_DELAY,NUD_PROBE,
68 NUD_FAILED 68 NUD_FAILED
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c
index da2b53cbf..4c32ae574 100644
--- a/networking/libiproute/ll_proto.c
+++ b/networking/libiproute/ll_proto.c
@@ -84,7 +84,7 @@ ETH_P_IP
84 84
85/* Keep declarations above and below in sync! */ 85/* Keep declarations above and below in sync! */
86 86
87static const char llproto_names[] = 87static const char llproto_names[] ALIGN1 =
88#define __PF(f,n) #n "\0" 88#define __PF(f,n) #n "\0"
89__PF(LOOP,loop) 89__PF(LOOP,loop)
90__PF(PUP,pup) 90__PF(PUP,pup)
diff --git a/networking/libiproute/ll_types.c b/networking/libiproute/ll_types.c
index bb42e269e..62ee0cc54 100644
--- a/networking/libiproute/ll_types.c
+++ b/networking/libiproute/ll_types.c
@@ -16,7 +16,7 @@
16 16
17const char* FAST_FUNC ll_type_n2a(int type, char *buf) 17const char* FAST_FUNC ll_type_n2a(int type, char *buf)
18{ 18{
19 static const char arphrd_name[] = 19 static const char arphrd_name[] ALIGN1 =
20 /* 0, */ "generic" "\0" 20 /* 0, */ "generic" "\0"
21 /* ARPHRD_LOOPBACK, */ "loopback" "\0" 21 /* ARPHRD_LOOPBACK, */ "loopback" "\0"
22 /* ARPHRD_ETHER, */ "ether" "\0" 22 /* ARPHRD_ETHER, */ "ether" "\0"
@@ -105,7 +105,7 @@ const char* FAST_FUNC ll_type_n2a(int type, char *buf)
105 105
106 /* Keep these arrays in sync! */ 106 /* Keep these arrays in sync! */
107 107
108 static const uint16_t arphrd_type[] = { 108 static const uint16_t arphrd_type[] ALIGN2 = {
109 0, /* "generic" "\0" */ 109 0, /* "generic" "\0" */
110 ARPHRD_LOOPBACK, /* "loopback" "\0" */ 110 ARPHRD_LOOPBACK, /* "loopback" "\0" */
111 ARPHRD_ETHER, /* "ether" "\0" */ 111 ARPHRD_ETHER, /* "ether" "\0" */
diff --git a/networking/telnetd.ctrlSQ.patch b/networking/telnetd.ctrlSQ.patch
index 7060e1c6e..bc26d2279 100644
--- a/networking/telnetd.ctrlSQ.patch
+++ b/networking/telnetd.ctrlSQ.patch
@@ -94,9 +94,9 @@ exceptional conditions.
94 #endif 94 #endif
95+#ifdef TIOCPKT 95+#ifdef TIOCPKT
96+ int control; 96+ int control;
97+ static const char lflow_on[] = 97+ static const char lflow_on[] ALIGN1 =
98+ {IAC, SB, TELOPT_LFLOW, LFLOW_ON, IAC, SE}; 98+ {IAC, SB, TELOPT_LFLOW, LFLOW_ON, IAC, SE};
99+ static const char lflow_off[] = 99+ static const char lflow_off[] ALIGN1 =
100+ {IAC, SB, TELOPT_LFLOW, LFLOW_OFF, IAC, SE}; 100+ {IAC, SB, TELOPT_LFLOW, LFLOW_OFF, IAC, SE};
101+# define RESERVED sizeof(lflow_on) 101+# define RESERVED sizeof(lflow_on)
102+#else 102+#else
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 8f5a03f2e..fc7b6216d 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -109,7 +109,7 @@ enum {
109/*** Script execution code ***/ 109/*** Script execution code ***/
110 110
111/* get a rough idea of how long an option will be (rounding up...) */ 111/* get a rough idea of how long an option will be (rounding up...) */
112static const uint8_t len_of_option_as_string[] = { 112static const uint8_t len_of_option_as_string[] ALIGN1 = {
113 [OPTION_IP ] = sizeof("255.255.255.255 "), 113 [OPTION_IP ] = sizeof("255.255.255.255 "),
114 [OPTION_IP_PAIR ] = sizeof("255.255.255.255 ") * 2, 114 [OPTION_IP_PAIR ] = sizeof("255.255.255.255 ") * 2,
115 [OPTION_STATIC_ROUTES ] = sizeof("255.255.255.255/32 255.255.255.255 "), 115 [OPTION_STATIC_ROUTES ] = sizeof("255.255.255.255/32 255.255.255.255 "),
diff --git a/networking/wget.c b/networking/wget.c
index 5c12423c7..28c12540b 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -146,10 +146,10 @@ struct host_info {
146 char *host; 146 char *host;
147 int port; 147 int port;
148}; 148};
149static const char P_FTP[] = "ftp"; 149static const char P_FTP[] ALIGN1 = "ftp";
150static const char P_HTTP[] = "http"; 150static const char P_HTTP[] ALIGN1 = "http";
151#if ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER 151#if ENABLE_FEATURE_WGET_OPENSSL || ENABLE_FEATURE_WGET_SSL_HELPER
152static const char P_HTTPS[] = "https"; 152static const char P_HTTPS[] ALIGN1 = "https";
153#endif 153#endif
154 154
155#if ENABLE_FEATURE_WGET_LONG_OPTIONS 155#if ENABLE_FEATURE_WGET_LONG_OPTIONS
diff --git a/procps/top.c b/procps/top.c
index 640bcdc6d..73cd285f0 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -265,9 +265,9 @@ static int mult_lvl_cmp(void* a, void* b)
265static NOINLINE int read_cpu_jiffy(FILE *fp, jiffy_counts_t *p_jif) 265static NOINLINE int read_cpu_jiffy(FILE *fp, jiffy_counts_t *p_jif)
266{ 266{
267#if !ENABLE_FEATURE_TOP_SMP_CPU 267#if !ENABLE_FEATURE_TOP_SMP_CPU
268 static const char fmt[] = "cpu %llu %llu %llu %llu %llu %llu %llu %llu"; 268 static const char fmt[] ALIGN1 = "cpu %llu %llu %llu %llu %llu %llu %llu %llu";
269#else 269#else
270 static const char fmt[] = "cp%*s %llu %llu %llu %llu %llu %llu %llu %llu"; 270 static const char fmt[] ALIGN1 = "cp%*s %llu %llu %llu %llu %llu %llu %llu %llu";
271#endif 271#endif
272 int ret; 272 int ret;
273 273
@@ -519,7 +519,7 @@ enum {
519 519
520static void parse_meminfo(unsigned long meminfo[MI_MAX]) 520static void parse_meminfo(unsigned long meminfo[MI_MAX])
521{ 521{
522 static const char fields[] = 522 static const char fields[] ALIGN1 =
523 "MemTotal\0" 523 "MemTotal\0"
524 "MemFree\0" 524 "MemFree\0"
525 "MemShared\0" 525 "MemShared\0"
diff --git a/shell/ash.c b/shell/ash.c
index da9c95045..faa45a8dc 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2750,7 +2750,7 @@ pwdcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
2750#else 2750#else
2751# define SIT_ITEM(a,b,c,d) (a | (b << 4) | (c << 8)) 2751# define SIT_ITEM(a,b,c,d) (a | (b << 4) | (c << 8))
2752#endif 2752#endif
2753static const uint16_t S_I_T[] = { 2753static const uint16_t S_I_T[] ALIGN2 = {
2754#if ENABLE_ASH_ALIAS 2754#if ENABLE_ASH_ALIAS
2755 SIT_ITEM(CSPCL , CIGN , CIGN , CIGN ), /* 0, PEOA */ 2755 SIT_ITEM(CSPCL , CIGN , CIGN , CIGN ), /* 0, PEOA */
2756#endif 2756#endif
@@ -2852,7 +2852,7 @@ SIT(int c, int syntax)
2852 2852
2853#else /* !USE_SIT_FUNCTION */ 2853#else /* !USE_SIT_FUNCTION */
2854 2854
2855static const uint8_t syntax_index_table[] = { 2855static const uint8_t syntax_index_table[] ALIGN1 = {
2856 /* BASESYNTAX_DQSYNTAX_SQSYNTAX_ARISYNTAX */ 2856 /* BASESYNTAX_DQSYNTAX_SQSYNTAX_ARISYNTAX */
2857 /* 0 */ CWORD_CWORD_CWORD_CWORD, 2857 /* 0 */ CWORD_CWORD_CWORD_CWORD,
2858 /* 1 */ CWORD_CWORD_CWORD_CWORD, 2858 /* 1 */ CWORD_CWORD_CWORD_CWORD,
@@ -7977,7 +7977,7 @@ static char *funcstring; /* block to allocate strings from */
7977#define EV_TESTED 02 /* exit status is checked; ignore -e flag */ 7977#define EV_TESTED 02 /* exit status is checked; ignore -e flag */
7978#define EV_BACKCMD 04 /* command executing within back quotes */ 7978#define EV_BACKCMD 04 /* command executing within back quotes */
7979 7979
7980static const uint8_t nodesize[N_NUMBER] = { 7980static const uint8_t nodesize[N_NUMBER] ALIGN1 = {
7981 [NCMD ] = SHELL_ALIGN(sizeof(struct ncmd)), 7981 [NCMD ] = SHELL_ALIGN(sizeof(struct ncmd)),
7982 [NPIPE ] = SHELL_ALIGN(sizeof(struct npipe)), 7982 [NPIPE ] = SHELL_ALIGN(sizeof(struct npipe)),
7983 [NREDIR ] = SHELL_ALIGN(sizeof(struct nredir)), 7983 [NREDIR ] = SHELL_ALIGN(sizeof(struct nredir)),
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 8c9607c8c..14eeaafcc 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -328,7 +328,7 @@ enum {
328}; 328};
329 329
330/* "-": treat args as parameters of option with ASCII code 1 */ 330/* "-": treat args as parameters of option with ASCII code 1 */
331static const char ulimit_opt_string[] = "-HSa" 331static const char ulimit_opt_string[] ALIGN1 = "-HSa"
332#ifdef RLIMIT_FSIZE 332#ifdef RLIMIT_FSIZE
333 "f::" 333 "f::"
334#endif 334#endif
diff --git a/util-linux/fatattr.c b/util-linux/fatattr.c
index 5d933874a..6dca24a73 100644
--- a/util-linux/fatattr.c
+++ b/util-linux/fatattr.c
@@ -42,7 +42,7 @@
42 * Extra space at the end is a hack to print space separator in file listing. 42 * Extra space at the end is a hack to print space separator in file listing.
43 * Let's hope no one ever passes space as an option char :) 43 * Let's hope no one ever passes space as an option char :)
44 */ 44 */
45static const char bit_to_char[] = "rhsvda67 "; 45static const char bit_to_char[] ALIGN1 = "rhsvda67 ";
46 46
47static inline unsigned long get_flag(char c) 47static inline unsigned long get_flag(char c)
48{ 48{
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 244f4fa27..c76f6ef61 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -377,7 +377,7 @@ static const int32_t mount_options[] = {
377 /* "remount" */ MS_REMOUNT // action flag 377 /* "remount" */ MS_REMOUNT // action flag
378}; 378};
379 379
380static const char mount_option_str[] = 380static const char mount_option_str[] ALIGN1 =
381 IF_FEATURE_MOUNT_LOOP( 381 IF_FEATURE_MOUNT_LOOP(
382 "loop\0" 382 "loop\0"
383 ) 383 )
@@ -1003,7 +1003,7 @@ enum {
1003# define EDQUOT ENOSPC 1003# define EDQUOT ENOSPC
1004#endif 1004#endif
1005/* Convert each NFSERR_BLAH into EBLAH */ 1005/* Convert each NFSERR_BLAH into EBLAH */
1006static const uint8_t nfs_err_stat[] = { 1006static const uint8_t nfs_err_stat[] ALIGN1 = {
1007 1, 2, 5, 6, 13, 17, 1007 1, 2, 5, 6, 13, 17,
1008 19, 20, 21, 22, 27, 28, 1008 19, 20, 21, 22, 27, 28,
1009 30, 63, 66, 69, 70, 71 1009 30, 63, 66, 69, 70, 71
@@ -1016,7 +1016,7 @@ typedef uint8_t nfs_err_type;
1016#else 1016#else
1017typedef uint16_t nfs_err_type; 1017typedef uint16_t nfs_err_type;
1018#endif 1018#endif
1019static const nfs_err_type nfs_err_errnum[] = { 1019static const nfs_err_type nfs_err_errnum[] ALIGN2 = {
1020 EPERM , ENOENT , EIO , ENXIO , EACCES, EEXIST, 1020 EPERM , ENOENT , EIO , ENXIO , EACCES, EEXIST,
1021 ENODEV, ENOTDIR , EISDIR , EINVAL, EFBIG , ENOSPC, 1021 ENODEV, ENOTDIR , EISDIR , EINVAL, EFBIG , ENOSPC,
1022 EROFS , ENAMETOOLONG, ENOTEMPTY, EDQUOT, ESTALE, EREMOTE 1022 EROFS , ENAMETOOLONG, ENOTEMPTY, EDQUOT, ESTALE, EREMOTE
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index b08b3dae7..6834292da 100644
--- a/util-linux/nsenter.c
+++ b/util-linux/nsenter.c
@@ -128,7 +128,7 @@ static const struct namespace_descr ns_list[] = {
128/* 128/*
129 * Upstream nsenter doesn't support the short option for --preserve-credentials 129 * Upstream nsenter doesn't support the short option for --preserve-credentials
130 */ 130 */
131static const char opt_str[] = "U::i::u::n::p::m::""t+S+G+r::w::F"; 131static const char opt_str[] ALIGN1 = "U::i::u::n::p::m::""t+S+G+r::w::F";
132 132
133#if ENABLE_FEATURE_NSENTER_LONG_OPTS 133#if ENABLE_FEATURE_NSENTER_LONG_OPTS
134static const char nsenter_longopts[] ALIGN1 = 134static const char nsenter_longopts[] ALIGN1 =
diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index d05cfdb6c..fa7086add 100644
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -137,7 +137,7 @@ static const struct namespace_descr ns_list[] = {
137 * we are forced to use "fake" letters for them. 137 * we are forced to use "fake" letters for them.
138 * '+': stop at first non-option. 138 * '+': stop at first non-option.
139 */ 139 */
140static const char opt_str[] = "+muinpU""fr""\xfd::""\xfe:""\xff:"; 140static const char opt_str[] ALIGN1 = "+muinpU""fr""\xfd::""\xfe:""\xff:";
141static const char unshare_longopts[] ALIGN1 = 141static const char unshare_longopts[] ALIGN1 =
142 "mount\0" Optional_argument "\xf0" 142 "mount\0" Optional_argument "\xf0"
143 "uts\0" Optional_argument "\xf1" 143 "uts\0" Optional_argument "\xf1"
diff --git a/util-linux/volume_id/bcache.c b/util-linux/volume_id/bcache.c
index 648e44de5..fd40eb081 100644
--- a/util-linux/volume_id/bcache.c
+++ b/util-linux/volume_id/bcache.c
@@ -24,7 +24,7 @@
24#define SB_LABEL_SIZE 32 24#define SB_LABEL_SIZE 32
25#define SB_JOURNAL_BUCKETS 256U 25#define SB_JOURNAL_BUCKETS 256U
26 26
27static const char bcache_magic[] = { 27static const char bcache_magic[] ALIGN1 = {
28 0xc6, 0x85, 0x73, 0xf6, 0x4e, 0x1a, 0x45, 0xca, 28 0xc6, 0x85, 0x73, 0xf6, 0x4e, 0x1a, 0x45, 0xca,
29 0x82, 0x65, 0xf5, 0x7f, 0x48, 0xba, 0x6d, 0x81 29 0x82, 0x65, 0xf5, 0x7f, 0x48, 0xba, 0x6d, 0x81
30}; 30};
diff --git a/util-linux/volume_id/luks.c b/util-linux/volume_id/luks.c
index 42bf87659..21cb26f51 100644
--- a/util-linux/volume_id/luks.c
+++ b/util-linux/volume_id/luks.c
@@ -40,7 +40,7 @@
40#define LUKS_SALTSIZE 32 40#define LUKS_SALTSIZE 32
41#define LUKS_NUMKEYS 8 41#define LUKS_NUMKEYS 8
42 42
43static const uint8_t LUKS_MAGIC[] = { 'L','U','K','S', 0xba, 0xbe }; 43static const uint8_t LUKS_MAGIC[] ALIGN1 = { 'L','U','K','S', 0xba, 0xbe };
44 44
45struct luks_phdr { 45struct luks_phdr {
46 uint8_t magic[LUKS_MAGIC_L]; 46 uint8_t magic[LUKS_MAGIC_L];