From 511cc9ae87e18c38bda84cfd916d8b5af1f81654 Mon Sep 17 00:00:00 2001 From: Roman Yeryomin Date: Thu, 4 Jul 2013 11:13:43 +0300 Subject: Add patches to fix userspase compilation with gcc 4.5-linaro Signed-off-by: Roman Yeryomin --- .../fix-socket.h-and-un.h-for-gcc-4.5.patch | 24 ++++++++++++++++++++++ .../fix-socket.h-and-un.h-for-gcc-4.5.patch | 24 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 target/linux/realtek/patches-2.6.30/fix-socket.h-and-un.h-for-gcc-4.5.patch create mode 100644 toolchain/kernel-headers/patches-2.6.30.9/fix-socket.h-and-un.h-for-gcc-4.5.patch diff --git a/target/linux/realtek/patches-2.6.30/fix-socket.h-and-un.h-for-gcc-4.5.patch b/target/linux/realtek/patches-2.6.30/fix-socket.h-and-un.h-for-gcc-4.5.patch new file mode 100644 index 000000000..088443d79 --- /dev/null +++ b/target/linux/realtek/patches-2.6.30/fix-socket.h-and-un.h-for-gcc-4.5.patch @@ -0,0 +1,24 @@ +--- linux-2.6.30.9/include/linux/socket.h 2013-07-04 11:06:14.564664035 +0300 ++++ linux-2.6.30.9/include/linux/socket.h 2013-07-04 11:05:14.634668886 +0300 +@@ -31,7 +31,9 @@ + # endif + #endif /* __KERNEL__ */ + ++#ifndef _LINUX_UN_H + typedef unsigned short sa_family_t; ++#endif + + /* + * 1003.1g requires sa_family_t and that sa_data is char. +--- linux-2.6.30.9/include/linux/un.h 2013-07-04 11:06:38.397662106 +0300 ++++ linux-2.6.30.9/include/linux/un.h 2013-07-04 11:06:24.052663267 +0300 +@@ -2,7 +2,9 @@ + #define _LINUX_UN_H + + #define UNIX_PATH_MAX 108 ++#ifndef _LINUX_SOCKET_H + typedef unsigned short sa_family_t; ++#endif + struct sockaddr_un { + sa_family_t sun_family; /* AF_UNIX */ + char sun_path[UNIX_PATH_MAX]; /* pathname */ diff --git a/toolchain/kernel-headers/patches-2.6.30.9/fix-socket.h-and-un.h-for-gcc-4.5.patch b/toolchain/kernel-headers/patches-2.6.30.9/fix-socket.h-and-un.h-for-gcc-4.5.patch new file mode 100644 index 000000000..088443d79 --- /dev/null +++ b/toolchain/kernel-headers/patches-2.6.30.9/fix-socket.h-and-un.h-for-gcc-4.5.patch @@ -0,0 +1,24 @@ +--- linux-2.6.30.9/include/linux/socket.h 2013-07-04 11:06:14.564664035 +0300 ++++ linux-2.6.30.9/include/linux/socket.h 2013-07-04 11:05:14.634668886 +0300 +@@ -31,7 +31,9 @@ + # endif + #endif /* __KERNEL__ */ + ++#ifndef _LINUX_UN_H + typedef unsigned short sa_family_t; ++#endif + + /* + * 1003.1g requires sa_family_t and that sa_data is char. +--- linux-2.6.30.9/include/linux/un.h 2013-07-04 11:06:38.397662106 +0300 ++++ linux-2.6.30.9/include/linux/un.h 2013-07-04 11:06:24.052663267 +0300 +@@ -2,7 +2,9 @@ + #define _LINUX_UN_H + + #define UNIX_PATH_MAX 108 ++#ifndef _LINUX_SOCKET_H + typedef unsigned short sa_family_t; ++#endif + struct sockaddr_un { + sa_family_t sun_family; /* AF_UNIX */ + char sun_path[UNIX_PATH_MAX]; /* pathname */ -- cgit v1.2.3