From: hns@goldelico.com (H. Nikolaus Schaller)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: fix vdsomunge not to depend on glibc specific byteswap.h
Date: Sat, 3 Oct 2015 10:20:04 +0200 [thread overview]
Message-ID: <58DAB2B9-4068-4A11-8623-5A54195950E1@goldelico.com> (raw)
In-Reply-To: <cover.1443791320.git.hns@goldelico.com>
If the host toolchain is not glibc based then the arm kernel build
fails with
HOSTCC arch/arm/vdso/vdsomunge
arch/arm/vdso/vdsomunge.c:48:22: fatal error: byteswap.h: No such file or directory
Observed: with omap2plus_defconfig and compile on Mac OS X with arm ELF
cross-compiler.
Reason: byteswap.h is a glibc only header.
Solution: replace by private byte-swapping macros (taken from
arch/mips/boot/elf2ecoff.c)
Tested to compile on Mac OS X 10.9.5 host.
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
arch/arm/vdso/vdsomunge.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/arch/arm/vdso/vdsomunge.c b/arch/arm/vdso/vdsomunge.c
index aedec81..27a9a0b 100644
--- a/arch/arm/vdso/vdsomunge.c
+++ b/arch/arm/vdso/vdsomunge.c
@@ -45,7 +45,18 @@
* it does.
*/
-#include <byteswap.h>
+#define swab16(x) \
+ ((unsigned short)( \
+ (((unsigned short)(x) & (unsigned short)0x00ffU) << 8) | \
+ (((unsigned short)(x) & (unsigned short)0xff00U) >> 8) ))
+
+#define swab32(x) \
+ ((unsigned int)( \
+ (((unsigned int)(x) & (unsigned int)0x000000ffUL) << 24) | \
+ (((unsigned int)(x) & (unsigned int)0x0000ff00UL) << 8) | \
+ (((unsigned int)(x) & (unsigned int)0x00ff0000UL) >> 8) | \
+ (((unsigned int)(x) & (unsigned int)0xff000000UL) >> 24) ))
+
#include <elf.h>
#include <errno.h>
#include <fcntl.h>
@@ -104,17 +115,17 @@ static void cleanup(void)
static Elf32_Word read_elf_word(Elf32_Word word, bool swap)
{
- return swap ? bswap_32(word) : word;
+ return swap ? swab32(word) : word;
}
static Elf32_Half read_elf_half(Elf32_Half half, bool swap)
{
- return swap ? bswap_16(half) : half;
+ return swap ? swab16(half) : half;
}
static void write_elf_word(Elf32_Word val, Elf32_Word *dst, bool swap)
{
- *dst = swap ? bswap_32(val) : val;
+ *dst = swap ? swab32(val) : val;
}
int main(int argc, char **argv)
--
2.5.1
next prev parent reply other threads:[~2015-10-03 8:20 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1443628457.git.hns@goldelico.com>
2015-09-30 15:56 ` [PATCH] ARM: fix vdsomunge depends on glibc specific byteswap.h H. Nikolaus Schaller
2015-09-30 15:56 ` H. Nikolaus Schaller
2015-09-30 16:02 ` Ard Biesheuvel
2015-09-30 16:02 ` Ard Biesheuvel
2015-09-30 16:13 ` H. Nikolaus Schaller
2015-09-30 16:13 ` H. Nikolaus Schaller
2015-09-30 16:17 ` Ard Biesheuvel
2015-09-30 16:17 ` Ard Biesheuvel
2015-09-30 17:25 ` H. Nikolaus Schaller
2015-09-30 17:25 ` H. Nikolaus Schaller
2015-09-30 17:37 ` Nathan Lynch
2015-09-30 17:37 ` Nathan Lynch
2015-09-30 17:47 ` H. Nikolaus Schaller
2015-09-30 17:47 ` H. Nikolaus Schaller
2015-09-30 18:17 ` Nathan Lynch
2015-09-30 18:17 ` Nathan Lynch
2015-09-30 19:08 ` H. Nikolaus Schaller
2015-09-30 19:08 ` H. Nikolaus Schaller
[not found] ` <cover.1443791320.git.hns@goldelico.com>
2015-10-02 13:10 ` [PATCH] ARM: fix vdsomunge not to depend " H. Nikolaus Schaller
2015-10-03 8:20 ` H. Nikolaus Schaller [this message]
2015-10-03 20:46 ` [PATCH v2] " H. Nikolaus Schaller
2015-10-03 20:46 ` H. Nikolaus Schaller
2015-10-14 12:47 ` H. Nikolaus Schaller
2015-10-14 12:47 ` H. Nikolaus Schaller
2015-10-14 14:16 ` Nathan Lynch
2015-10-14 14:16 ` Nathan Lynch
2015-10-15 5:52 ` H. Nikolaus Schaller
2015-10-15 5:52 ` H. Nikolaus Schaller
2015-10-15 16:37 ` Russell King - ARM Linux
2015-10-15 16:37 ` Russell King - ARM Linux
2015-10-15 16:52 ` H. Nikolaus Schaller
2015-10-15 16:52 ` H. Nikolaus Schaller
2015-10-15 17:07 ` Nathan Lynch
2015-10-15 17:07 ` Nathan Lynch
2015-10-15 17:16 ` H. Nikolaus Schaller
2015-10-15 17:16 ` H. Nikolaus Schaller
2015-10-15 17:23 ` Nathan Lynch
2015-10-15 17:23 ` Nathan Lynch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=58DAB2B9-4068-4A11-8623-5A54195950E1@goldelico.com \
--to=hns@goldelico.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.