arch: toolchain: Introduce binary formats BINFMT_*.
PATCH v4 1/7 arch: toolchain: Introduce binary formats BINFMT_*.
From: Sonic Zhang <[email protected]>
Just introduce the symbol and options in arch generic Config.in. Append FLAT format link flags to external toolchain wrapper.
---
v3-changes:
- Rename the BINFMT dependency names in external toolchain config file.
- Add some help text to BINFMT macros.
--- arch/Config.in | 34 ++++++++++++++++++++ toolchain/toolchain-external/Config.in | 12 +++--- toolchain/toolchain-external/ext-tool.mk | 4 ++ .../toolchain-external/ext-toolchain-wrapper.c | 3 ++ 4 files changed, 47 insertions(+), 6 deletions(-)
arch/Config.in +34 -0
@@ -174,6 +174,40 @@ config BR2_GCC_TARGET_ABI config BR2_GCC_TARGET_CPU string +# Set up target binary format +choice + prompt "Target Binary Format" + default BR2_BINFMT_FDPIC if BR2_bfin + default BR2_BINFMT_ELF + +config BR2_BINFMT_ELF + bool "ELF" + depends on !BR2_bfin + help + ELF (Executable and Linkable Format) is a format for libraries and + executables used across different architectures and operating + systems. + +config BR2_BINFMT_FDPIC + bool "FDPIC" + depends on BR2_bfin + 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 + bool "FLAT" + depends on BR2_bfin + select BR2_PREFER_STATIC_LIB + help + FLAT binary is a relatively simple and lightweight executable format + based on the original a.out format. It is widely used in environment + where no MMU is available. + +endchoice + if BR2_arm || BR2_armeb source "arch/Config.in.arm" endif
toolchain/toolchain-external/Config.in +6 -6
@@ -758,12 +758,12 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109 default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203 default "i686-pc-linux-gnu" if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209 - default "bfin-uclinux" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && !BR2_BFIN_FDPIC - default "bfin-linux-uclibc" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BFIN_FDPIC - default "bfin-uclinux" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && !BR2_BFIN_FDPIC - default "bfin-linux-uclibc" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BFIN_FDPIC - default "bfin-uclinux" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && !BR2_BFIN_FDPIC - default "bfin-linux-uclibc" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && BR2_BFIN_FDPIC + default "bfin-uclinux" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BINFMT_FLAT + default "bfin-linux-uclibc" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1 && BR2_BINFMT_FDPIC + default "bfin-uclinux" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BINFMT_FLAT + default "bfin-linux-uclibc" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1 && BR2_BINFMT_FDPIC + default "bfin-uclinux" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && BR2_BINFMT_FLAT + default "bfin-linux-uclibc" if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && BR2_BINFMT_FDPIC default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \ if BR2_TOOLCHAIN_EXTERNAL_CUSTOM
toolchain/toolchain-external/ext-tool.mk +4 -0
@@ -160,6 +160,10 @@ ifneq ($(CC_TARGET_ABI_),) TOOLCHAIN_EXTERNAL_CFLAGS += -mabi=$(CC_TARGET_ABI_) TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_ABI='"$(CC_TARGET_ABI_)"' endif +ifeq ($(BR2_BINFMT_FLAT),y) +TOOLCHAIN_EXTERNAL_CFLAGS += -Wl,-elf2flt +TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_BINFMT_FLAT +endif ifneq ($(BR2_TARGET_OPTIMIZATION),) TOOLCHAIN_EXTERNAL_CFLAGS += $(call qstrip,$(BR2_TARGET_OPTIMIZATION))
toolchain/toolchain-external/ext-toolchain-wrapper.c +3 -0
@@ -47,6 +47,9 @@ static char *predef_args[] = {#ifdef BR_64 "-m64",#endif +#ifdef BR_BINFMT_FLAT + "-Wl,-elf2flt", +#endif #ifdef BR_ADDITIONAL_CFLAGS BR_ADDITIONAL_CFLAGS#endif
Signature · 1 line
1.7.0.4
PATCH v4 2/7 arch: Add blackfin CPU choice.
From: Sonic Zhang <[email protected]>
is patch adds a Target CPU configuration option and uses it to select a -m option for gcc.
--- arch/Config.in.bfin | 97 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 90 insertions(+), 7 deletions(-)
arch/Config.in.bfin +90 -7
@@ -1,12 +1,65 @@ choice - prompt "Target ABI" + prompt "Target CPU" depends on BR2_bfin - default BR2_BFIN_FDPIC -config BR2_BFIN_FDPIC - bool "FDPIC" -config BR2_BFIN_FLAT - bool "FLAT" - select BR2_PREFER_STATIC_LIB + default BR2_bf609 + help + Specify target CPU +config BR2_bf606 + bool "bf606" +config BR2_bf607 + bool "bf607" +config BR2_bf608 + bool "bf608" +config BR2_bf609 + bool "bf609" +config BR2_bf512 + bool "bf512" +config BR2_bf514 + bool "bf514" +config BR2_bf516 + bool "bf516" +config BR2_bf518 + bool "bf518" +config BR2_bf522 + bool "bf522" +config BR2_bf523 + bool "bf523" +config BR2_bf524 + bool "bf524" +config BR2_bf525 + bool "bf525" +config BR2_bf526 + bool "bf526" +config BR2_bf527 + bool "bf527" +config BR2_bf531 + bool "bf531" +config BR2_bf532 + bool "bf532" +config BR2_bf533 + bool "bf533" +config BR2_bf534 + bool "bf534" +config BR2_bf536 + bool "bf536" +config BR2_bf537 + bool "bf537" +config BR2_bf538 + bool "bf538" +config BR2_bf539 + bool "bf539" +config BR2_bf542 + bool "bf542" +config BR2_bf544 + bool "bf544" +config BR2_bf547 + bool "bf547" +config BR2_bf548 + bool "bf548" +config BR2_bf549 + bool "bf549" +config BR2_bf561 + bool "bf561" endchoice config BR2_ARCH
@@ -14,3 +67,33 @@ config BR2_ARCH config BR2_ENDIAN default "LITTLE" + +config BR2_GCC_TARGET_CPU + default bf606 if BR2_bf606 + default bf607 if BR2_bf607 + default bf608 if BR2_bf608 + default bf609 if BR2_bf609 + default bf512 if BR2_bf512 + default bf514 if BR2_bf514 + default bf516 if BR2_bf516 + default bf518 if BR2_bf518 + default bf522 if BR2_bf522 + default bf523 if BR2_bf523 + default bf524 if BR2_bf524 + default bf525 if BR2_bf525 + default bf526 if BR2_bf526 + default bf527 if BR2_bf527 + default bf531 if BR2_bf531 + default bf532 if BR2_bf532 + default bf533 if BR2_bf533 + default bf534 if BR2_bf534 + default bf536 if BR2_bf536 + default bf537 if BR2_bf537 + default bf538 if BR2_bf538 + default bf539 if BR2_bf539 + default bf542 if BR2_bf542 + default bf544 if BR2_bf544 + default bf547 if BR2_bf547 + default bf548 if BR2_bf548 + default bf549 if BR2_bf549 + default bf561 if BR2_bf561
Signature · 1 line
1.7.0.4
PATCH v4 3/7 arch: toolchain: Introduce target CPU revision.
In reply to Sonic ZhangFrom: Sonic Zhang <[email protected]>
Adds the possibility to have a free-form CPU revision string and append it to the target CPU. Only Blackfin actually uses this option.
---
v3-changes:
- Detail the help text and fix the line length.
--- arch/Config.in | 3 +++ arch/Config.in.bfin | 8 ++++++++ toolchain/toolchain-external/ext-tool.mk | 4 ++++ 3 files changed, 15 insertions(+), 0 deletions(-)
arch/Config.in +3 -0
@@ -174,6 +174,9 @@ config BR2_GCC_TARGET_ABI config BR2_GCC_TARGET_CPU string +config BR2_GCC_TARGET_CPU_REVISION + string + # Set up target binary format choice prompt "Target Binary Format"
arch/Config.in.bfin +8 -0
@@ -97,3 +97,11 @@ config BR2_GCC_TARGET_CPU default bf548 if BR2_bf548 default bf549 if BR2_bf549 default bf561 if BR2_bf561 + +config BR2_GCC_TARGET_CPU_REVISION + string "Target CPU revision" + help + Specify a target CPU revision, which will be appended to the + value of the -mcpu option. For example, if the selected CPU is + bf609, and then selected CPU revision is "0.0", then gcc will + receive the -mcpu=bf609-0.0 option.
toolchain/toolchain-external/ext-tool.mk +4 -0
@@ -134,7 +134,11 @@ TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \ endif CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE)) +ifeq ($(BR2_GCC_TARGET_CPU_REVISION),) CC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU)) +else +CC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION)) +endif CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH)) CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI))
Signature · 1 line
1.7.0.4
PATCH v4 4/7 arch: toolchain: Introduce binary format FLAT types.
In reply to Sonic ZhangFrom: Sonic Zhang <[email protected]>
Just introduce the symbol and options in arch generic Config.in. Append FLAT types specific link flags into external toolchain wrapper.
---
v3-changes:
- Add dependancy to bfin and m68k
- Add help text for FLAT binary types.
- Split shared flat flags.
--- arch/Config.in | 26 ++++++++++++++++++++ toolchain/toolchain-external/ext-tool.mk | 8 ++++++ .../toolchain-external/ext-toolchain-wrapper.c | 7 +++++ 3 files changed, 41 insertions(+), 0 deletions(-)
arch/Config.in +26 -0
@@ -211,6 +211,32 @@ config BR2_BINFMT_FLAT endchoice +# Set up flat binary type +choice + prompt "FLAT Binary type" + depends on BR2_BINFMT_FLAT + default BR2_BINFMT_FLAT_ONE + +config BR2_BINFMT_FLAT_ONE + bool "One memory region" + help + All segments are linked into one memory region. + +config BR2_BINFMT_FLAT_SEP_DATA + bool "Separate data and code region" + depends on BR2_bfin || BR2_m68k + help + Allow for the data and text segments to be separated and placed in + different regions of memory. + +config BR2_BINFMT_FLAT_SHARED + bool "Shared binary" + depends on BR2_bfin || BR2_m68k + help + Allow to load and link indiviual FLAT binaries at run time. + +endchoice + if BR2_arm || BR2_armeb source "arch/Config.in.arm" endif
toolchain/toolchain-external/ext-tool.mk +8 -0
@@ -168,6 +168,14 @@ ifeq ($(BR2_BINFMT_FLAT),y) TOOLCHAIN_EXTERNAL_CFLAGS += -Wl,-elf2flt TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_BINFMT_FLAT endif +ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y) +TOOLCHAIN_EXTERNAL_CFLAGS += -msep-data +TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_BINFMT_FLAT_SEP_DATA +endif +ifeq ($(BR2_BINFMT_FLAT_SHARED),y) +TOOLCHAIN_EXTERNAL_CFLAGS += -mid-shared-library -mshared-library-id=0 +TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_BINFMT_FLAT_SHARED +endif ifneq ($(BR2_TARGET_OPTIMIZATION),) TOOLCHAIN_EXTERNAL_CFLAGS += $(call qstrip,$(BR2_TARGET_OPTIMIZATION))
toolchain/toolchain-external/ext-toolchain-wrapper.c +7 -0
@@ -50,6 +50,13 @@ static char *predef_args[] = {#ifdef BR_BINFMT_FLAT "-Wl,-elf2flt",#endif +#ifdef BR_BINFMT_FLAT_SEP_DATA + "-msep-data", +#endif +#ifdef BR_BINFMT_FLAT_SHARED + "-mid-shared-library", + "-mshared-library-id=0", +#endif #ifdef BR_ADDITIONAL_CFLAGS BR_ADDITIONAL_CFLAGS#endif
Signature · 1 line
1.7.0.4
PATCH v4 5/7 package: Introduce package-specific BINFMT_FLAT options.
In reply to Sonic ZhangFrom: Sonic Zhang <[email protected]>
Add new option <PKG>_FLAT_STACKSIZE. The document needs to be updated.
---
v4-change:
- Use late binding in make to expand package specific flat stack size to TARGET_LDFLAGS.
v2-changes:
- Fix typo error in macro BINFMT_FLAT
--- package/Makefile.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
package/Makefile.in +4 -0
@@ -103,6 +103,10 @@ TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET TARGET_CXXFLAGS = $(TARGET_CFLAGS) TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS)) +ifeq ($(BR2_BINFMT_FLAT),y) +TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE)) +endif + ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y) TARGET_CROSS=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)- else
Signature · 1 line
1.7.0.4
PATCH v4 6/7 arch: toolchain: Install blackfin FDPIC and FLAT libraries in external toolchain makefile.
In reply to Sonic ZhangFrom: Sonic Zhang <[email protected]>
Reserve all 3 blackfin toolchain folders under the TOOLCHAIN_EXTERNAL_DIR. Set current blackfin toolchain bin folder to the toolchain prefix subfolder. Install FDPIC and FLAT library in target ext-toolchain-installed.
---
v3-changes:
- Remove arch specific makefiles.
- Reserve all 3 blackfin toolchain folders under the TOOLCHAIN_EXTERNAL_DIR.
- Set current blackfin toolchain bin folder to the toolchain prefix subfolder.
- Move FDPIC and FLAT library installation target from blackfin makefile to the ext-toolchain-installed target in external toolchain makefile.
v2-changes:
- Remove useless Macro __uClinux__
v1-changes:
- Create arch makefile.
- Create blackfin makefile.
- Add FDPIC and FLAT library options and makefile targets to install libraries for different binary formats into the same rootfs image.
- update the TARGET_EXCEPTIONS variable in support/scripts/graph-depends for new custom targets
--- arch/Config.in.bfin | 22 ++++++++++++++ toolchain/toolchain-external/ext-tool.mk | 47 +++++++++++++++++++++++------- 2 files changed, 58 insertions(+), 11 deletions(-)
arch/Config.in.bfin +22 -0
@@ -62,6 +62,28 @@ config BR2_bf561 bool "bf561" endchoice +config BR2_BFIN_INSTALL_FDPIC_SHARED + bool "Install FDPIC shared libraries" + depends on !BR2_BINFMT_FDPIC + help + The Linux kernel supports running both FDPIC and FLAT applications + concurrently if the binary format specific libraries are installed properly. + This option allows developer to install FDPIC libraries into a buildroot + rootfs image built with binary format that is not FDPIC. + +config BR2_BFIN_INSTALL_FLAT_SHARED + depends on BR2_BINFMT_FLAT_SHARED + default y + +config BR2_BFIN_INSTALL_FLAT_SHARED + bool "Install FLAT shared libraries" + depends on !BR2_BINFMT_FLAT_SHARED + help + The Linux kernel supports running both FDPIC and FLAT applications + concurrently if the binary format specific libraries are installed properly. + This option allows developer to install FLAT libraries into a buildroot + rootfs image built with binary format that is not shared FLAT. + config BR2_ARCH default "bfin"
toolchain/toolchain-external/ext-tool.mk +36 -11
67 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH v4 7/7 package: Introduce NOMMU symbol
In reply to Sonic ZhangFrom: Sonic Zhang <[email protected]>
Introduce NOMMU symbol __NOMMU__
--- package/Makefile.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
package/Makefile.in +3 -0
@@ -105,6 +105,9 @@ TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS)) ifeq ($(BR2_BINFMT_FLAT),y) TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE)) + +ifneq ($(BR2_USE_MMU), y) +TARGET_CFLAGS += -D__NOMMU__ endif ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y)
Signature · 1 line
1.7.0.4