diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 14:23:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 14:23:06 -0400 |
commit | 821f3eff7cdb9d6c7076effabd46c96c322daed1 (patch) | |
tree | 60f13155196fd6c84424c8aebc133ca4a5f56749 /scripts/mod/modpost.h | |
parent | ebc283118ee448dcb6e6cae74a8a43f17a1ccc3f (diff) | |
parent | f77bf01425b11947eeb3b5b54685212c302741b8 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
kbuild: introduce ccflags-y, asflags-y and ldflags-y
kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP
kbuild: enable use of AFLAGS and CFLAGS on commandline
kbuild: enable 'make AFLAGS=...' to add additional options to AS
kbuild: fix AFLAGS use in h8300 and m68knommu
kbuild: check for wrong use of CFLAGS
kbuild: enable 'make CFLAGS=...' to add additional options to CC
kbuild: fix up CFLAGS usage
kbuild: make modpost detect unterminated device id lists
kbuild: call export_report from the Makefile
kbuild: move Kai Germaschewski to CREDITS
kconfig/menuconfig: distinguish between selected-by-another options and comments
kconfig: tristate choices with mixed tristate and boolean values
include/linux/Kbuild: remove duplicate entries
kbuild: kill backward compatibility checks
kbuild: kill EXTRA_ARFLAGS
kbuild: fix documentation in makefiles.txt
kbuild: call make once for all targets when O=.. is used
kbuild: pass -g to assembler under CONFIG_DEBUG_INFO
kbuild: update _shipped files for kconfig syntax cleanup
...
Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually.
Diffstat (limited to 'scripts/mod/modpost.h')
-rw-r--r-- | scripts/mod/modpost.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index 4156dd34c5de..0ffed17ec20c 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h | |||
@@ -17,7 +17,7 @@ | |||
17 | #define Elf_Shdr Elf32_Shdr | 17 | #define Elf_Shdr Elf32_Shdr |
18 | #define Elf_Sym Elf32_Sym | 18 | #define Elf_Sym Elf32_Sym |
19 | #define Elf_Addr Elf32_Addr | 19 | #define Elf_Addr Elf32_Addr |
20 | #define Elf_Section Elf32_Section | 20 | #define Elf_Section Elf32_Half |
21 | #define ELF_ST_BIND ELF32_ST_BIND | 21 | #define ELF_ST_BIND ELF32_ST_BIND |
22 | #define ELF_ST_TYPE ELF32_ST_TYPE | 22 | #define ELF_ST_TYPE ELF32_ST_TYPE |
23 | 23 | ||
@@ -31,7 +31,7 @@ | |||
31 | #define Elf_Shdr Elf64_Shdr | 31 | #define Elf_Shdr Elf64_Shdr |
32 | #define Elf_Sym Elf64_Sym | 32 | #define Elf_Sym Elf64_Sym |
33 | #define Elf_Addr Elf64_Addr | 33 | #define Elf_Addr Elf64_Addr |
34 | #define Elf_Section Elf64_Section | 34 | #define Elf_Section Elf64_Half |
35 | #define ELF_ST_BIND ELF64_ST_BIND | 35 | #define ELF_ST_BIND ELF64_ST_BIND |
36 | #define ELF_ST_TYPE ELF64_ST_TYPE | 36 | #define ELF_ST_TYPE ELF64_ST_TYPE |
37 | 37 | ||