MIPS: Compat: Fix binfmt_elf build errors.

CONFIG_MIPS32_N32=y but CONFIG_BINFMT_ELF disabled results in the following
linker errors:

arch/mips/built-in.o: In function `elf_core_dump':
binfmt_elfn32.c:(.text+0x23dbc): undefined reference to `elf_core_extra_phdrs'
binfmt_elfn32.c:(.text+0x246e4): undefined reference to `elf_core_extra_data_size'
binfmt_elfn32.c:(.text+0x248d0): undefined reference to `elf_core_write_extra_phdrs'
binfmt_elfn32.c:(.text+0x24ac4): undefined reference to `elf_core_write_extra_data'

CONFIG_MIPS32_O32=y but CONFIG_BINFMT_ELF disabled results in the following
linker errors:

arch/mips/built-in.o: In function `elf_core_dump':
binfmt_elfo32.c:(.text+0x28a04): undefined reference to `elf_core_extra_phdrs'
binfmt_elfo32.c:(.text+0x29330): undefined reference to `elf_core_extra_data_size'
binfmt_elfo32.c:(.text+0x2951c): undefined reference to `elf_core_write_extra_phdrs'
binfmt_elfo32.c:(.text+0x29710): undefined reference to `elf_core_write_extra_data'

Fixed by building kernel/elfcore.o CONFIG_MIPS32_N32 and CONFIG_MIPS32_O32.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 49f98bf9e89d1c30bfbc180773ebf2e6b7fff426..8e47b66649fee3b6fb5f401e07274cccb594925a 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2546,6 +2546,7 @@ config MIPS32_N32
 config BINFMT_ELF32
        bool
        default y if MIPS32_O32 || MIPS32_N32
+       select ELFCORE
 
 endmenu
 

diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index 370b24cee4d84b08a9855cf9598bb156dd41ffec..52211c44694a8bfee53f4a5c5fe0273e3b4a969a 100644 (file)
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -1,6 +1,7 @@
 config BINFMT_ELF
        bool "Kernel support for ELF binaries"
        depends on MMU && (BROKEN || !FRV)
+       select ELFCORE
        default y
        ---help---
          ELF (Executable and Linkable Format) is a format for libraries and
@@ -26,6 +27,7 @@ config BINFMT_ELF
 config COMPAT_BINFMT_ELF
        bool
        depends on COMPAT && BINFMT_ELF
+       select ELFCORE
 
 config ARCH_BINFMT_ELF_RANDOMIZE_PIE
        bool
@@ -34,6 +36,7 @@ config BINFMT_ELF_FDPIC
        bool "Kernel support for FDPIC ELF binaries"
        default y
        depends on (FRV || BLACKFIN || (SUPERH32 && !MMU) || C6X)
+       select ELFCORE
        help
          ELF FDPIC binaries are based on ELF, but allow the individual load
          segments of a binary to be located in memory independently of each
@@ -43,6 +46,11 @@ config BINFMT_ELF_FDPIC
 
          It is also possible to run FDPIC ELF binaries on MMU linux also.
 
+config ELFCORE
+       bool
+       help
+         This option enables kernel/elfcore.o.
+
 config CORE_DUMP_DEFAULT_ELF_HEADERS
        bool "Write ELF core dumps with partial segments"
        default y

diff --git a/kernel/Makefile b/kernel/Makefile
index 271fd3119af9bac708773e30267077b3a5a5d276..4126af4501bbe400b4c7a28c7394233d0f549b13 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -92,9 +92,7 @@ obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o
 obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o
 obj-$(CONFIG_TRACEPOINTS) += tracepoint.o
 obj-$(CONFIG_LATENCYTOP) += latencytop.o
-obj-$(CONFIG_BINFMT_ELF) += elfcore.o
-obj-$(CONFIG_COMPAT_BINFMT_ELF) += elfcore.o
-obj-$(CONFIG_BINFMT_ELF_FDPIC) += elfcore.o
+obj-$(CONFIG_ELFCORE) += elfcore.o
 obj-$(CONFIG_FUNCTION_TRACER) += trace/
 obj-$(CONFIG_TRACING) += trace/
 obj-$(CONFIG_TRACE_CLOCK) += trace/