diff options
Diffstat (limited to 'meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch')
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch new file mode 100644 index 000000000..c2369cd8c --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/klibc-1.5.26/kernel_3.2__aligned_u64.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 7f47891c1678874cccca66cd25e6a13486c86d78 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?utf8?q?Maciej=20=C5=BBenczykowski?= <zenczykowski@gmail.com> | ||
3 | Date: Sun, 6 Nov 2011 14:33:40 -0800 | ||
4 | Subject: [PATCH] [klibc] include: [sys/types.h] -> linux/types.h and | ||
5 | __aligned_u64 | ||
6 | |||
7 | When building klibc 1.5.25 against linux/master (ie. post 3.1) I'm seeing: | ||
8 | |||
9 | klibc/generated/include/linux/if_packet.h:176: error: expected | ||
10 | specifier-qualifier-list before '__aligned_u64' | ||
11 | |||
12 | which seems to come from upstream commits: | ||
13 | 0d4691ce112be025019999df5f2a5e00c03f03c2 remotes/linux/master~90^2~408 (origin) | ||
14 | 96c131842aab45b5d139d0bcb417796819f5ee92 remotes/linux/master~90^2~169 | ||
15 | (change from aligned_u64 to __aligned_u64) | ||
16 | |||
17 | and collides with klibc/usr/include/sys/types.h | ||
18 | |||
19 | /* Keeps linux/types.h from getting included elsewhere */ | ||
20 | #define _LINUX_TYPES_H | ||
21 | |||
22 | not defining __aligned_u64 like the kernel's include/linux/types.h does. | ||
23 | |||
24 | Signed-off-by: maximilian attems <max@stro.at> | ||
25 | --- | ||
26 | usr/include/sys/types.h | 4 ++++ | ||
27 | 1 files changed, 4 insertions(+), 0 deletions(-) | ||
28 | |||
29 | diff --git a/usr/include/sys/types.h b/usr/include/sys/types.h | ||
30 | index 6780ed1..3a4c738 100644 | ||
31 | --- a/usr/include/sys/types.h | ||
32 | +++ b/usr/include/sys/types.h | ||
33 | @@ -100,6 +100,10 @@ typedef uint16_t __sum16; | ||
34 | typedef uint32_t __sum32; | ||
35 | typedef uint64_t __sum64; | ||
36 | |||
37 | +#define __aligned_u64 __u64 __attribute__((aligned(8))) | ||
38 | +#define __aligned_be64 __be64 __attribute__((aligned(8))) | ||
39 | +#define __aligned_le64 __le64 __attribute__((aligned(8))) | ||
40 | + | ||
41 | /* | ||
42 | * Some headers seem to require this... | ||
43 | */ | ||
44 | -- | ||
45 | 1.7.6.5 | ||
46 | |||