decrease paddign: gcc-9.3.1 slaps 32-byte alignment on arrays willy-nilly

   text	   data	    bss	    dec	    hex	filename
1021988	    559	   5052	1027599	  fae0f	busybox_old
1021236	    559	   5052	1026847	  fab1f	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

3 files changed, 10 insertions, 10 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 8c9a590d1..40695dee0 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2091,7 +2091,7 @@ static const struct {
         int flags;
         const char *var_text;
         void (*var_func)(const char *) FAST_FUNC;
-} varinit_data[] = {
+} varinit_data[] ALIGN_PTR = {
         /*
          * Note: VEXPORT would not work correctly here for NOFORK applets:
          * some environment strings may be constant.
@@ -4811,7 +4811,7 @@ static char *cmdnextc;
 static void
 cmdputs(const char *s)
 {
-        static const char vstype[VSTYPE + 1][3] = {
+        static const char vstype[VSTYPE + 1][3] ALIGN1 = {
                 "", "}", "-", "+", "?", "=",
                 "%", "%%", "#", "##"
                 IF_BASH_SUBSTR(, ":")
@@ -8510,7 +8510,7 @@ enum {
         , /* thus far 29 bits used */
 };
 
-static const char *const tokname_array[] = {
+static const char *const tokname_array[] ALIGN_PTR = {
         "end of file",
         "newline",
         "redirection",
diff --git a/shell/hush.c b/shell/hush.c
index f1a7e07ee..b6d9d7abb 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -596,10 +596,10 @@ typedef struct in_str {
 /* The descrip member of this structure is only used to make
  * debugging output pretty */
 static const struct {
-        int mode;
+        int32_t mode;
         signed char default_fd;
         char descrip[3];
-} redir_table[] = {
+} redir_table[] ALIGN4 = {
         { O_RDONLY,                  0, "<"  },
         { O_CREAT|O_TRUNC|O_WRONLY,  1, ">"  },
         { O_CREAT|O_APPEND|O_WRONLY, 1, ">>" },
@@ -1143,7 +1143,7 @@ struct built_in_command {
 #endif
 };
 
-static const struct built_in_command bltins1[] = {
+static const struct built_in_command bltins1[] ALIGN_PTR = {
         BLTIN("."        , builtin_source  , "Run commands in file"),
         BLTIN(":"        , builtin_true    , NULL),
 #if ENABLE_HUSH_JOB
@@ -1228,7 +1228,7 @@ static const struct built_in_command bltins1[] = {
 /* These builtins won't be used if we are on NOMMU and need to re-exec
  * (it's cheaper to run an external program in this case):
  */
-static const struct built_in_command bltins2[] = {
+static const struct built_in_command bltins2[] ALIGN_PTR = {
 #if ENABLE_HUSH_TEST
         BLTIN("["        , builtin_test    , NULL),
 #endif
@@ -3895,7 +3895,7 @@ struct reserved_combo {
         char literal[6];
         unsigned char res;
         unsigned char assignment_flag;
-        int flag;
+        uint32_t flag;
 };
 enum {
         FLAG_END   = (1 << RES_NONE ),
@@ -3928,7 +3928,7 @@ static const struct reserved_combo* match_reserved_word(o_string *word)
          * to turn the compound list into a command.
          * FLAG_START means the word must start a new compound list.
          */
-        static const struct reserved_combo reserved_list[] = {
+        static const struct reserved_combo reserved_list[] ALIGN4 = {
 # if ENABLE_HUSH_IF
                 { "!",     RES_NONE,  NOT_ASSIGNMENT  , 0 },
                 { "if",    RES_IF,    MAYBE_ASSIGNMENT, FLAG_THEN | FLAG_START },
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 42c4c9c97..dcbe0d109 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -324,7 +324,7 @@ struct limits {
         uint8_t factor_shift;   /* shift by to get rlim_{cur,max} values */
 };
 
-static const struct limits limits_tbl[] = {
+static const struct limits limits_tbl[] ALIGN2 = {
         { RLIMIT_CORE,          9,      }, // -c
         { RLIMIT_DATA,          10,     }, // -d
         { RLIMIT_NICE,          0,      }, // -e