[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-a51f4047758d2bcd099ea113b833ed380f4024ba@git.kernel.org>
Date: Tue, 28 Feb 2012 23:50:27 -0800
From: "tip-bot for H. Peter Anvin" <hpa@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, nbowler@...iptictech.com,
hpa@...or.com, mingo@...hat.com, akpm@...ux-foundation.org,
matt@...sole-pimps.org, tglx@...utronix.de, sfr@...b.auug.org.au
Subject: [tip:x86/build] x86, build:
Fix portability issues when cross-building
Commit-ID: a51f4047758d2bcd099ea113b833ed380f4024ba
Gitweb: http://git.kernel.org/tip/a51f4047758d2bcd099ea113b833ed380f4024ba
Author: H. Peter Anvin <hpa@...or.com>
AuthorDate: Tue, 28 Feb 2012 23:36:21 -0800
Committer: H. Peter Anvin <hpa@...or.com>
CommitDate: Tue, 28 Feb 2012 23:40:56 -0800
x86, build: Fix portability issues when cross-building
It would appear that we never actually generated a correct CRC when
building on a bigendian machine. Depending on the word size, we would
either generate an all-zero CRC (64-bit machine) or a byte-swapped
CRC (32-bit machine.) Fix the types used so we don't arbitrarily use
a 64-bit word to hold 32-bit numbers, and pass the CRC through
put_unaligned_le32() like all the other numbers.
Signed-off-by: H. Peter Anvin <hpa@...or.com>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Matt Fleming <matt@...sole-pimps.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Nick Bowler <nbowler@...iptictech.com>
Link: http://lkml.kernel.org/r/20120229111322.9eb4b23ff1672e8853ad3b3b@canb.auug.org.au
---
arch/x86/boot/tools/build.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c
index f3bd2e6..ed54976 100644
--- a/arch/x86/boot/tools/build.c
+++ b/arch/x86/boot/tools/build.c
@@ -36,7 +36,7 @@
typedef unsigned char u8;
typedef unsigned short u16;
-typedef unsigned long u32;
+typedef unsigned int u32;
#define DEFAULT_MAJOR_ROOT 0
#define DEFAULT_MINOR_ROOT 0
@@ -247,8 +247,9 @@ int main(int argc, char ** argv)
}
/* Write the CRC */
- fprintf(stderr, "CRC %lx\n", crc);
- if (fwrite(&crc, 1, 4, stdout) != 4)
+ fprintf(stderr, "CRC %x\n", crc);
+ put_unaligned_le32(crc, buf);
+ if (fwrite(buf, 1, 4, stdout) != 4)
die("Writing CRC failed");
close(fd);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists