mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 05:51:45 -09:00
Code Issues Packages Projects Releases Wiki Activity

Revert: "arch: drop now useless support for FDPIC"

Browse Source 
This reverts commit 58dcd28dfb.

ARM supports FDPIC, so this code is needed once again.

Signed-off-by: Ben Wolsieffer <Ben.Wolsieffer@hefring.com>
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Ben Wolsieffer
2024-09-29 22:14:51 +02:00
committed by Thomas Petazzoni
parent edc0a6b1a4
commit 45c0a5114d
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/Config.in
View File

@@ -12,6 +12,9 @@ config BR2_SOFT_FLOAT
config BR2_USE_MMU config BR2_USE_MMU
bool bool
config BR2_ARCH_HAS_FDPIC_SUPPORT
bool
choice choice
prompt "Target Architecture" prompt "Target Architecture"
default BR2_i386 default BR2_i386
@@ -430,6 +433,7 @@ endif
choice choice
prompt "Target Binary Format" prompt "Target Binary Format"
default BR2_BINFMT_ELF if BR2_USE_MMU default BR2_BINFMT_ELF if BR2_USE_MMU
default BR2_BINFMT_FDPIC if BR2_ARCH_HAS_FDPIC_SUPPORT
default BR2_BINFMT_FLAT default BR2_BINFMT_FLAT
config BR2_BINFMT_ELF config BR2_BINFMT_ELF
@@ -441,6 +445,16 @@ config BR2_BINFMT_ELF
and executables used across different architectures and and executables used across different architectures and
operating systems. operating systems.
config BR2_BINFMT_FDPIC
bool "FDPIC"
depends on BR2_ARCH_HAS_FDPIC_SUPPORT
select BR2_BINFMT_SUPPORTS_SHARED
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 other. This makes this format ideal for
use in environments where no MMU is available.
config BR2_BINFMT_FLAT config BR2_BINFMT_FLAT
bool "FLAT" bool "FLAT"
depends on !BR2_USE_MMU depends on !BR2_USE_MMU

7
package/uclibc/uclibc.mk
View File

@@ -57,6 +57,13 @@ UCLIBC_LOCALES = \
endif endif
# noMMU binary formats # noMMU binary formats
ifeq ($(BR2_BINFMT_FDPIC),y)
define UCLIBC_BINFMT_CONFIG
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
endef
endif
ifeq ($(BR2_BINFMT_FLAT),y) ifeq ($(BR2_BINFMT_FLAT),y)
define UCLIBC_BINFMT_CONFIG define UCLIBC_BINFMT_CONFIG
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT) $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT)