Skip to contentSkip to conversation

arch: toolchain: Introduce binary formats BINFMT_*.

PATCH Superseded Sonic Zhang 3 participants 23 messages Apr 12, 2013 – Apr 18, 2013

v5 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 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
index 472b10c..2a14c29 100644
@@ -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
index 5b26aa9..6cf29aa 100644
@@ -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
index b477bc0..92183a4 100644
@@ -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
index a92bada..9a2fc70 100644
@@ -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
#1 lore raw

PATCH v5 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
index 0b137ae..ac96620 100644
@@ -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
#2 lore raw

PATCH v5 2/7 arch: Add blackfin CPU choice.

Dear Sonic Zhang,

Quoted 15 lines · Sonic Zhang

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 +0 -0
index 0b137ae..ac96620 100644

arch/Config.in.bfin line 9

Quoted 10 lines
arch/Config.in.bfin +1 -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

Those options (BR2_BFIN_FPIC, BR2_BFIN_FLAT) should have been removed in PATCH 1, and added in Config.in.legacy (main Buildroot directory) to ensure that users experience a smooth transition from the old options to the new ones.

Once this is fixed, you have my Acked-by for this patch.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#3 lore raw

PATCH v5 3/7 arch: toolchain: Introduce target CPU revision.

In reply to Sonic Zhang

From: 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
index 2a14c29..047abc1 100644
@@ -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
index ac96620..f755c8d 100644
@@ -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
index 92183a4..27fd296 100644
@@ -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
#4 lore raw

PATCH v5 3/7 arch: toolchain: Introduce target CPU revision.

Dear Sonic Zhang,

toolchain/toolchain-external/ext-tool.mk TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \ · line 137

Quoted 11 lines · Sonic Zhang

From: Sonic Zhang <[email protected]>

toolchain/toolchain-external/ext-tool.mk +1 -0
index 92183a4..27fd296 100644
@@ -134,7 +134,11 @@ TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \
 endif
 
 CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE))
+ifeq ($(BR2_GCC_TARGET_CPU_REVISION),)

I think this test should have a $(call qstrip) to be effective.

toolchain/toolchain-external/ext-tool.mk TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \ · line 143

Quoted 6 lines
toolchain/toolchain-external/ext-tool.mk +3 -0
 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))

It should also be changed in toolchain/gcc/gcc-uclibc-4.x.mk in a similar way. Code is currently:

ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)
GCC_WITH_CPU:=--with-cpu=$(BR2_GCC_TARGET_CPU)
endif

It should be:

ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)
ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),) GCC_WITH_CPU:=--with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION)) else
GCC_WITH_CPU:=--with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU))
endif
endif

Once this is one, I think the patch is OK.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#5 lore raw

PATCH v5 4/7 arch: toolchain: Introduce binary format FLAT types.

In reply to Sonic Zhang

From: Sonic Zhang <[email protected]>

Just introduce the symbol and options in arch generic Config.in. Add FLAT types specific compiling flags into package makefile.

---

v5-change:
- Move FLAT types specific compiling flags back to package makefile. The flags can't be set to compile Linux kernel.

v3-changes:
- Add dependancy to bfin and m68k
- Add help text for FLAT binary types.
- Split shared flat flags.

---
 arch/Config.in      |   26 ++++++++++++++++++++++++++
 package/Makefile.in |   11 +++++++++++
 2 files changed, 37 insertions(+), 0 deletions(-)
arch/Config.in +26 -0
index 047abc1..255b8b0 100644
@@ -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
package/Makefile.in +11 -0
index a8bf36b..dd3bc7d 100644
@@ -103,6 +103,17 @@ TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS))
 
+ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
+TARGET_LDFLAGS += -mid-shared-library -mshared-library-id=0
+TARGET_CFLAGS += -mid-shared-library -mshared-library-id=0
+TARGET_CXXFLAGS += -mid-shared-library -mshared-library-id=0
+endif
+ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y)
+TARGET_LDFLAGS += -msep-data
+TARGET_CFLAGS += -msep-data
+TARGET_CXXFLAGS += -msep-data
+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
#6 lore raw

PATCH v5 5/7 package: Introduce package-specific BINFMT_FLAT options.

In reply to Sonic Zhang

From: 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
index dd3bc7d..a449089 100644
@@ -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_BINFMT_FLAT_SHARED),y)
 TARGET_LDFLAGS += -mid-shared-library -mshared-library-id=0
 TARGET_CFLAGS += -mid-shared-library -mshared-library-id=0
Signature · 1 line
1.7.0.4
#7 lore raw

PATCH v5 5/7 package: Introduce package-specific BINFMT_FLAT options.

Dear Sonic Zhang,

package/Makefile.in TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET · line 108

Quoted 3 lines · Sonic Zhang
package/Makefile.in +3 -0
+ifeq ($(BR2_BINFMT_FLAT),y)
+TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE))
+endif

I haven't tested this, but it follows Arnout suggestion, and I find it quite nice. It just lacks some documentation update, but I'm otherwise fine with this patch.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#8 lore raw

PATCH v5 6/7 arch: toolchain: Install blackfin FDPIC and FLAT libraries in external toolchain makefile.

In reply to Sonic Zhang

From: 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.

---

v5-change:
- Update comments.

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 |   46 ++++++++++++++++++++++-------
 2 files changed, 57 insertions(+), 11 deletions(-)
arch/Config.in.bfin +22 -0
index f755c8d..917282d 100644
@@ -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 +35 -11

66 lines not on this page · raw message

Signature · 1 line
1.7.0.4
#9 lore raw

PATCH v5 6/7 arch: toolchain: Install blackfin FDPIC and FLAT libraries in external toolchain makefile.

Dear Sonic Zhang,

Quoted 13 lines · Sonic Zhang
arch/Config.in.bfin +5 -0
index f755c8d..917282d 100644
@@ -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

arch/Config.in.bfin config BR2_bf561 · line 79

Quoted 10 lines
arch/Config.in.bfin +10 -0
+	  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"

Same name as the previous option.

arch/Config.in.bfin config BR2_bf561 · line 85

Quoted 6 lines
arch/Config.in.bfin +6 -0
+	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.

I think those options should be preference of the external toolchain, so in toolchain/toolchain-external/Config.in. Because if we ever support internal toolchain for Blackfin, they won't be multilib toolchains, so it won't make sense to have those options.

arch/Config.in.bfin config BR2_bf561 · line 86

Quoted 1 line
arch/Config.in.bfin +1 -0
+ifeq ($(BR2_bfin,y)

Do you actually test the patches you're posting?

Quoted 54 lines
arch/Config.in.bfin +27 -11
+TOOLCHAIN_EXTERNAL_BIN:=$(TOOLCHAIN_EXTERNAL_DIR)/$(TOOLCHAIN_EXTERNAL_PREFIX)/bin
+else
 TOOLCHAIN_EXTERNAL_BIN:=$(TOOLCHAIN_EXTERNAL_DIR)/bin
 endif
+endif
 
 TOOLCHAIN_EXTERNAL_CROSS=$(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)-
 TOOLCHAIN_EXTERNAL_CC=$(TOOLCHAIN_EXTERNAL_CROSS)gcc
@@ -312,17 +316,6 @@ $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_1) $
 		$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) -
 	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE_2))) $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE_2) | \
 		$(TAR) $(TAR_STRIP_COMPONENTS)=3 --hard-dereference -C $(@D) $(TAR_OPTIONS) -
-ifeq ($(TOOLCHAIN_EXTERNAL_PREFIX),bfin-uclinux)
-	rm -rf $(TOOLCHAIN_EXTERNAL_DIR)/bfin-linux-uclibc
-	mv $(TOOLCHAIN_EXTERNAL_DIR)/bfin-uclinux $(TOOLCHAIN_EXTERNAL_DIR)/tmp
-	mv $(TOOLCHAIN_EXTERNAL_DIR)/tmp/* $(TOOLCHAIN_EXTERNAL_DIR)/
-	rmdir $(TOOLCHAIN_EXTERNAL_DIR)/tmp
-else
-	rm -rf $(TOOLCHAIN_EXTERNAL_DIR)/bfin-uclinux
-	mv $(TOOLCHAIN_EXTERNAL_DIR)/bfin-linux-uclibc $(TOOLCHAIN_EXTERNAL_DIR)/tmp
-	mv $(TOOLCHAIN_EXTERNAL_DIR)/tmp/* $(TOOLCHAIN_EXTERNAL_DIR)/
-	rmdir $(TOOLCHAIN_EXTERNAL_DIR)/tmp
-endif
 	$(Q)touch $@
 else
 # Download and extraction of a toolchain
@@ -417,6 +410,37 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 		@echo "External toolchain doesn't support --sysroot. Cannot use." ; \
 		exit 1 ; \
 	fi ; \
+	if test x"$(BR2_BFIN_INSTALL_FDPIC_SHARED)" == x"y" ; then \
+		$(call MESSAGE,"Install external toolchain FDPIC libraries to target...") ; \
+		FDPIC_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))/../../bfin-linux-uclibc/bin/bfin-linux-uclibc-gcc ; \
+		FDPIC_LIBC_A_LOCATION=`readlink -f $$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
+		FDPIC_SYSROOT_DIR=`echo $${FDPIC_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
+		FDPIC_LIB_DIR=`echo $${FDPIC_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(64)?)/(.*/)?libc.a:\1:'` ; \
+		FDPIC_SUPPORT_LIB_DIR="" ; \
+		if test `find $${FDPIC_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
+			FDPIC_LIBSTDCPP_A_LOCATION=$$(LANG=C $${FDPIC_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \
+			if [ -e "$${FDPIC_LIBSTDCPP_A_LOCATION}" ]; then \
+				FDPIC_SUPPORT_LIB_DIR=`readlink -f $${FDPIC_LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \
+			fi ; \
+		fi ; \
+		for libs in $(LIB_EXTERNAL_LIBS); do \
+			$(call copy_toolchain_lib_root,$${FDPIC_SYSROOT_DIR},$${FDPIC_SUPPORT_LIB_DIR},$${FDPIC_LIB_DIR},$$libs,/lib); \
+		done ; \
+		for libs in $(USR_LIB_EXTERNAL_LIBS); do \
+			$(call copy_toolchain_lib_root,$${FDPIC_SYSROOT_DIR},$${FDPIC_SUPPORT_LIB_DIR},$${FDPIC_LIB_DIR},$$libs,/usr/lib); \
+		done ; \
+	fi ; \
+	if test x"$(BR2_BFIN_INSTALL_FLAT_SHARED)" == x"y" ; then \
+		$(call MESSAGE,"Install external toolchain FLAT libraries to target...") ; \
+		FLAT_EXTERNAL_CC=$(dir $(TOOLCHAIN_EXTERNAL_CC))../../bfin-uclinux/bin/bfin-uclinux-gcc ; \
+		FLAT_LIBC_A_LOCATION=`$${FLAT_EXTERNAL_CC} $(TOOLCHAIN_EXTERNAL_CFLAGS) -mid-shared-library -print-file-name=libc`; \

arch/Config.in.bfin $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked · line 446

Quoted 10 lines
arch/Config.in.bfin +7 -0
+		if [ -f $${FLAT_LIBC_A_LOCATION} -a ! -h $${FLAT_LIBC_A_LOCATION} ] ; then \
+# The flat libraries are found and linked according to the index in \
+# name "libN.so". Index 1 is reserved for the standard C library. \
+# Customer libraries can use 4 and above. \
+			$(INSTALL) -D $${FLAT_LIBC_A_LOCATION} $(TARGET_DIR)/lib/lib1.so; \
+		fi ; \
+	fi ; \
 	ARCH_LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
 	ARCH_SYSROOT_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
 	ARCH_LIB_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(64)?)/(.*/)?libc.a:\1:'` ; \

This external toolchain installation starts to be complicated, and should probably be split in sub-functions. But that can be done as a followup improvement, you don't have to do it right now.

Thanks,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#10 lore raw

PATCH v5 6/7 arch: toolchain: Install blackfin FDPIC and FLAT libraries in external toolchain makefile.

Hi Thomas,

Quoted 20 lines · Thomas Petazzoni

Dear Sonic Zhang,

Quoted 17 lines · Sonic Zhang
arch/Config.in.bfin +9 -0
index f755c8d..917282d 100644
@@ -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.
+
Quoted 8 lines

arch/Config.in.bfin config BR2_bf561 · line 79

Quoted 6 lines
arch/Config.in.bfin +6 -0
+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"

Same name as the previous option.

This is intended. When option BINFMT_FLAT_SHARED is selected option BR2_BFIN_INSTALL_FLAT_SHARED should always be set to y. While other BINFMT is selected, BR2_BFIN_INSTALL_FLAT_SHARED is optional for developer to decide.

Quoted 8 lines

arch/Config.in.bfin config BR2_bf561 · line 85

Quoted 7 lines
arch/Config.in.bfin +6 -0
+     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.
Quoted 8 lines

I think those options should be preference of the external toolchain, so in toolchain/toolchain-external/Config.in. Because if we ever support internal toolchain for Blackfin, they won't be multilib toolchains, so it won't make sense to have those options.

arch/Config.in.bfin config BR2_bf561 · line 86

Quoted 1 line
arch/Config.in.bfin +1 -0
+ifeq ($(BR2_bfin,y)

Do you actually test the patches you're posting?

Yes, but when I prepare patches for upstream, I apply to a different branch, and sometimes make typo error.

Regards,

Sonic

#11 lore raw

PATCH v5 6/7 arch: toolchain: Install blackfin FDPIC and FLAT libraries in external toolchain makefile.

Dear Sonic Zhang,

Quoted 4 lines · Sonic Zhang

This is intended. When option BINFMT_FLAT_SHARED is selected option BR2_BFIN_INSTALL_FLAT_SHARED should always be set to y. While other BINFMT is selected, BR2_BFIN_INSTALL_FLAT_SHARED is optional for developer to decide.

Ok, I see, makes sense. But then, why don't we have the same for FDPIC? Also, I think I'd prefer something like:

# When the FDPIC binary format is used, we force the installation

# of the corresponding libraries. When a different binary format is
# used, we offer the option of installing the FDPIC shared libraries
# (typically in addition to the FLAT shared ones).
config BR2_BFIN_INSTALL_FDPIC_SHARED
	bool "Install FDPIC shared libraries" if !BR2_BINFMT_FDPIC
	default y if BR2_BINFMT_FDPIC
	help
	  ...

# When the FLAT shared binary format is used, we force the installation

# of the corresponding libraries. When a different binary format is
# used, we offer the option of installing the FLAT shared libraries
# (typically in addition to the FDPIC ones).
config BR2_BFIN_INSTALL_FLAT_SHARED
	bool "Install FLAT shared libraries" if !BR2_BINFMT_FLAT_SHARED
	default y if BR2_BINFMT_FLAT_SHARED
	help
	  ...

Would this makes sense?

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

+ifeq ($(BR2_bfin,y)

Do you actually test the patches you're posting?

Yes, but when I prepare patches for upstream, I apply to a different branch, and sometimes make typo error.

Ok. But then at some point we'll want to apply your patches, so they should be working :-) (Though I understand during the review process you want to make quick iterations, that's fine, but ultimately, we'll want working patches).

Thanks!

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#12 lore raw

PATCH v5 6/7 arch: toolchain: Install blackfin FDPIC and FLAT libraries in external toolchain makefile.

Hi Thomas,

Quoted 13 lines · Thomas Petazzoni

Dear Sonic Zhang,

Quoted 4 lines · Sonic Zhang

This is intended. When option BINFMT_FLAT_SHARED is selected option BR2_BFIN_INSTALL_FLAT_SHARED should always be set to y. While other BINFMT is selected, BR2_BFIN_INSTALL_FLAT_SHARED is optional for developer to decide.

Ok, I see, makes sense. But then, why don't we have the same for FDPIC? Also, I think I'd prefer something like:

# When the FDPIC binary format is used, we force the installation

Quoted 8 lines
# of the corresponding libraries. When a different binary format is
# used, we offer the option of installing the FDPIC shared libraries
# (typically in addition to the FLAT shared ones).
config BR2_BFIN_INSTALL_FDPIC_SHARED
        bool "Install FDPIC shared libraries" if !BR2_BINFMT_FDPIC
        default y if BR2_BINFMT_FDPIC
        help
          ...

Because current library installation scripts in toolchain-external/ext-tool.mk always install FDPIC libraries when BINFMT_FDPIC is selected. No necessary to set BR2_BFIN_INSTALL_FDPIC_SHARED y in this case.

Quoted 11 lines

# When the FLAT shared binary format is used, we force the installation

# of the corresponding libraries. When a different binary format is
# used, we offer the option of installing the FLAT shared libraries
# (typically in addition to the FDPIC ones).
config BR2_BFIN_INSTALL_FLAT_SHARED
        bool "Install FLAT shared libraries" if !BR2_BINFMT_FLAT_SHARED
        default y if BR2_BINFMT_FLAT_SHARED
        help
          ...
Quoted 2 lines

Would this makes sense?

Looks better.

Quoted 20 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

+ifeq ($(BR2_bfin,y)

Do you actually test the patches you're posting?

Yes, but when I prepare patches for upstream, I apply to a different branch, and sometimes make typo error.

Ok. But then at some point we'll want to apply your patches, so they should be working :-) (Though I understand during the review process you want to make quick iterations, that's fine, but ultimately, we'll want working patches).

Thanks!

Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

#13 lore raw

PATCH v5 6/7 arch: toolchain: Install blackfin FDPIC and FLAT libraries in external toolchain makefile.

Dear Sonic Zhang,

Quoted 10 lines · Sonic Zhang
Quoted 9 lines

# When the FDPIC binary format is used, we force the installation

# of the corresponding libraries. When a different binary format is
# used, we offer the option of installing the FDPIC shared libraries
# (typically in addition to the FLAT shared ones).
config BR2_BFIN_INSTALL_FDPIC_SHARED
        bool "Install FDPIC shared libraries" if !BR2_BINFMT_FDPIC
        default y if BR2_BINFMT_FDPIC
        help
          ...
Quoted 4 lines

Because current library installation scripts in toolchain-external/ext-tool.mk always install FDPIC libraries when BINFMT_FDPIC is selected. No necessary to set BR2_BFIN_INSTALL_FDPIC_SHARED y in this case.

Ok. But then why do we have to duplicate this code in ext-tool.mk. If it already has the code to copy the FDPIC libraries when FDPIC is selected as the primary binary format, we should be able to re-use this code when FLAT shared is used as the primary binary format, but we want the FDPIC libraries to be installed in addition.

Thanks,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#14 lore raw

PATCH v5 6/7 arch: toolchain: Install blackfin FDPIC and FLAT libraries in external toolchain makefile.

Hi Thomas,

Quoted 19 lines · Thomas Petazzoni

Dear Sonic Zhang,

Quoted 10 lines · Sonic Zhang
Quoted 9 lines

# When the FDPIC binary format is used, we force the installation

# of the corresponding libraries. When a different binary format is
# used, we offer the option of installing the FDPIC shared libraries
# (typically in addition to the FLAT shared ones).
config BR2_BFIN_INSTALL_FDPIC_SHARED
        bool "Install FDPIC shared libraries" if !BR2_BINFMT_FDPIC
        default y if BR2_BINFMT_FDPIC
        help
          ...
Quoted 4 lines

Because current library installation scripts in toolchain-external/ext-tool.mk always install FDPIC libraries when BINFMT_FDPIC is selected. No necessary to set BR2_BFIN_INSTALL_FDPIC_SHARED y in this case.

Quoted 6 lines

Ok. But then why do we have to duplicate this code in ext-tool.mk. If it already has the code to copy the FDPIC libraries when FDPIC is selected as the primary binary format, we should be able to re-use this code when FLAT shared is used as the primary binary format, but we want the FDPIC libraries to be installed in addition.

Yes, I do reuse the function copy_toolchain_lib_root() in the code to install shared FDPIC libraries when FLAT format is selected. But, rest part of the library installation code depends on current TOOLCHAIN_EXTERNAL_CC, which is different from the FDPIC one in this case. And the following sysroot to staging installation code depends on macro SYSROOT_DIR, ARCH_SYSROOT_DIR, ARCH_SUBDIR, ARCH_LIB_DIR and SUPPORT_LIB_DIR, which are based on current TOOLCHAIN_EXTERNAL_CC as well.

I feel the individual FDPIC installation code for FLAT format is a simple and clear solution.

Regards,

Sonic
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130417/dfddaa42/attachment.html>

#15 lore raw

PATCH v5 6/7 arch: toolchain: Install blackfin FDPIC and FLAT libraries in external toolchain makefile.

Quoted 43 lines · Sonic Zhang

Hi Thomas,

On Wed, Apr 17, 2013 at 4:56 PM, Thomas Petazzoni <[email protected] <mailto:[email protected]>> wrote:

Dear Sonic Zhang,

On Wed, 17 Apr 2013 16:16:21 +0800, Sonic Zhang wrote:

> > # When the FDPIC binary format is used, we force the installation > > # of the corresponding libraries. When a different binary format is > > # used, we offer the option of installing the FDPIC shared libraries > > # (typically in addition to the FLAT shared ones).
> > config BR2_BFIN_INSTALL_FDPIC_SHARED
> > bool "Install FDPIC shared libraries" if !BR2_BINFMT_FDPIC
> > default y if BR2_BINFMT_FDPIC
> > help
> > ...
>
> Because current library installation scripts in
> toolchain-external/ext-tool.mk <http://ext-tool.mk> always install
FDPIC libraries when
> BINFMT_FDPIC is selected. No necessary to set
> BR2_BFIN_INSTALL_FDPIC_SHARED y in this case.

Ok. But then why do we have to duplicate this code in ext-tool.mk
<http://ext-tool.mk>. If
it already has the code to copy the FDPIC libraries when FDPIC is selected as the primary binary format, we should be able to re-use this code when FLAT shared is used as the primary binary format, but we want the FDPIC libraries to be installed in addition.

Yes, I do reuse the function copy_toolchain_lib_root() in the code to install shared FDPIC libraries when FLAT format is selected. But, rest part of the library installation code depends on current TOOLCHAIN_EXTERNAL_CC, which is different from the FDPIC one in this case. And the following sysroot to staging installation code depends on macro SYSROOT_DIR, ARCH_SYSROOT_DIR, ARCH_SUBDIR, ARCH_LIB_DIR and SUPPORT_LIB_DIR, which are based on current TOOLCHAIN_EXTERNAL_CC as well.

Quoted 2 lines

I feel the individual FDPIC installation code for FLAT format is a simple and clear solution.

And anyway it can be refactored away later (e.g. when moving the
ext-toolchain stuff to a script or to functions).

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#16 lore raw

PATCH v5 6/7 arch: toolchain: Install blackfin FDPIC and FLAT libraries in external toolchain makefile.

Dear Arnout Vandecappelle,

Quoted 8 lines · Arnout Vandecappelle
Quoted 8 lines

Yes, I do reuse the function copy_toolchain_lib_root() in the code to install shared FDPIC libraries when FLAT format is selected. But, rest part of the library installation code depends on current TOOLCHAIN_EXTERNAL_CC, which is different from the FDPIC one in this case. And the following sysroot to staging installation code depends on macro SYSROOT_DIR, ARCH_SYSROOT_DIR, ARCH_SUBDIR, ARCH_LIB_DIR and SUPPORT_LIB_DIR, which are based on current TOOLCHAIN_EXTERNAL_CC as well.

Quoted 5 lines
Quoted 2 lines

I feel the individual FDPIC installation code for FLAT format is a simple and clear solution.

And anyway it can be refactored away later (e.g. when moving the
ext-toolchain stuff to a script or to functions).

Yes, I agree. Let's keep Sonic code as is for now, and as we get a better understanding of the potential similarities with the existing code, we can refactor if it makes sense.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#17 lore raw

PATCH v5 7/7 package: Introduce NOMMU symbol

In reply to Sonic Zhang

From: Sonic Zhang <[email protected]>

Introduce NOMMU symbol __NOMMU__

---
 package/Makefile.in |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
package/Makefile.in +3 -0
index a449089..e7bb61f 100644
@@ -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_BINFMT_FLAT_SHARED),y)
Signature · 1 line
1.7.0.4
#18 lore raw

PATCH v5 7/7 package: Introduce NOMMU symbol

Dear Sonic Zhang,

package/Makefile.in TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS)) · line 109

Quoted 4 lines · Sonic Zhang

ifeq ($(BR2_BINFMT_FLAT),y)
TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE))

package/Makefile.in +2 -0
+
+ifneq ($(BR2_USE_MMU), y)

There shouldn't be any space between the comma and the y.

Quoted 4 lines

+TARGET_CFLAGS += -D__NOMMU__
endif

ifeq ($(BR2_BINFMT_FLAT_SHARED),y)

And you're adding a ifneq condition without adding any endif. Smells like untested code :)

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#19 lore raw

PATCH v5 7/7 package: Introduce NOMMU symbol

Hi Thomas,

Quoted 11 lines · Thomas Petazzoni

Dear Sonic Zhang,

package/Makefile.in TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS)) · line 109

Quoted 4 lines · Sonic Zhang

ifeq ($(BR2_BINFMT_FLAT),y)
TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE))

package/Makefile.in +2 -0
+
+ifneq ($(BR2_USE_MMU), y)

There shouldn't be any space between the comma and the y.

Quoted 8 lines
Quoted 4 lines

+TARGET_CFLAGS += -D__NOMMU__
endif

ifeq ($(BR2_BINFMT_FLAT_SHARED),y)

And you're adding a ifneq condition without adding any endif. Smells like untested code :)

That's an error when I rebase this patch automatically. Should be fixed soon.

Regards,

Sonic

#20 lore raw

PATCH v5 1/7 arch: toolchain: Introduce binary formats BINFMT_*.

In reply to Sonic Zhang

Dear Sonic Zhang,

arch/Config.in config BR2_GCC_TARGET_ABI · line 189

Quoted 13 lines · Sonic Zhang
arch/Config.in +13 -0
+# 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.

I do agree with Arnout on one point here: we can hide this choice when !BR2_bfin. However, contrary to Arnout, I'd like to keep this BR2_BINFMT_ELF choice as an invisible option, that is always selected on !BR2_bfin. Yes it's useless, but I think it makes the binfmt options clearer.

Sonic, once this is changed, you have my Acked-by: Thomas Petazzoni <[email protected]> on this patch.

Thanks!

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#21 lore raw

PATCH v5 1/7 arch: toolchain: Introduce binary formats BINFMT_*.

Quoted 15 lines · Thomas Petazzoni

Dear Sonic Zhang,

Quoted 11 lines · Sonic Zhang
arch/Config.in +11 -0
+# 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
Quoted 8 lines

arch/Config.in config BR2_GCC_TARGET_ABI · line 189

Quoted 2 lines
arch/Config.in +2 -0
+	  executables used across different architectures and operating
+	  systems.

I do agree with Arnout on one point here: we can hide this choice when !BR2_bfin. However, contrary to Arnout, I'd like to keep this BR2_BINFMT_ELF choice as an invisible option, that is always selected on !BR2_bfin. Yes it's useless, but I think it makes the binfmt options clearer.

OK for me. Most important is that the choice is hidden when empty.

Regards,
Arnout

Quoted 8 lines

Sonic, once this is changed, you have my Acked-by: Thomas Petazzoni <[email protected]> on this patch.

Thanks!

Thomas

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#22 lore raw

PATCH v5 1/7 arch: toolchain: Introduce binary formats BINFMT_*.

Dear Arnout Vandecappelle,

Quoted 7 lines · Arnout Vandecappelle
Quoted 5 lines

I do agree with Arnout on one point here: we can hide this choice when !BR2_bfin. However, contrary to Arnout, I'd like to keep this BR2_BINFMT_ELF choice as an invisible option, that is always selected on !BR2_bfin. Yes it's useless, but I think it makes the binfmt options clearer.

OK for me. Most important is that the choice is hidden when empty.

Agreed.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com