decrease padding: gcc-9.3.1 slaps 32-byte alignment on arrays willy-nilly
No binary (build failed)
—
(log yok)
| @@ -194,14 +194,14 @@ struct cp_ext { | |
| }; | |
| /* Copy lengths and extra bits for literal codes 257..285 */ | |
| /* note: see note #13 above about the 258 in this list. */ | |
| - | static const struct cp_ext lit = { |
| + | static const struct cp_ext lit ALIGN2 = { |
| /*257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 */ | |
| /*0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 */ | |
| { 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 }, | |
| { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99 } /* 99 == invalid */ | |
| }; | |
| /* Copy offsets and extra bits for distance codes 0..29 */ | |
| - | static const struct cp_ext dist = { |
| + | static const struct cp_ext dist ALIGN2 = { |
| /*0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 */ | |
| { 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577 }, | |
| { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13 } | |
| @@ -517,7 +517,7 @@ struct BcLexKeyword { | |
| }; | |
| #define LEX_KW_ENTRY(a, b) \ | |
| { .name8 = a /*, .posix = b */ } | |
| - | static const struct BcLexKeyword bc_lex_kws[20] = { |
| + | static const struct BcLexKeyword bc_lex_kws[20] ALIGN8 = { |
| LEX_KW_ENTRY("auto" , 1), // 0 | |
| LEX_KW_ENTRY("break" , 1), // 1 | |
| LEX_KW_ENTRY("continue", 0), // 2 note: this one has no terminating NUL | |
| @@ -1052,7 +1052,7 @@ struct adap_desc { | |
| const char *algo; | |
| }; | |
| - | static const struct adap_desc adap_descs[] = { |
| + | static const struct adap_desc adap_descs[] ALIGN_PTR = { |
| { .funcs = "dummy", .algo = "Dummy bus", }, | |
| { .funcs = "isa", .algo = "ISA bus", }, | |
| { .funcs = "i2c", .algo = "I2C adapter", }, | |
| @@ -1064,7 +1064,7 @@ struct i2c_func { | |
| const char* name; | |
| }; | |
| - | static const struct i2c_func i2c_funcs_tab[] = { |
| + | static const struct i2c_func i2c_funcs_tab[] ALIGN_PTR = { |
| { .value = I2C_FUNC_I2C, | |
| .name = "I2C" }, | |
| { .value = I2C_FUNC_SMBUS_QUICK, | |
| @@ -247,7 +247,7 @@ struct options { | |
| * Set up the tables. Warning! They must have corresponding order! | |
| */ | |
| - | static const struct arg1opt Arg1Opt[] = { |
| + | static const struct arg1opt Arg1Opt[] ALIGN_PTR = { |
| { "SIFMETRIC", SIOCSIFMETRIC, ifreq_offsetof(ifr_metric) }, | |
| { "SIFMTU", SIOCSIFMTU, ifreq_offsetof(ifr_mtu) }, | |
| { "SIFTXQLEN", SIOCSIFTXQLEN, ifreq_offsetof(ifr_qlen) }, | |
| @@ -277,7 +277,7 @@ static const struct arg1opt Arg1Opt[] = { | |
| { "SIFADDR", SIOCSIFADDR, ifreq_offsetof(ifr_addr) }, | |
| }; | |
| - | static const struct options OptArray[] = { |
| + | static const struct options OptArray[] ALIGN_PTR = { |
| { "metric", N_ARG, ARG_METRIC, 0 }, | |
| { "mtu", N_ARG, ARG_MTU, 0 }, | |
| { "txqueuelen", N_ARG, ARG_TXQUEUELEN, 0 }, | |
| @@ -361,7 +361,7 @@ struct builtin { | |
| void (*bi_dgram_fn)(int, servtab_t *) FAST_FUNC; | |
| }; | |
| - | static const struct builtin builtins[] = { |
| + | static const struct builtin builtins[] ALIGN_PTR = { |
| #if ENABLE_FEATURE_INETD_SUPPORT_BUILTIN_ECHO | |
| { "echo", 1, echo_stream, echo_dg }, | |
| #endif | |
| @@ -114,7 +114,7 @@ enum { | |
| TCP_CLOSING, /* now a valid state */ | |
| }; | |
| - | static const char *const tcp_state[] = { |
| + | static const char *const tcp_state[] ALIGN_PTR = { |
| "", | |
| "ESTABLISHED", | |
| "SYN_SENT", | |
| @@ -273,7 +273,7 @@ struct query { | |
| static const struct { | |
| unsigned char type; | |
| char name[7]; | |
| - | } qtypes[] = { |
| + | } qtypes[] ALIGN1 = { |
| { ns_t_soa, "SOA" }, | |
| { ns_t_ns, "NS" }, | |
| { ns_t_a, "A" }, | |
| @@ -288,7 +288,7 @@ static const struct { | |
| { ns_t_any, "ANY" }, | |
| }; | |
| - | static const char *const rcodes[] = { |
| + | static const char *const rcodes[] ALIGN_PTR = { |
| "NOERROR", // 0 | |
| "FORMERR", // 1 | |
| "SERVFAIL", // 2 | |
| @@ -536,7 +536,7 @@ send_probe(int seq, int ttl) | |
| static const char * | |
| pr_type(unsigned char t) | |
| { | |
| - | static const char *const ttab[] = { |
| + | static const char *const ttab[] ALIGN_PTR = { |
| "Echo Reply", "ICMP 1", "ICMP 2", "Dest Unreachable", | |
| "Source Quench", "Redirect", "ICMP 6", "ICMP 7", | |
| "Echo", "Router Advert", "Router Solicit", "Time Exceeded", | |
| @@ -544,7 +544,7 @@ pr_type(unsigned char t) | |
| "Info Reply", "Mask Request", "Mask Reply" | |
| }; | |
| # if ENABLE_TRACEROUTE6 | |
| - | static const char *const ttab6[] = { |
| + | static const char *const ttab6[] ALIGN_PTR = { |
| [0] = "Error", "Dest Unreachable", "Packet Too Big", "Time Exceeded", | |
| [4] = "Param Problem", | |
| [8] = "Echo Request", "Echo Reply", "Membership Query", "Membership Report", | |
| @@ -60,7 +60,7 @@ static const char bdcmd_names[] ALIGN1 = | |
| "flushbufs" "\0" | |
| "rereadpt" "\0" | |
| ; | |
| - | static const uint32_t bdcmd_ioctl[] = { |
| + | static const uint32_t bdcmd_ioctl[] ALIGN4 = { |
| BLKROSET, //setro | |
| BLKROSET, //setrw | |
| BLKROGET, //getro | |