|
@@ -107,13 +107,11 @@ endif
|
|
|
#
|
|
|
# Definitions of the list of libraries that should be copied to the target.
|
|
|
#
|
|
|
+
|
|
|
+TOOLCHAIN_EXTERNAL_LIBS += ld*.so*
|
|
|
+
|
|
|
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
|
|
|
TOOLCHAIN_EXTERNAL_LIBS += libatomic.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*
|
|
|
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_ARM_EABIHF),yy)
|
|
|
-TOOLCHAIN_EXTERNAL_LIBS += ld-linux-armhf.so.*
|
|
|
-else
|
|
|
-TOOLCHAIN_EXTERNAL_LIBS += ld*.so.*
|
|
|
-endif
|
|
|
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
|
|
TOOLCHAIN_EXTERNAL_LIBS += libpthread.so.*
|
|
|
ifneq ($(BR2_PACKAGE_GDB)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)
|
|
@@ -470,30 +468,6 @@ define TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT
|
|
|
fi
|
|
|
endef
|
|
|
|
|
|
-# Various utility functions used by the external toolchain based on musl.
|
|
|
-
|
|
|
-# With the musl C library, the libc.so library directly plays the role
|
|
|
-# of the dynamic library loader. We just need to create a symbolic
|
|
|
-# link to libc.so with the appropriate name.
|
|
|
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL):$(BR2_STATIC_LIBS),y:)
|
|
|
-ifeq ($(BR2_i386),y)
|
|
|
-MUSL_ARCH = i386
|
|
|
-else ifeq ($(BR2_ARM_EABIHF),y)
|
|
|
-MUSL_ARCH = armhf
|
|
|
-else ifeq ($(BR2_mips):$(BR2_SOFT_FLOAT),y:y)
|
|
|
-MUSL_ARCH = mips-sf
|
|
|
-else ifeq ($(BR2_mipsel):$(BR2_SOFT_FLOAT),y:y)
|
|
|
-MUSL_ARCH = mipsel-sf
|
|
|
-else ifeq ($(BR2_sh),y)
|
|
|
-MUSL_ARCH = sh
|
|
|
-else
|
|
|
-MUSL_ARCH = $(ARCH)
|
|
|
-endif
|
|
|
-define TOOLCHAIN_EXTERNAL_MUSL_LD_LINK
|
|
|
- ln -sf libc.so $(TARGET_DIR)/lib/ld-musl-$(MUSL_ARCH).so.1
|
|
|
-endef
|
|
|
-endif
|
|
|
-
|
|
|
# uClibc-ng dynamic loader is called ld-uClibc.so.1, but gcc is not
|
|
|
# patched specifically for uClibc-ng, so it continues to generate
|
|
|
# binaries that expect the dynamic loader to be named ld-uClibc.so.0,
|