Use uClibc's ldd, not the system one which is probably broken

anyways.  This ensures correct answers, and prevents all the
annoying segfaults from the system ldd.
 -Erik

5 files changed, 15 insertions, 14 deletions

diff --git a/test/Rules.mak b/test/Rules.mak
index 63a8b2b95..aba4f38c0 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -17,6 +17,7 @@ NATIVE_ARCH = $(shell uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \
 CC = ../$(TESTDIR)extra/gcc-uClibc/$(NATIVE_ARCH)-uclibc-gcc
 HOST_CC = gcc
 STRIPTOOL=strip
+LDD = ../$(TESTDIR)ldso/util/ldd
 
 
 # Check if 'ls -sh' works or not
diff --git a/test/silly/Makefile b/test/silly/Makefile
index e94d67515..fb343ff1a 100644
--- a/test/silly/Makefile
+++ b/test/silly/Makefile
@@ -23,7 +23,7 @@ hello: hello.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
-	-ldd $@
+	-$(LDD) $@
 	ls -l $@
 	-./$@
 	-@ echo " "
@@ -36,7 +36,7 @@ hello_glibc: hello.c Makefile
 	$(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $@
-	-ldd $@
+	-$(LDD) $@
 	ls -l $@
 	-./$@
 	-@ echo " "
diff --git a/test/stat/Makefile b/test/stat/Makefile
index 2247f283f..90c189ad2 100644
--- a/test/stat/Makefile
+++ b/test/stat/Makefile
@@ -23,7 +23,7 @@ stat: stat.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
-	-ldd $@
+	-$(LDD) $@
 	ls -l $@
 	-./$@
 	-@ echo " "
@@ -36,7 +36,7 @@ stat_glibc: stat.c Makefile
 	$(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $@
-	-ldd $@
+	-$(LDD) $@
 	ls -l $@
 	-./$@
 	-@ echo " "
diff --git a/test/stdlib/Makefile b/test/stdlib/Makefile
index f551880f7..061933e03 100644
--- a/test/stdlib/Makefile
+++ b/test/stdlib/Makefile
@@ -25,7 +25,7 @@ testmalloc: testmalloc.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
-	-ldd $@
+	-$(LDD) $@
 	ls -l $@
 	-./$@
 	-@ echo " "
@@ -38,7 +38,7 @@ testmalloc_glibc: testmalloc.c Makefile
 	$(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $@
-	-ldd $@
+	-$(LDD) $@
 	ls -l $@
 	-./$@
 	-@ echo " "
@@ -51,7 +51,7 @@ mallocbug: mallocbug.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
-	-ldd $@
+	-$(LDD) $@
 	ls -l $@
 	-./$@
 	-@ echo " "
@@ -64,7 +64,7 @@ mallocbug_glibc: mallocbug.c Makefile
 	$(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $@
-	-ldd $@
+	-$(LDD) $@
 	ls -l $@
 	-./$@
 	-@ echo " "
@@ -84,7 +84,7 @@ teststrtol: teststrtol.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
-	-ldd $@
+	-$(LDD) $@
 	ls -sh $@
 	-./$@ > $@.out
 	-@ echo " "
@@ -97,7 +97,7 @@ teststrtol_glibc: teststrtol.c Makefile
 	$(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $@
-	-ldd $@
+	-$(LDD) $@
 	ls -sh $@
 	-./$@ > $@.out
 	-@ echo " "
@@ -118,7 +118,7 @@ qsort: qsort.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
-	-ldd $@
+	-$(LDD) $@
 	ls -l $@
 	-./$@ > $@.out
 	-@ echo " "
@@ -131,7 +131,7 @@ qsort_glibc: qsort.c Makefile
 	$(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $@
-	-ldd $@
+	-$(LDD) $@
 	ls -sh $@
 	-./$@ > $@.out
 	-@ echo " "
diff --git a/test/termios/Makefile b/test/termios/Makefile
index 930cbdca3..bbd99e476 100644
--- a/test/termios/Makefile
+++ b/test/termios/Makefile
@@ -15,7 +15,7 @@ termios: termios.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(CC)
 	$(CC) $(CFLAGS) -c $< -o $@.o
 	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
 	$(STRIPTOOL) -x -R .note -R .comment $@
-	-ldd $@
+	-$(LDD) $@
 	ls -l $@
 	-./$@
 	-@ echo " "
@@ -28,7 +28,7 @@ termios_glibc: termios.c Makefile
 	$(HOST_CC) $(GLIBC_CFLAGS) -c $< -o $@.o
 	$(HOST_CC) $(GLIBC_LDFLAGS) $@.o -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $@
-	-ldd $@
+	-$(LDD) $@
 	ls -l $@
 	-./$@
 	-@ echo " "