瀏覽代碼

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

Eric Andersen 23 年之前
父節點
當前提交
d6e6ee0202
共有 5 個文件被更改,包括 15 次插入14 次删除
  1. 1 0
      test/Rules.mak
  2. 2 2
      test/silly/Makefile
  3. 2 2
      test/stat/Makefile
  4. 8 8
      test/stdlib/Makefile
  5. 2 2
      test/termios/Makefile

+ 1 - 0
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

+ 2 - 2
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 " "

+ 2 - 2
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 " "

+ 8 - 8
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 " "

+ 2 - 2
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 " "