From: Garrett C. <yab...@us...> - 2009-12-17 04:40:57
|
Update of /cvsroot/ltp/ltp/testcases/commands/ade/ldd In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv29136/ldd Modified Files: ldd01 Log Message: As noted by luibo... `According to case ld, ldd and nm's Makefile, s/*.o/*.obj/'. 1. ld01: Also, fix version parsing (newer versions don't have `version' in the same line as the version) and remove the hardcoded /usr/bin/ld // ld. 2. ldd01: Remove hardcoded cc // ldd. 3. nm01: Remove hardcoded cc // nm. Signed-off-by: Garrett Cooper <yan...@gm...> Index: ldd01 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/commands/ade/ldd/ldd01,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ldd01 12 Aug 2003 15:36:09 -0000 1.5 --- ldd01 17 Dec 2009 04:40:47 -0000 1.6 *************** *** 33,36 **** --- 33,38 ---- $trace_logic + CC=${CC:=gcc} + LDD=${LDD:=ldd} TCdat=${TCdat:-`pwd`} TCtmp=${TCtmp:-/tmp/ldd01-$$} *************** *** 38,65 **** do_cleanup() { ! rm -rf $TCtmp } do_setup() { ! mkdir $TCtmp ! # Check for ppc64 architecture ! file lddfile1.o | grep PowerPC | grep 64-bit >/dev/null 2>&1 ! if [ $? -eq 0 ]; then ! cc -m64 -shared -o $TCtmp/lddfile1.o.so $TCdat/lddfile1.o ! cc -m64 -shared -o $TCtmp/lddfile2.o.so $TCdat/lddfile2.o ! cc -m64 -shared -o $TCtmp/lddfile3.o.so $TCdat/lddfile3.o ! cc -m64 -shared -o $TCtmp/lddfile4.o.so $TCdat/lddfile4.o ! cc -m64 -shared -o $TCtmp/lddfile5.o.so $TCdat/lddfile5.o ! cc -m64 -O -o $TCtmp/a.out $TCtmp/lddfile*.o.so $TCdat/main.o ! else ! cc -shared -o $TCtmp/lddfile1.o.so $TCdat/lddfile1.o ! cc -shared -o $TCtmp/lddfile2.o.so $TCdat/lddfile2.o ! cc -shared -o $TCtmp/lddfile3.o.so $TCdat/lddfile3.o ! cc -shared -o $TCtmp/lddfile4.o.so $TCdat/lddfile4.o ! cc -shared -o $TCtmp/lddfile5.o.so $TCdat/lddfile5.o ! cc -O -o $TCtmp/a.out $TCtmp/lddfile*.o.so $TCdat/main.o ! fi } --- 40,67 ---- do_cleanup() { ! rm -rf $TCtmp } do_setup() { ! mkdir $TCtmp ! # Check for ppc64 architecture ! file lddfile1.obj | grep PowerPC | grep 64-bit >/dev/null 2>&1 ! if [ $? -eq 0 ]; then ! $CC -m64 -shared -o $TCtmp/lddfile1.obj.so $TCdat/lddfile1.obj ! $CC -m64 -shared -o $TCtmp/lddfile2.obj.so $TCdat/lddfile2.obj ! $CC -m64 -shared -o $TCtmp/lddfile3.obj.so $TCdat/lddfile3.obj ! $CC -m64 -shared -o $TCtmp/lddfile4.obj.so $TCdat/lddfile4.obj ! $CC -m64 -shared -o $TCtmp/lddfile5.obj.so $TCdat/lddfile5.obj ! $CC -m64 -O -o $TCtmp/a.out $TCtmp/lddfile*.obj.so $TCdat/main.obj ! else ! $CC -shared -o $TCtmp/lddfile1.obj.so $TCdat/lddfile1.obj ! $CC -shared -o $TCtmp/lddfile2.obj.so $TCdat/lddfile2.obj ! $CC -shared -o $TCtmp/lddfile3.obj.so $TCdat/lddfile3.obj ! $CC -shared -o $TCtmp/lddfile4.obj.so $TCdat/lddfile4.obj ! $CC -shared -o $TCtmp/lddfile5.obj.so $TCdat/lddfile5.obj ! $CC -O -o $TCtmp/a.out $TCtmp/lddfile*.obj.so $TCdat/main.obj ! fi } *************** *** 68,72 **** echo " ASSERTION 1 " ! ldd $TCtmp/a.out | grep -E "lddfile1.o.so|lddfile2.o.so|lddfile3.o.so|lddfile4.o.so|lddfile5.o.so" if [ $? -eq 0 ] then --- 70,74 ---- echo " ASSERTION 1 " ! $LDD $TCtmp/a.out | grep -E "lddfile1.obj.so|lddfile2.obj.so|lddfile3.obj.so|lddfile4.obj.so|lddfile5.obj.so" if [ $? -eq 0 ] then *************** *** 80,84 **** echo " ASSERTION 2 " ! ldd -v $TCtmp/a.out | grep -E "GLIBC|lddfile1.o.so|lddfile2.o.so|lddfile3.o.so|lddfile4.o.so|lddfile5.o.so" if [ $? -eq 0 ] then --- 82,86 ---- echo " ASSERTION 2 " ! $LDD -v $TCtmp/a.out | grep -E "GLIBC|lddfile1.obj.so|lddfile2.obj.so|lddfile3.obj.so|lddfile4.obj.so|lddfile5.obj.so" if [ $? -eq 0 ] then |