summaryrefslogtreecommitdiff
path: root/patches/uClibc/0.9.33.2/600-prefer-multilib.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/uClibc/0.9.33.2/600-prefer-multilib.patch')
-rw-r--r--patches/uClibc/0.9.33.2/600-prefer-multilib.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/patches/uClibc/0.9.33.2/600-prefer-multilib.patch b/patches/uClibc/0.9.33.2/600-prefer-multilib.patch
deleted file mode 100644
index 677c599..0000000
--- a/patches/uClibc/0.9.33.2/600-prefer-multilib.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urpN uClibc-0.9.33.2.orig/ldso/ldso/dl-elf.c uClibc-0.9.33.2/ldso/ldso/dl-elf.c
---- uClibc-0.9.33.2.orig/ldso/ldso/dl-elf.c 2017-03-14 23:40:57.527113741 -0700
-+++ uClibc-0.9.33.2/ldso/ldso/dl-elf.c 2017-03-14 23:42:19.308005691 -0700
-@@ -284,6 +284,19 @@ struct elf_resolve *_dl_load_shared_libr
- }
- }
- #endif
-+
-+#ifdef LDSO_MULTILIB_DIR
-+ /* If multilib directory is selected, search it before falling back to
-+ standard lib directories. */
-+ _dl_if_debug_dprint("\tsearching multilib lib path list\n");
-+ tpnt1 = search_for_named_library(libname, rflags,
-+ UCLIBC_RUNTIME_PREFIX LDSO_MULTILIB_DIR ":"
-+ UCLIBC_RUNTIME_PREFIX "usr" LDSO_MULTILIB_DIR,
-+ rpnt);
-+ if (tpnt1 != NULL)
-+ return tpnt1;
-+#endif
-+
- #if defined SHARED && defined __LDSO_SEARCH_INTERP_PATH__
- /* Look for libraries wherever the shared library loader
- * was installed */
-diff -urpN uClibc-0.9.33.2.orig/ldso/ldso/Makefile.in uClibc-0.9.33.2/ldso/ldso/Makefile.in
---- uClibc-0.9.33.2.orig/ldso/ldso/Makefile.in 2017-03-14 23:40:57.527113741 -0700
-+++ uClibc-0.9.33.2/ldso/ldso/Makefile.in 2017-03-14 23:41:45.215634328 -0700
-@@ -30,6 +30,11 @@ CFLAGS-ldso/ldso/$(TARGET_ARCH)/ := $(CF
-
- CFLAGS-ldso.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\" $(CFLAGS-ldso)
-
-+# Search non-default multilib directories
-+ifneq ($(MULTILIB_DIR),lib)
-+CFLAGS-ldso.c += -DLDSO_MULTILIB_DIR=\"$(MULTILIB_DIR)\"
-+endif
-+
- LDFLAGS-$(UCLIBC_FORMAT_DSBT_ELF)-$(UCLIBC_LDSO_NAME).so := -Wl,--dsbt-index=1
- ifneq ($(SUPPORT_LD_DEBUG),y)
- LDFLAGS-$(UCLIBC_LDSO_NAME).so := $(LDFLAGS)