summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/dosfstools/dosfstools/alignment_hack.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/dosfstools/dosfstools/alignment_hack.patch')
-rw-r--r--meta/recipes-devtools/dosfstools/dosfstools/alignment_hack.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/alignment_hack.patch b/meta/recipes-devtools/dosfstools/dosfstools/alignment_hack.patch
new file mode 100644
index 0000000000..e15060a6fe
--- /dev/null
+++ b/meta/recipes-devtools/dosfstools/dosfstools/alignment_hack.patch
@@ -0,0 +1,34 @@
1The problem is that unsigned char[2] is
2guranteed to be 8Bit aligned on arm
3but unsigned short is/needs to be 16bit aligned
4the union { unsigned short; unsigned char[2] } trick
5didn't work so no we use the alpha hack.
6
7memcpy into an 16bit aligned
8
9 -zecke
10
11
12--- dosfstools/dosfsck/boot.c.orig 2003-05-15 19:32:23.000000000 +0200
13+++ dosfstools/dosfsck/boot.c 2003-06-13 17:44:25.000000000 +0200
14@@ -36,17 +36,15 @@
15 { 0xff, "5.25\" 320k floppy 2s/40tr/8sec" },
16 };
17
18-#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__
19+
20 /* Unaligned fields must first be copied byte-wise */
21 #define GET_UNALIGNED_W(f) \
22 ({ \
23 unsigned short __v; \
24 memcpy( &__v, &f, sizeof(__v) ); \
25- CF_LE_W( *(unsigned short *)&f ); \
26+ CF_LE_W( *(unsigned short *)&__v ); \
27 })
28-#else
29-#define GET_UNALIGNED_W(f) CF_LE_W( *(unsigned short *)&f )
30-#endif
31+
32
33
34 static char *get_media_descr( unsigned char media )