*: 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>

6 files changed, 8 insertions, 8 deletions

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 @@
  * Extra space at the end is a hack to print space separator in file listing.
  * Let's hope no one ever passes space as an option char :)
  */
-static const char bit_to_char[] = "rhsvda67 ";
+static const char bit_to_char[] ALIGN1 = "rhsvda67 ";
 
 static inline unsigned long get_flag(char c)
 {
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[] = {
         /* "remount" */ MS_REMOUNT  // action flag
 };
 
-static const char mount_option_str[] =
+static const char mount_option_str[] ALIGN1 =
         IF_FEATURE_MOUNT_LOOP(
                 "loop\0"
         )
@@ -1003,7 +1003,7 @@ enum {
 # define EDQUOT ENOSPC
 #endif
 /* Convert each NFSERR_BLAH into EBLAH */
-static const uint8_t nfs_err_stat[] = {
+static const uint8_t nfs_err_stat[] ALIGN1 = {
          1,  2,  5,  6, 13, 17,
         19, 20, 21, 22, 27, 28,
         30, 63, 66, 69, 70, 71
@@ -1016,7 +1016,7 @@ typedef uint8_t nfs_err_type;
 #else
 typedef uint16_t nfs_err_type;
 #endif
-static const nfs_err_type nfs_err_errnum[] = {
+static const nfs_err_type nfs_err_errnum[] ALIGN2 = {
         EPERM , ENOENT      , EIO      , ENXIO , EACCES, EEXIST,
         ENODEV, ENOTDIR     , EISDIR   , EINVAL, EFBIG , ENOSPC,
         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[] = {
 /*
  * Upstream nsenter doesn't support the short option for --preserve-credentials
  */
-static const char opt_str[] = "U::i::u::n::p::m::""t+S+G+r::w::F";
+static const char opt_str[] ALIGN1 = "U::i::u::n::p::m::""t+S+G+r::w::F";
 
 #if ENABLE_FEATURE_NSENTER_LONG_OPTS
 static 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[] = {
  * we are forced to use "fake" letters for them.
  * '+': stop at first non-option.
  */
-static const char opt_str[] = "+muinpU""fr""\xfd::""\xfe:""\xff:";
+static const char opt_str[] ALIGN1 = "+muinpU""fr""\xfd::""\xfe:""\xff:";
 static const char unshare_longopts[] ALIGN1 =
         "mount\0"               Optional_argument       "\xf0"
         "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 @@
 #define SB_LABEL_SIZE      32
 #define SB_JOURNAL_BUCKETS 256U
 
-static const char bcache_magic[] = {
+static const char bcache_magic[] ALIGN1 = {
         0xc6, 0x85, 0x73, 0xf6, 0x4e, 0x1a, 0x45, 0xca,
         0x82, 0x65, 0xf5, 0x7f, 0x48, 0xba, 0x6d, 0x81
 };
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 @@
 #define LUKS_SALTSIZE           32
 #define LUKS_NUMKEYS             8
 
-static const uint8_t LUKS_MAGIC[] = { 'L','U','K','S', 0xba, 0xbe };
+static const uint8_t LUKS_MAGIC[] ALIGN1 = { 'L','U','K','S', 0xba, 0xbe };
 
 struct luks_phdr {
         uint8_t         magic[LUKS_MAGIC_L];