diff options
Diffstat (limited to 'testsuite/cxx1.sh')
| -rwxr-xr-x | testsuite/cxx1.sh | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/testsuite/cxx1.sh b/testsuite/cxx1.sh index b208746..477a545 100755 --- a/testsuite/cxx1.sh +++ b/testsuite/cxx1.sh @@ -2,23 +2,21 @@ . `dirname $0`/functions.sh rm -f cxx1 cxx1lib*.so cxx1.log rm -f prelink.cache -$RUN_HOST $CXX -shared -O2 -fpic -o cxx1lib1.so $srcdir/cxx1lib1.C -$RUN_HOST $CXX -shared -O2 -fpic -o cxx1lib2.so $srcdir/cxx1lib2.C cxx1lib1.so +$CXX -shared -O2 -fpic -o cxx1lib1.so $srcdir/cxx1lib1.C +$CXX -shared -O2 -fpic -o cxx1lib2.so $srcdir/cxx1lib2.C cxx1lib1.so BINS="cxx1" LIBS="cxx1lib1.so cxx1lib2.so" -$RUN_HOST $CXXLINK -o cxx1 $srcdir/cxx1.C -Wl,--rpath-link,. cxx1lib2.so cxx1lib1.so +$CXXLINK -o cxx1 $srcdir/cxx1.C -Wl,--rpath-link,. cxx1lib2.so cxx1lib1.so savelibs echo $PRELINK -vvvv ${PRELINK_OPTS--vm} ./cxx1 > cxx1.log -$RUN_HOST $PRELINK -vvvv ${PRELINK_OPTS--vm} ./cxx1 >> cxx1.log 2>&1 || exit 1 +$PRELINK -vvvv ${PRELINK_OPTS--vm} ./cxx1 >> cxx1.log 2>&1 || exit 1 grep ^`echo $PRELINK | sed 's/ .*$/: /'` cxx1.log | grep -q -v 'C++ conflict' && exit 2 -case "`$RUN uname -m`" in +case "`uname -m`" in arm*) ;; # EABI says that vtables/typeinfo aren't vague linkage if there is a key method *) [ $( grep ^`echo $PRELINK | sed 's/ .*$/: /'` cxx1.log | grep 'Removing C++ conflict' | wc -l ) -ge 5 ] || exit 3;; esac -if [ "x$CROSS" = "x" ]; then - $RUN LD_LIBRARY_PATH=. ./cxx1 || exit 4 -fi -$RUN_HOST $READELF -a ./cxx1 >> cxx1.log 2>&1 || exit 5 +LD_LIBRARY_PATH=. ./cxx1 || exit 4 +readelf -a ./cxx1 >> cxx1.log 2>&1 || exit 5 # So that it is not prelinked again chmod -x ./cxx1 comparelibs >> cxx1.log 2>&1 || exit 6 |