diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-08 14:12:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-08 14:12:19 -0700 |
| commit | dab3c3cc4f44273ccf2d7ff57c0a4f5bd45c0528 (patch) | |
| tree | 6bbe14d6ec101bc278a8166469fdaa07d8f6493c /scripts/mod | |
| parent | 59a47fff0217592e248556a7ab436d5c17365962 (diff) | |
| parent | 5631d9c429857194bd55d7bcd8fa5bdd1a9899a3 (diff) | |
| download | linux-dab3c3cc4f44273ccf2d7ff57c0a4f5bd45c0528.tar.gz linux-dab3c3cc4f44273ccf2d7ff57c0a4f5bd45c0528.tar.bz2 linux-dab3c3cc4f44273ccf2d7ff57c0a4f5bd45c0528.zip | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull core kbuild updates from Michal Marek:
- modpost portability fix
- linker script fix
- genksyms segfault fix
- fixdep cleanup
- fix for clang detection
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kbuild: Fix clang detection
kbuild: fixdep: drop meaningless hash table initialization
kbuild: fixdep: optimize code slightly
genksyms: Regenerate parser
genksyms: Duplicate function pointer type definitions segfault
kbuild: Fix .text.unlikely placement
Avoid conflict with host definitions when cross-compiling
Diffstat (limited to 'scripts/mod')
| -rw-r--r-- | scripts/mod/modpost.h | 6 |
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 |