[Buildroot] [PATCH v2 5/6] nommu/flat: don't add -elf2flt for some toolchains

Guido Martínez guido at vanguardiasur.com.ar
Mon May 18 14:24:47 UTC 2015


Some toolchains (OSELAS 2014.12.0, for instance) internally do elf2flt
conversion without having to add anything to {C,CXX,LD}FLAGS. So, add an
option that allows to not add these flags.

Signed-off-by: Guido Martínez <guido at vanguardiasur.com.ar>
---
 package/Makefile.in | 3 +++
 toolchain/Config.in | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/package/Makefile.in b/package/Makefile.in
index a0c5a7a..0ac1a94 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -142,12 +142,15 @@ TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS))
 
 ifeq ($(BR2_BINFMT_FLAT),y)
+# Don't add any flags for toolchains that don't require it
+ifneq ($(BR2_TOOLCHAIN_DONT_ELF2FLT),y)
 TARGET_CFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
 	-Wl$(comma)-elf2flt)
 TARGET_CXXFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
 	-Wl$(comma)-elf2flt)
 TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),-elf2flt)
 endif
+endif
 
 ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
 TARGET_LDFLAGS += -mid-shared-library -mshared-library-id=0
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 7e66de0..fd8dc43 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -23,6 +23,9 @@ config BR2_TOOLCHAIN_USES_UCLIBC
 config BR2_TOOLCHAIN_HAS_RESOLVER
 	bool
 
+config BR2_TOOLCHAIN_DONT_ELF2FLT
+	bool
+
 config BR2_TOOLCHAIN_USES_MUSL
 	bool
 	select BR2_USE_WCHAR
-- 
2.1.4




More information about the buildroot mailing list