diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2017-08-11 00:53:39 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2017-09-10 19:31:46 -0400 |
commit | 382e67aec6a7eea8ed4403e86950b468a191c468 (patch) | |
tree | 74be0a8304e29a5663419343a3cf62ac5b91ade7 /fs/Kconfig.binfmt | |
parent | 50b2b2e691cd4ff30331ba9a6156b29a07b60f90 (diff) |
ARM: enable elf_fdpic on systems with an MMU
Provide the necessary changes to be able to execute ELF-FDPIC binaries
on ARM systems with an MMU.
The default for CONFIG_BINFMT_ELF_FDPIC is also set to n if the regular
ELF loader is already configured so not to force FDPIC support on
everyone. Given that CONFIG_BINFMT_ELF depends on CONFIG_MMU, this means
CONFIG_BINFMT_ELF_FDPIC will still default to y when !MMU.
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Mickael GUENE <mickael.guene@st.com>
Tested-by: Vincent Abriou <vincent.abriou@st.com>
Tested-by: Andras Szemzo <szemzo.andras@gmail.com>
Diffstat (limited to 'fs/Kconfig.binfmt')
-rw-r--r-- | fs/Kconfig.binfmt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt index 6ef70ce8e976..58c2bbd385ad 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt | |||
@@ -34,8 +34,8 @@ config ARCH_BINFMT_ELF_STATE | |||
34 | 34 | ||
35 | config BINFMT_ELF_FDPIC | 35 | config BINFMT_ELF_FDPIC |
36 | bool "Kernel support for FDPIC ELF binaries" | 36 | bool "Kernel support for FDPIC ELF binaries" |
37 | default y | 37 | default y if !BINFMT_ELF |
38 | depends on ((ARM && !MMU) || FRV || BLACKFIN || (SUPERH32 && !MMU) || C6X) | 38 | depends on (ARM || FRV || BLACKFIN || (SUPERH32 && !MMU) || C6X) |
39 | select ELFCORE | 39 | select ELFCORE |
40 | help | 40 | help |
41 | ELF FDPIC binaries are based on ELF, but allow the individual load | 41 | ELF FDPIC binaries are based on ELF, but allow the individual load |