[uClibc-cvs] svn commit: trunk/uClibc: ldso/libdl libc test

[jocke at uclibc.org]

Author: jocke
Date: 2005-08-12 17:41:18 -0600 (Fri, 12 Aug 2005)
New Revision: 11126

Log:
Removed hardcoded ld-uClibc.so.0 in uClibc. From Peter Mazinger.


Modified:
   trunk/uClibc/Rules.mak
   trunk/uClibc/ldso/libdl/Makefile
   trunk/uClibc/libc/Makefile
   trunk/uClibc/test/Rules.mak


Changeset:
Modified: trunk/uClibc/Rules.mak
===================================================================
--- trunk/uClibc/Rules.mak	2005-08-12 23:19:44 UTC (rev 11125)
+++ trunk/uClibc/Rules.mak	2005-08-12 23:41:18 UTC (rev 11126)
@@ -70,6 +70,7 @@
 SHARED_FULLNAME:=libuClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
 SHARED_MAJORNAME:=libc.so.$(MAJOR_VERSION)
 UCLIBC_LDSO:=ld-uClibc.so.$(MAJOR_VERSION)
+DYNAMIC_LINKER:=$(SHARED_LIB_LOADER_PREFIX)/$(UCLIBC_LDSO)
 LIBNAME:=libc.a
 LIBC:=$(TOPDIR)libc/$(LIBNAME)
 
@@ -314,13 +315,6 @@
     CFLAGS += -DNDEBUG
 endif
 
-ifeq ($(HAVE_SHARED),y)
-    ifeq ($(BUILD_UCLIBC_LDSO),y)
-	LDSO:=$(TOPDIR)lib/$(UCLIBC_LDSO)
-	DYNAMIC_LINKER:=$(SHARED_LIB_LOADER_PREFIX)/$(UCLIBC_LDSO)
-    endif
-endif
-
 CFLAGS_NOPIC:=$(CFLAGS)
 ifeq ($(DOPIC),y)
     CFLAGS += $(PICFLAG)

Modified: trunk/uClibc/ldso/libdl/Makefile
===================================================================
--- trunk/uClibc/ldso/libdl/Makefile	2005-08-12 23:19:44 UTC (rev 11125)
+++ trunk/uClibc/ldso/libdl/Makefile	2005-08-12 23:41:18 UTC (rev 11126)
@@ -74,7 +74,7 @@
 	$(LD) $(LDFLAGS) -soname=$(LIBDL_SHARED).$(MAJOR_VERSION) \
 		-o $(LIBDL_SHARED_FULLNAME) -fini dl_cleanup --whole-archive $(LIBDL_PIC) \
 		--no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
-		-L$(TOPDIR)/lib -lc $(LDADD_LIBFLOAT) $(TOPDIR)lib/ld-uClibc.so.0 $(LIBGCC);
+		-L$(TOPDIR)/lib -lc $(LDADD_LIBFLOAT) $(TOPDIR)lib/$(UCLIBC_LDSO) $(LIBGCC);
 	$(INSTALL) -d $(TOPDIR)lib
 	$(RM) $(TOPDIR)lib/$(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBDL_SHARED).$(MAJOR_VERSION)
 	$(INSTALL) -m 644 $(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib

Modified: trunk/uClibc/libc/Makefile
===================================================================
--- trunk/uClibc/libc/Makefile	2005-08-12 23:19:44 UTC (rev 11125)
+++ trunk/uClibc/libc/Makefile	2005-08-12 23:41:18 UTC (rev 11126)
@@ -82,7 +82,7 @@
 	$(LD) $(LDFLAGS) $(VERSION_SCRIPT) -soname=$(SHARED_MAJORNAME) -o $(SHARED_FULLNAME) \
 		--whole-archive shared_$(LIBNAME) \
 		$(TOPDIR)libc/misc/internals/interp.o --no-whole-archive \
-		-init __uClibc_init $(TOPDIR)lib/ld-uClibc.so.0 $(LIBGCC) $(LDADD_LIBFLOAT)
+		-init __uClibc_init $(TOPDIR)lib/$(UCLIBC_LDSO) $(LIBGCC) $(LDADD_LIBFLOAT)
 	@true #$(RM) -r tmp
 	$(INSTALL) -d $(TOPDIR)lib
 	$(RM) $(TOPDIR)lib/$(SHARED_FULLNAME)

Modified: trunk/uClibc/test/Rules.mak
===================================================================
--- trunk/uClibc/test/Rules.mak	2005-08-12 23:19:44 UTC (rev 11125)
+++ trunk/uClibc/test/Rules.mak	2005-08-12 23:41:18 UTC (rev 11126)
@@ -95,5 +95,5 @@
 	LDFLAGS       += -static
 	GLIBC_LDFLAGS += -static
 else
-	LDFLAGS       += -Wl,-dynamic-linker,$(TOPDIR)lib/ld-uClibc.so.0
+	LDFLAGS       += -Wl,-dynamic-linker,$(TOPDIR)lib/$(UCLIBC_LDSO)
 endif