From: Markos Chandras <markos.chand...@imgtec.com>
Signed-off-by: Markos Chandras <markos.chand...@imgtec.com>
---
Makerules | 2 +-
ldso/libdl/Makefile.in | 2 +-
libpthread/nptl/Makefile.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makerules b/Makerules
index 739fb3b..367daa5 100644
--- a/Makerules
+++ b/Makerules
@@ -304,7 +304,7 @@ define create-lds
-Wl,-z,relro -Wl,--hash-style=gnu -Wl,-z,defs \
-Wl,--verbose 2>&1 | LC_ALL=C \
sed -e '/^=========/,/^=========/!d;/^=========/d' \
- -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' >
$@.lds
+ -e 's/\. = .* + SIZEOF_HEADERS;/& $(SYMBOL_PREFIX)_begin = . -
SIZEOF_HEADERS;/' > $@.lds
endef
define link.so
diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in
index be236c8..edf95a6 100644
--- a/ldso/libdl/Makefile.in
+++ b/ldso/libdl/Makefile.in
@@ -23,7 +23,7 @@ LDFLAGS-$(UCLIBC_FORMAT_DSBT_ELF)-libdl.so :=
-Wl,--dsbt-index=3
LDFLAGS-libdl.so := $(LDFLAGS)
ifeq ($(LDSO_NO_CLEANUP),)
-LDFLAGS-libdl.so += -Wl,-fini,dl_cleanup
+LDFLAGS-libdl.so += -Wl,-fini,$(SYMBOL_PREFIX)dl_cleanup
endif
LIBS-libdl.so := $(LIBS) $(ldso)
diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
index 158bcae..0008822 100644
--- a/libpthread/nptl/Makefile.in
+++ b/libpthread/nptl/Makefile.in
@@ -145,7 +145,7 @@ LDFLAGS-libpthread.so += $(LDFLAGS)
endif
LDFLAGS-libpthread.so += $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so
$(top_builddir)lib/libdl-$(VERSION).so \
- -Wl,-z,nodelete,-z,initfirst,-init=__pthread_initialize_minimal_internal
+
-Wl,-z,nodelete,-z,initfirst,-init=$(SYMBOL_PREFIX)__pthread_initialize_minimal_internal
LIBS-libpthread.so := $(LIBS)
--
1.7.1
_______________________________________________
uClibc mailing list
uClibc@uclibc.org
http://lists.busybox.net/mailman/listinfo/uclibc
