diff options
| author | Peter Foley <pefoley2@pefoley.com> | 2014-09-25 11:23:32 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-09-26 11:02:58 +0200 |
| commit | 8c2b0dc83d9840da4d993a5dbb15c5974ad5a188 (patch) | |
| tree | d1750009baa6051f3aec12087baad8700af7e3b5 | |
| parent | 19f94f97003a70a5241efff035f6c181c290a799 (diff) | |
Documentation: support glibc versions without htole macros
glibc 2.9 introduced the htole<16/32/64> macros, add them to
tools/include to support older versions of glibc.
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Peter Foley <pefoley2@pefoley.com>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | Documentation/arm/SH-Mobile/Makefile | 2 | ||||
| -rw-r--r-- | Documentation/arm/SH-Mobile/vrl4.c | 1 | ||||
| -rw-r--r-- | Documentation/mic/mpssd/Makefile | 2 | ||||
| -rw-r--r-- | Documentation/mic/mpssd/mpssd.c | 1 | ||||
| -rw-r--r-- | tools/include/tools/endian.h | 32 |
5 files changed, 36 insertions, 2 deletions
diff --git a/Documentation/arm/SH-Mobile/Makefile b/Documentation/arm/SH-Mobile/Makefile index ac8075dcfddc..bca8a7ef6bbe 100644 --- a/Documentation/arm/SH-Mobile/Makefile +++ b/Documentation/arm/SH-Mobile/Makefile @@ -4,4 +4,4 @@ hostprogs-y := vrl4 # Tell kbuild to always build the programs always := $(hostprogs-y) -HOSTCFLAGS_vrl4.o += -I$(objtree)/usr/include +HOSTCFLAGS_vrl4.o += -I$(objtree)/usr/include -I$(srctree)/tools/include diff --git a/Documentation/arm/SH-Mobile/vrl4.c b/Documentation/arm/SH-Mobile/vrl4.c index 4cbbba58f3d2..f4cd8ad4e720 100644 --- a/Documentation/arm/SH-Mobile/vrl4.c +++ b/Documentation/arm/SH-Mobile/vrl4.c @@ -34,6 +34,7 @@ #include <stdint.h> #include <stdio.h> #include <errno.h> +#include <tools/endian.h> struct hdr { uint32_t magic1; diff --git a/Documentation/mic/mpssd/Makefile b/Documentation/mic/mpssd/Makefile index aaa89d137c1a..505d84f1825d 100644 --- a/Documentation/mic/mpssd/Makefile +++ b/Documentation/mic/mpssd/Makefile @@ -6,7 +6,7 @@ mpssd-objs := mpssd.o sysfs.o # Tell kbuild to always build the programs always := $(hostprogs-y) -HOSTCFLAGS_mpssd.o += -I$(objtree)/usr/include +HOSTCFLAGS_mpssd.o += -I$(objtree)/usr/include -I$(srctree)/tools/include ifdef DEBUG HOSTCFLAGS += -DDEBUG=$(DEBUG) diff --git a/Documentation/mic/mpssd/mpssd.c b/Documentation/mic/mpssd/mpssd.c index 24203ddba924..3c5c379fc29d 100644 --- a/Documentation/mic/mpssd/mpssd.c +++ b/Documentation/mic/mpssd/mpssd.c @@ -41,6 +41,7 @@ #include "mpssd.h" #include <linux/mic_ioctl.h> #include <linux/mic_common.h> +#include <tools/endian.h> static void init_mic(struct mic_info *mic); diff --git a/tools/include/tools/endian.h b/tools/include/tools/endian.h new file mode 100644 index 000000000000..5d42e20ab83d --- /dev/null +++ b/tools/include/tools/endian.h @@ -0,0 +1,32 @@ +#ifndef _TOOLS_ENDIAN_H +#define _TOOLS_ENDIAN_H + +#include <byteswap.h> + +#if __BYTE_ORDER == __LITTLE_ENDIAN + +#ifndef htole16 +#define htole16(x) (x) +#endif +#ifndef htole32 +#define htole32(x) (x) +#endif +#ifndef htole64 +#define htole64(x) (x) +#endif + +#else /* __BYTE_ORDER */ + +#ifndef htole16 +#define htole16(x) __bswap_16(x) +#endif +#ifndef htole32 +#define htole32(x) __bswap_32(x) +#endif +#ifndef htole64 +#define htole64(x) __bswap_64(x) +#endif + +#endif + +#endif /* _TOOLS_ENDIAN_H */ |