qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 01:01:52 +02:00
Code

linux-3.6: fix portability of some includes files in tools/ used on the host

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34068 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-11-04 17:01:15 +00:00
parent be00679e41
commit de6ad2505c
2 changed files with 53 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
target/linux/generic/patches-3.6/212-byteshift_portability.patch Normal file
View File

@ -0,0 +1,53 @@
--- a/tools/include/tools/be_byteshift.h
+++ b/tools/include/tools/be_byteshift.h
@@ -1,7 +1,11 @@
#ifndef _TOOLS_BE_BYTESHIFT_H
#define _TOOLS_BE_BYTESHIFT_H
+#ifdef __linux__
#include <linux/types.h>
+#else
+#include "linux_types.h"
+#endif
static inline __u16 __get_unaligned_be16(const __u8 *p)
{
--- a/tools/include/tools/le_byteshift.h
+++ b/tools/include/tools/le_byteshift.h
@@ -1,7 +1,11 @@
#ifndef _TOOLS_LE_BYTESHIFT_H
#define _TOOLS_LE_BYTESHIFT_H
+#ifdef __linux__
#include <linux/types.h>
+#else
+#include "linux_types.h"
+#endif
static inline __u16 __get_unaligned_le16(const __u8 *p)
{
--- /dev/null
+++ b/tools/include/tools/linux_types.h
@@ -0,0 +1,22 @@
+#ifndef __LINUX_TYPES_H
+#define __LINUX_TYPES_H
+
+#include <stdint.h>
+
+typedef uint8_t __u8;
+typedef uint8_t __be8;
+typedef uint8_t __le8;
+
+typedef uint16_t __u16;
+typedef uint16_t __be16;
+typedef uint16_t __le16;
+
+typedef uint32_t __u32;
+typedef uint32_t __be32;
+typedef uint32_t __le32;
+
+typedef uint64_t __u64;
+typedef uint64_t __be64;
+typedef uint64_t __le64;
+
+#endif

22
target/linux/generic/patches-3.6/212-x86_reloc_portability.patch
View File

@ -1,22 +0,0 @@
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -10,7 +10,18 @@
#define USE_BSD
#include <endian.h>
#include <regex.h>
-#include <tools/le_byteshift.h>
+
+static inline void __put_unaligned_le16(uint16_t val, uint8_t *p)
+{
+ *p++ = val;
+ *p++ = val >> 8;
+}
+
+static inline void put_unaligned_le32(uint32_t val, uint8_t *p)
+{
+ __put_unaligned_le16(val >> 16, p + 2);
+ __put_unaligned_le16(val, p);
+}
static void die(char *fmt, ...);