Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | The problem is that unsigned char[2] is |
| 2 | guranteed to be 8Bit aligned on arm |
| 3 | but unsigned short is/needs to be 16bit aligned |
| 4 | the union { unsigned short; unsigned char[2] } trick |
| 5 | didn't work so no we use the alpha hack. |
| 6 | |
| 7 | memcpy into an 16bit aligned |
| 8 | |
| 9 | -zecke |
| 10 | |
| 11 | Upstream-Status: Inappropriate [licensing] |
| 12 | We're tracking an old release of dosfstools due to licensing issues. |
| 13 | |
| 14 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
| 15 | |
| 16 | --- dosfstools/dosfsck/boot.c.orig 2003-05-15 19:32:23.000000000 +0200 |
| 17 | +++ dosfstools/dosfsck/boot.c 2003-06-13 17:44:25.000000000 +0200 |
| 18 | @@ -36,17 +36,15 @@ |
| 19 | { 0xff, "5.25\" 320k floppy 2s/40tr/8sec" }, |
| 20 | }; |
| 21 | |
| 22 | -#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__ |
| 23 | + |
| 24 | /* Unaligned fields must first be copied byte-wise */ |
| 25 | #define GET_UNALIGNED_W(f) \ |
| 26 | ({ \ |
| 27 | unsigned short __v; \ |
| 28 | memcpy( &__v, &f, sizeof(__v) ); \ |
| 29 | - CF_LE_W( *(unsigned short *)&f ); \ |
| 30 | + CF_LE_W( *(unsigned short *)&__v ); \ |
| 31 | }) |
| 32 | -#else |
| 33 | -#define GET_UNALIGNED_W(f) CF_LE_W( *(unsigned short *)&f ) |
| 34 | -#endif |
| 35 | + |
| 36 | |
| 37 | |
| 38 | static char *get_media_descr( unsigned char media ) |