Merge from bittboy/buildroot@db180c0

package/elf2flt/0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch

@@ -0,0 +1,79 @@
+From b31e9b1bff6832063816b972395179859d1d4619 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun, 13 Aug 2017 16:03:20 +0200
+Subject: [PATCH] ld-elf2flt: behave properly when called with a name different
+ from TARGET_ALIAS
+
+ld-elf2flt currently handles two cases:
+
+ 1 It is called as the wrapper for <TARGET_ALIAS>-ld, generally
+   installed in the bin/ directory of a toolchain.
+
+ 2 It is called as the wrapper for "ld", generally installed in the
+   TARGET_ALIAS/bin/ directory of a toolchain.
+
+Unfortunately, if for some reason it gets called using a FOOBAR-ld
+name that is different from <TARGET_ALIAS>-ld, it assumes it is in
+case (2), while it really is in case (1). Due to this, the path
+mangling logic doesn't work, and it doesn't find ld.real.
+
+This happens for example when the binary program in bin/ is named
+arm-buildroot-uclinux-uclibcgnueabi-ld, but also has a simpler symlink
+named arm-linux-ld. In this case,
+arm-buildroot-uclinux-uclibcgnueabi-ld is recognized by ld-elf2flt as
+containing TARGET_ALIAS, and therefore the proper logic to find
+ld.real is applied. However, when arm-linux-ld is used, ld-elf2flt
+doesn't find TARGET_ALIAS, and therefore assumes we're being called as
+TARGET_ALIAS/bin/ld.. and searches for a program called ld.real in
+bin/, which doesn't exist.
+
+See:
+
+$ ./output/host/bin/arm-buildroot-uclinux-uclibcgnueabi-ld
+/home/thomas/buildroot/buildroot/output/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: no input files
+
+$ ./output/host/bin/arm-linux-ld
+arm-linux-ld (ld-elf2flt): error trying to exec '/home/thomas/buildroot/buildroot/output/host/bin/ld.real': execvp: No such file or directory
+
+$ ./output/host/arm-buildroot-uclinux-uclibcgnueabi/bin/ld
+/home/thomas/buildroot/buildroot/output/host/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: no input files
+
+This commit fixes that by inverting the logic: if we're being called
+as just "ld", then we assume it's the program in
+TARGET_ALIAS/bin/. Otherwise, we're called through some variant of
+TARGET-ld.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Submitted-upstream: https://github.com/uclinux-dev/elf2flt/pull/8
+---
+ ld-elf2flt.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/ld-elf2flt.c b/ld-elf2flt.c
+index de39fe0..c187c2e 100644
+--- a/ld-elf2flt.c
++++ b/ld-elf2flt.c
+@@ -506,15 +506,15 @@ int main(int argc, char *argv[])
+ 	   the host while those in <TARGET_ALIAS>/lib are for the target.
+ 	   Make bindir point to the bin dir for bin/<TARGET_ALIAS>-foo.
+ 	   Make tooldir point to the bin dir for <TARGET_ALIAS>/bin/foo.  */
+-	if (streqn(elf2flt_progname, TARGET_ALIAS)) {
+-		tmp = concat(argv0_dir, "../" TARGET_ALIAS "/bin", NULL);
++	if (streqn(elf2flt_progname, "ld")) {
++		tmp = concat(argv0_dir, "../../bin", NULL);
+ 		if (stat(tmp, &buf) == 0 && S_ISDIR(buf.st_mode)) {
+-			tooldir = concat(tmp, "/", NULL);
++			bindir = concat(tmp, "/", NULL);
+ 		}
+ 	} else {
+-		tmp = concat(argv0_dir, "../../bin", NULL);
++		tmp = concat(argv0_dir, "../" TARGET_ALIAS "/bin", NULL);
+ 		if (stat(tmp, &buf) == 0 && S_ISDIR(buf.st_mode)) {
+-			bindir = concat(tmp, "/", NULL);
++			tooldir = concat(tmp, "/", NULL);
+ 		}
+ 	}
+ 
+-- 
+2.9.4
+

package/elf2flt/Config.in.host

@@ -0,0 +1,11 @@
+config BR2_PACKAGE_HOST_ELF2FLT
+	bool "Enable elf2flt support?"
+	depends on BR2_arm || BR2_sh || BR2_sparc || BR2_xtensa
+	depends on !BR2_USE_MMU
+	help
+	  uCLinux uses a Binary Flat format commonly known as BFLT. It
+	  is a relatively simple and lightweight executable format
+	  based on the original a.out format.
+
+	  This option compiles the required tools and makes the required
+	  modifications on your toolchain (linker).

package/elf2flt/elf2flt.hash

@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 d63baae6fe0d7fcc50a635be151a6f9e1e83dba30568046a869a395c15bf6284  elf2flt-7e33f28df198c46764021ed14408bd262751e148.tar.gz

package/elf2flt/elf2flt.mk

@@ -0,0 +1,48 @@
+################################################################################
+#
+# elf2flt
+#
+################################################################################
+
+ELF2FLT_VERSION = 7e33f28df198c46764021ed14408bd262751e148
+ELF2FLT_SITE = $(call github,uclinux-dev,elf2flt,$(ELF2FLT_VERSION))
+ELF2FLT_LICENSE = GPL-2.0+
+ELF2FLT_LICENSE_FILES = LICENSE.TXT
+
+HOST_ELF2FLT_DEPENDENCIES = host-binutils host-zlib
+
+# It is not exactly a host variant, but more a cross variant, which is
+# why we pass a special --target option.
+HOST_ELF2FLT_CONF_OPTS = \
+	--with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
+	--with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \
+	--with-libbfd=$(HOST_BINUTILS_DIR)/bfd/libbfd.a \
+	--with-libiberty=$(HOST_BINUTILS_DIR)/libiberty/libiberty.a \
+	--target=$(GNU_TARGET_NAME) \
+	--disable-werror
+
+HOST_ELF2FLT_LIBS = -lz
+
+ifeq ($(BR2_GCC_ENABLE_LTO),y)
+HOST_ELF2FLT_LIBS += -ldl
+endif
+
+HOST_ELF2FLT_CONF_ENV = LIBS="$(HOST_ELF2FLT_LIBS)"
+
+# Hardlinks between binaries in different directories cause a problem
+# with rpath fixup, so we de-hardlink those binaries, and replace them
+# with copies instead. Note that elf2flt will rename ld to ld.real
+# before installing its own ld, but we already took care of the
+# original ld from binutils so that it is already de-hardlinked. So
+# ld is now the one from elf2flt, and we want to de-hardlinke it.
+ELF2FLT_TOOLS = elf2flt flthdr ld
+define HOST_ELF2FLT_FIXUP_HARDLINKS
+	$(foreach tool,$(ELF2FLT_TOOLS),\
+		rm -f $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool) && \
+		cp -a $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-$(tool) \
+			$(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool)
+	)
+endef
+HOST_ELF2FLT_POST_INSTALL_HOOKS += HOST_ELF2FLT_FIXUP_HARDLINKS
+
+$(eval $(host-autotools-package))