summaryrefslogtreecommitdiffstats
path: root/scripts/mod
diff options
context:
space:
mode:
authorPavel Fedin <p.fedin@samsung.com>2015-08-14 13:52:13 +0300
committerMichal Marek <mmarek@suse.com>2015-08-20 14:55:54 +0200
commit3c0561e0043fe870426b445890ab93204332ae39 (patch)
treee30d4559abb8ba1876ea81ce39e794128d5a2f8e /scripts/mod
parentd770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (diff)
downloadlinux-stable-3c0561e0043fe870426b445890ab93204332ae39.tar.gz
linux-stable-3c0561e0043fe870426b445890ab93204332ae39.tar.bz2
linux-stable-3c0561e0043fe870426b445890ab93204332ae39.zip
Avoid conflict with host definitions when cross-compiling
Certain platforms (e. g. BSD-based ones) define some ELF constants according to host. This patch fixes problems with cross-building Linux kernel on these platforms (e. g. building ARM 32-bit version on x86-64 host). Signed-off-by: Pavel Fedin <p.fedin@samsung.com> Signed-off-by: Michal Marek <mmarek@suse.com>
Diffstat (limited to 'scripts/mod')
-rw-r--r--scripts/mod/modpost.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 168b43dc0a59..6a5e1515123b 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -11,6 +11,12 @@
#include "elfconfig.h"
+/* On BSD-alike OSes elf.h defines these according to host's word size */
+#undef ELF_ST_BIND
+#undef ELF_ST_TYPE
+#undef ELF_R_SYM
+#undef ELF_R_TYPE
+
#if KERNEL_ELFCLASS == ELFCLASS32
#define Elf_Ehdr Elf32_Ehdr