Skip to contentSkip to conversation

toolchain-external: fix uClibc-ng 64bit dynamic loader link

PATCH New Baruch Siach 2 participants 2 messages Jul 16, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 toolchain-external: fix uClibc-ng 64bit dynamic loader link

Commit 34f95bf9dbb0 (toolchain-external: fix support of uClibc-ng toolchains, 2015-07-13) added the missing ld-uClibc.so.1 dynamic linker symlink that binaries expect when linked with uClibc-ng. However on 64bit targets the linker is called ld64-uClibc.so.1. Handle that case as well.

---
 toolchain/toolchain-external/toolchain-external.mk | 3 +++
 1 file changed, 3 insertions(+)
toolchain/toolchain-external/toolchain-external.mk +3 -0
index fcb033ca2ebf..ce9d79f2fa41 100644
@@ -730,6 +730,9 @@ define TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO
 	if test -e $(TARGET_DIR)/lib/ld-uClibc.so.1; then \
 		ln -sf ld-uClibc.so.1 $(TARGET_DIR)/lib/ld-uClibc.so.0 ; \
 	fi
+	if test -e $(TARGET_DIR)/lib/ld64-uClibc.so.1; then \
+		ln -sf ld64-uClibc.so.1 $(TARGET_DIR)/lib/ld64-uClibc.so.0 ; \
+	fi
 endef
 
 define TOOLCHAIN_EXTERNAL_INSTALL_STAGING_CMDS
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 toolchain-external: fix uClibc-ng 64bit dynamic loader link

Dear Baruch Siach,

Quoted 9 lines · Baruch Siach

Commit 34f95bf9dbb0 (toolchain-external: fix support of uClibc-ng toolchains, 2015-07-13) added the missing ld-uClibc.so.1 dynamic linker symlink that binaries expect when linked with uClibc-ng. However on 64bit targets the linker is called ld64-uClibc.so.1. Handle that case as well.

---
 toolchain/toolchain-external/toolchain-external.mk | 3 +++
 1 file changed, 3 insertions(+)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com