*: 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>
This commit is contained in:
Denys Vlasenko
2016-04-22 18:09:21 +02:00
parent 663d1da1e6
commit 3e134ebf6a
30 changed files with 49 additions and 49 deletions

View File

@@ -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)
{

View File

@@ -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

View File

@@ -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 =

View File

@@ -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"

View File

@@ -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
};

View File

@@ -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];