diff options
| author | Rob Landley <rob@landley.net> | 2015-09-17 01:49:48 -0500 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2015-09-17 01:49:48 -0500 |
| commit | 35c92f1e396d86f04616cd01ef3f045bc2dfb98e (patch) | |
| tree | 82071e13ec2b852dcf9e5a6880f903d714460abb | |
| parent | 59cd560200942a063c217e327fc7941ffb70abe9 (diff) | |
| download | toybox-35c92f1e396d86f04616cd01ef3f045bc2dfb98e.tar.gz | |
Fix a couple things gcc is too dumb to figure out on its own.
| -rw-r--r-- | configure | 2 | ||||
| -rw-r--r-- | toys/other/blkid.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -10,7 +10,7 @@ [ -z "$CFLAGS" ] && CFLAGS="-Wall -Wundef -Wno-char-subscripts" # Required for our expected ABI. we're 8-bit clean thus "char" must be unsigned. CFLAGS="$CFLAGS -funsigned-char" -[ -z "$OPTIMIZE" ] && OPTIMIZE="-Os -ffunction-sections -fdata-sections -fno-asynchronous-unwind-tables" +[ -z "$OPTIMIZE" ] && OPTIMIZE="-Os -ffunction-sections -fdata-sections -fno-asynchronous-unwind-tables -fno-strict-aliasing" # We accept LDFLAGS, but by default don't have anything in it [ -z "$LDOPTIMIZE" ] && LDOPTIMIZE="-Wl,--gc-sections" diff --git a/toys/other/blkid.c b/toys/other/blkid.c index fad1159d..8d3e7707 100644 --- a/toys/other/blkid.c +++ b/toys/other/blkid.c @@ -34,7 +34,7 @@ struct fstype { }; static const struct fstype fstypes[] = { - {"swap", 0x4341505350415753, 8, 4086, 1036, 15, 1052}, + {"swap", 0x4341505350415753LL, 8, 4086, 1036, 15, 1052}, {"ext2", 0xEF53, 2, 1080, 1128, 16, 1144}, // keep this first for ext3/4 check // NTFS label actually 8/16 0x4d80 but horrible: 16 bit wide characters via // codepage, something called a uuid that's only 8 bytes long... |