* [PATCH]: Fix testsuite
@ 2011-10-30 22:15 Meador Inge
0 siblings, 0 replies; only message in thread
From: Meador Inge @ 2011-10-30 22:15 UTC (permalink / raw)
To: prelink; +Cc: jakub
[-- Attachment #1: Type: text/plain, Size: 1531 bytes --]
Recently binutils was modified to change the default for
--copy-dt-needed-entries to false.
As a result, many applications that relied on dependencies being
implicitly resolved via
dependencies in intermediate libraries are now broken. This change in default
broke most of the tests in the prelink testsuite The attached patch fixes them.
OK?
-- Meador
--
2011-10-30 Meador Inge <meadori@codesourcery.com>
* testsuite/shuffle4.sh: Explicitly link all shared libraries.
* testsuite/cxx1.sh: Likewise.
* testsuite/shuffle8.sh: Likewise.
* testsuite/undo1.sh: Likewise.
* testsuite/ifunc3.sh: Likewise.
* testsuite/reloc3.sh: Likewise.
* testsuite/reloc7.sh: Likewise.
* testsuite/quick1.sh: Likewise.
* testsuite/reloc11.sh: Likewise.
* testsuite/shuffle3.sh: Likewise.
* testsuite/shuffle7.sh: Likewise.
* testsuite/tls2.sh: Likewise.
* testsuite/ifunc2.sh: Likewise.
* testsuite/tls6.sh: Likewise.
* testsuite/reloc6.sh: Likewise.
* testsuite/reloc10.sh: Likewise.
* testsuite/deps2.sh: Likewise.
* testsuite/shuffle2.sh: Likewise.
* testsuite/shuffle6.sh: Likewise.
* testsuite/tls1.sh: Likewise.
* testsuite/reloc1.sh: Likewise.
* testsuite/cxx3.sh: Likewise.
* testsuite/ifunc1.sh: Likewise.
* testsuite/tls5.sh: Likewise.
* testsuite/quick3.sh: Likewise.
* testsuite/deps1.sh: Likewise.
* testsuite/shuffle1.sh: Likewise.
* testsuite/shuffle5.sh: Likewise.
* testsuite/cxx2.sh: Likewise.
* testsuite/shuffle9.sh: Likewise.
* testsuite/tls4.sh: Likewise.
* testsuite/quick2.sh: Likewise.
[-- Attachment #2: fix-testsuite-implicit-linking.patch --]
[-- Type: text/x-patch, Size: 20922 bytes --]
Index: testsuite/shuffle4.sh
===================================================================
--- testsuite/shuffle4.sh (revision 196)
+++ testsuite/shuffle4.sh (working copy)
@@ -6,7 +6,8 @@
esac
rm -f shuffle4 shuffle4.log
BINS="shuffle4"
-$CCLINK -o shuffle4 $srcdir/shuffle2.c -Wl,--rpath-link,. shuffle3lib2.so
+$CCLINK -o shuffle4 $srcdir/shuffle2.c -Wl,--rpath-link,. shuffle3lib2.so \
+ shuffle3lib1.so
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./shuffle4 > shuffle4.log
$PRELINK ${PRELINK_OPTS--vm} ./shuffle4 >> shuffle4.log 2>&1 || exit 1
Index: testsuite/cxx1.sh
===================================================================
--- testsuite/cxx1.sh (revision 196)
+++ testsuite/cxx1.sh (working copy)
@@ -6,7 +6,7 @@
$CXX -shared -O2 -fpic -o cxx1lib2.so $srcdir/cxx1lib2.C cxx1lib1.so
BINS="cxx1"
LIBS="cxx1lib1.so cxx1lib2.so"
-$CXXLINK -o cxx1 $srcdir/cxx1.C -Wl,--rpath-link,. cxx1lib2.so
+$CXXLINK -o cxx1 $srcdir/cxx1.C -Wl,--rpath-link,. cxx1lib2.so cxx1lib1.so
savelibs
echo $PRELINK -vvvv ${PRELINK_OPTS--vm} ./cxx1 > cxx1.log
$PRELINK -vvvv ${PRELINK_OPTS--vm} ./cxx1 >> cxx1.log 2>&1 || exit 1
Index: testsuite/shuffle8.sh
===================================================================
--- testsuite/shuffle8.sh (revision 196)
+++ testsuite/shuffle8.sh (working copy)
@@ -6,7 +6,8 @@
$CC -shared -O2 -fpic -o shuffle8lib2.so $srcdir/reloc1lib2.c shuffle8lib1.so
BINS="shuffle8"
LIBS="shuffle8lib1.so shuffle8lib2.so"
-$CCLINK -o shuffle8 $srcdir/shuffle8.c -Wl,--rpath-link,. shuffle8lib2.so
+$CCLINK -o shuffle8 $srcdir/shuffle8.c -Wl,--rpath-link,. shuffle8lib2.so \
+ shuffle8lib1.so
strip -R .comment shuffle8
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./shuffle8 > shuffle8.log
Index: testsuite/undo1.sh
===================================================================
--- testsuite/undo1.sh (revision 196)
+++ testsuite/undo1.sh (working copy)
@@ -6,7 +6,7 @@
$CC -shared -O2 -fpic -o undo1lib2.so $srcdir/reloc1lib2.c undo1lib1.so
BINS="undo1"
LIBS="undo1lib1.so undo1lib2.so"
-$CCLINK -o undo1 $srcdir/reloc1.c -Wl,--rpath-link,. undo1lib2.so
+$CCLINK -o undo1 $srcdir/reloc1.c -Wl,--rpath-link,. undo1lib2.so undo1lib1.so
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./undo1 > undo1.log
$PRELINK ${PRELINK_OPTS--vm} ./undo1 >> undo1.log 2>&1 || exit 1
Index: testsuite/ifunc3.sh
===================================================================
--- testsuite/ifunc3.sh (revision 196)
+++ testsuite/ifunc3.sh (working copy)
@@ -9,7 +9,8 @@
$CC -shared -O2 -fpic -o ifunc3lib2.so $srcdir/ifunc1lib2.c ifunc3lib1.so
BINS="ifunc3"
LIBS="ifunc3lib1.so ifunc3lib2.so"
-$CCLINK -o ifunc3 $srcdir/ifunc3.c -Wl,--rpath-link,. ifunc3lib2.so
+$CCLINK -o ifunc3 $srcdir/ifunc3.c -Wl,--rpath-link,. ifunc3lib2.so \
+ ifunc3lib1.so
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./ifunc3 >> ifunc3.log
$PRELINK ${PRELINK_OPTS--vm} ./ifunc3 >> ifunc3.log 2>&1 || exit 1
Index: testsuite/reloc3.sh
===================================================================
--- testsuite/reloc3.sh (revision 196)
+++ testsuite/reloc3.sh (working copy)
@@ -6,7 +6,8 @@
$CC -shared -O2 -fpic -o reloc3lib2.so $srcdir/reloc1lib2.c reloc3lib1.so
BINS="reloc3"
LIBS="reloc3lib1.so reloc3lib2.so"
-$CCLINK -o reloc3 $srcdir/reloc3.c -Wl,--rpath-link,. reloc3lib2.so
+$CCLINK -o reloc3 $srcdir/reloc3.c -Wl,--rpath-link,. reloc3lib2.so \
+ reloc3lib1.so
strip -g $BINS $LIBS
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./reloc3 > reloc3.log
Index: testsuite/reloc7.sh
===================================================================
--- testsuite/reloc7.sh (revision 196)
+++ testsuite/reloc7.sh (working copy)
@@ -6,7 +6,8 @@
$CC -shared -O2 -Wl,-z,nocombreloc -fpic -o reloc7lib2.so $srcdir/reloc1lib2.c reloc7lib1.so
BINS="reloc7"
LIBS="reloc7lib1.so reloc7lib2.so"
-$CCLINK -o reloc7 -Wl,-z,nocombreloc $srcdir/reloc7.c -Wl,--rpath-link,. reloc7lib2.so
+$CCLINK -o reloc7 -Wl,-z,nocombreloc $srcdir/reloc7.c -Wl,--rpath-link,. \
+ reloc7lib2.so reloc7lib1.so
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./reloc7 > reloc7.log
$PRELINK ${PRELINK_OPTS--vm} ./reloc7 >> reloc7.log 2>&1 || exit 1
Index: testsuite/quick1.sh
===================================================================
--- testsuite/quick1.sh (revision 196)
+++ testsuite/quick1.sh (working copy)
@@ -55,16 +55,16 @@
cp -dp $lib quick1.tree/lib
done
$CCLINK -o quick1.tree/usr/bin/bin1 $srcdir/reloc1.c \
- -Wl,--rpath-link,quick1.tree/usr/lib -L quick1.tree/usr/lib -l2
+ -Wl,--rpath-link,quick1.tree/usr/lib -L quick1.tree/usr/lib -l2 -l1
echo 'int main () { extern int foo; return foo; }' \
| $CCLINK -o quick1.tree/usr/bin/bin2 -xc - -xnone \
-L quick1.tree/usr/lib -l4
$CCLINK -o quick1.tree/usr/bin/bin3 $srcdir/reloc1.c \
- -Wl,--rpath-link,quick1.tree/usr/lib -L quick1.tree/usr/lib -l7
+ -Wl,--rpath-link,quick1.tree/usr/lib -L quick1.tree/usr/lib -l7 -l2 -l1
$CCLINK -o quick1.tree/usr/bin/bin4 $srcdir/quick1.c \
- -Wl,--rpath-link,quick1.tree/usr/lib -L quick1.tree/usr/lib -l2
+ -Wl,--rpath-link,quick1.tree/usr/lib -L quick1.tree/usr/lib -l2 -l1
$CCLINK -o quick1.tree/usr/bin/bin5 $srcdir/quick1.c \
- -Wl,--rpath-link,quick1.tree/usr/lib -L quick1.tree/usr/lib -l7
+ -Wl,--rpath-link,quick1.tree/usr/lib -L quick1.tree/usr/lib -l7 -l2 -l1
echo 'int main () { return 0; }' \
| $CCLINK -o quick1.tree/usr/bin/bin6 -xc - -xnone \
-Wl,--rpath-link,quick1.tree/usr/lib -L quick1.tree/usr/lib -l6
Index: testsuite/reloc11.sh
===================================================================
--- testsuite/reloc11.sh (revision 196)
+++ testsuite/reloc11.sh (working copy)
@@ -7,7 +7,8 @@
$CC -shared -O2 -nostdlib -fpic -o reloc11lib3.so $srcdir/reloc11lib3.c reloc11lib2.so
BINS="reloc11"
LIBS="reloc11lib1.so reloc11lib2.so reloc11lib3.so"
-$CCLINK -o reloc11 $srcdir/reloc11.c -Wl,--rpath-link,. reloc11lib1.so reloc11lib3.so
+$CCLINK -o reloc11 $srcdir/reloc11.c -Wl,--rpath-link,. reloc11lib1.so \
+ reloc11lib3.so reloc11lib2.so
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./reloc11 > reloc11.log
$PRELINK ${PRELINK_OPTS--vm} ./reloc11 >> reloc11.log 2>&1 || exit 1
Index: testsuite/shuffle3.sh
===================================================================
--- testsuite/shuffle3.sh (revision 196)
+++ testsuite/shuffle3.sh (working copy)
@@ -14,7 +14,7 @@
-Wl,--verbose 2>&1 | sed -e '/^=========/,/^=========/!d;/^=========/d' \
-e 's/0x08048000/0x08000000/' > shuffle3.lds
$CCLINK -o shuffle3 $srcdir/shuffle2.c -Wl,--rpath-link,. shuffle3lib2.so \
- -Wl,-T,shuffle3.lds
+ shuffle3lib1.so -Wl,-T,shuffle3.lds
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./shuffle3 > shuffle3.log
$PRELINK ${PRELINK_OPTS--vm} ./shuffle3 >> shuffle3.log 2>&1 || exit 1
Index: testsuite/shuffle7.sh
===================================================================
--- testsuite/shuffle7.sh (revision 196)
+++ testsuite/shuffle7.sh (working copy)
@@ -11,7 +11,7 @@
-e '/\.hash/a\
. = . + 0x300;' > shuffle7.lds
$CCLINK -o shuffle7 $srcdir/reloc1.c -Wl,--rpath-link,. shuffle7lib2.so \
- -Wl,-T,shuffle7.lds
+ shuffle7lib1.so -Wl,-T,shuffle7.lds
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./shuffle7 > shuffle7.log
$PRELINK ${PRELINK_OPTS--vm} ./shuffle7 >> shuffle7.log 2>&1 || exit 1
Index: testsuite/tls2.sh
===================================================================
--- testsuite/tls2.sh (revision 196)
+++ testsuite/tls2.sh (working copy)
@@ -11,7 +11,7 @@
$CC -shared -O2 -fpic -o tls2lib2.so $srcdir/tls1lib2.c tls2lib1.so
BINS="tls2"
LIBS="tls2lib1.so tls2lib2.so"
-$CCLINK -o tls2 $srcdir/tls2.c -Wl,--rpath-link,. tls2lib2.so
+$CCLINK -o tls2 $srcdir/tls2.c -Wl,--rpath-link,. tls2lib2.so tls2lib1.so
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./tls2 > tls2.log
$PRELINK ${PRELINK_OPTS--vm} ./tls2 >> tls2.log 2>&1 || exit 1
Index: testsuite/ifunc2.sh
===================================================================
--- testsuite/ifunc2.sh (revision 196)
+++ testsuite/ifunc2.sh (working copy)
@@ -9,7 +9,8 @@
$CC -shared -O2 -fpic -o ifunc2lib2.so $srcdir/ifunc1lib2.c ifunc2lib1.so -DPICKNO=2
BINS="ifunc2"
LIBS="ifunc2lib1.so ifunc2lib2.so"
-$CCLINK -o ifunc2 $srcdir/ifunc1.c -Wl,--rpath-link,. ifunc2lib2.so -DPICKNO=2
+$CCLINK -o ifunc2 $srcdir/ifunc1.c -Wl,--rpath-link,. ifunc2lib2.so \
+ ifunc2lib1.so -DPICKNO=2
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./ifunc2 >> ifunc2.log
$PRELINK ${PRELINK_OPTS--vm} ./ifunc2 >> ifunc2.log 2>&1 || exit 1
Index: testsuite/tls6.sh
===================================================================
--- testsuite/tls6.sh (revision 196)
+++ testsuite/tls6.sh (working copy)
@@ -13,7 +13,7 @@
-Wl,--rpath-link,. tls6lib1.so
BINS="tls6"
LIBS="tls6lib1.so tls6lib2.so tls6lib3.so"
-$CCLINK -o tls6 $srcdir/tls2.c -Wl,--rpath-link,. tls6lib2.so
+$CCLINK -o tls6 $srcdir/tls2.c -Wl,--rpath-link,. tls6lib2.so tls6lib1.so
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./tls6 > tls6.log
$PRELINK ${PRELINK_OPTS--vm} ./tls6 >> tls6.log 2>&1 || exit 1
Index: testsuite/reloc6.sh
===================================================================
--- testsuite/reloc6.sh (revision 196)
+++ testsuite/reloc6.sh (working copy)
@@ -4,8 +4,10 @@
rm -f prelink.cache
$CC -shared -O2 -fpic -o reloc6lib1.so $srcdir/reloc3lib1.c
$CC -shared -O2 -fpic -o reloc6lib2.so $srcdir/reloc1lib2.c reloc6lib1.so
-$CCLINK -o reloc6 $srcdir/reloc3.c -Wl,--rpath-link,. reloc6lib2.so
-$CCLINK -o reloc6.nop $srcdir/reloc3.c -Wl,--rpath-link,. reloc6lib2.so
+$CCLINK -o reloc6 $srcdir/reloc3.c -Wl,--rpath-link,. reloc6lib2.so \
+ reloc6lib1.so
+$CCLINK -o reloc6.nop $srcdir/reloc3.c -Wl,--rpath-link,. reloc6lib2.so \
+ reloc6lib1.so
echo $PRELINK ${PRELINK_OPTS--vm} ./reloc6 > reloc6.log
$PRELINK ${PRELINK_OPTS--vm} ./reloc6 >> reloc6.log 2>&1 || exit 1
grep -q ^`echo $PRELINK | sed 's/ .*$/: /'` reloc6.log && exit 2
Index: testsuite/reloc10.sh
===================================================================
--- testsuite/reloc10.sh (revision 196)
+++ testsuite/reloc10.sh (working copy)
@@ -6,10 +6,11 @@
$CC -shared -O2 -nostdlib -fpic -o reloc10lib2.so $srcdir/reloc10lib2.c reloc10lib1.so
$CC -shared -O2 -nostdlib -fpic -o reloc10lib3.so $srcdir/reloc10lib3.c reloc10lib1.so
$CC -shared -O2 -nostdlib -fpic -o reloc10lib4.so $srcdir/reloc10lib4.c reloc10lib1.so
-$CC -shared -O2 -fpic -o reloc10lib5.so $srcdir/reloc10lib5.c reloc10lib2.so reloc10lib3.so reloc10lib4.so
+$CC -shared -O2 -fpic -o reloc10lib5.so $srcdir/reloc10lib5.c reloc10lib2.so \
+ reloc10lib3.so reloc10lib4.so
BINS="reloc10"
LIBS="reloc10lib1.so reloc10lib2.so reloc10lib3.so reloc10lib4.so reloc10lib5.so"
-$CCLINK -o reloc10 $srcdir/reloc10.c -Wl,--rpath-link,. reloc10lib5.so
+$CCLINK -o reloc10 $srcdir/reloc10.c -Wl,--rpath-link,. reloc10lib5.so reloc10lib4.so reloc10lib3.so reloc10lib2.so
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./reloc10 > reloc10.log
$PRELINK ${PRELINK_OPTS--vm} ./reloc10 >> reloc10.log 2>&1 || exit 1
Index: testsuite/deps2.sh
===================================================================
--- testsuite/deps2.sh (revision 196)
+++ testsuite/deps2.sh (working copy)
@@ -25,7 +25,7 @@
cp -dp $lib deps2.tree/lib
done
$CCLINK -o deps2.tree/usr/bin/bin1 $srcdir/deps1.c \
- -Wl,-rpath,deps2.tree/usr/lib -L deps2.tree/usr/lib -l3
+ -Wl,-rpath,deps2.tree/usr/lib -L deps2.tree/usr/lib -l3 -l1 -l2
cat > deps2.tree/etc/prelink.conf <<EOF
deps2.tree/usr/bin
deps2.tree/lib
Index: testsuite/shuffle2.sh
===================================================================
--- testsuite/shuffle2.sh (revision 196)
+++ testsuite/shuffle2.sh (working copy)
@@ -13,7 +13,7 @@
-Wl,--verbose 2>&1 | sed -e '/^=========/,/^=========/!d;/^=========/d' \
-e 's/0x08048000/0x08000000/;s/SIZEOF_HEADERS.*$/& . += 56;/' > shuffle2.lds
$CCLINK -o shuffle2 $srcdir/shuffle2.c -Wl,--rpath-link,. shuffle2lib2.so \
- -Wl,-T,shuffle2.lds
+ shuffle2lib1.so -Wl,-T,shuffle2.lds
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./shuffle2 > shuffle2.log
$PRELINK ${PRELINK_OPTS--vm} ./shuffle2 >> shuffle2.log 2>&1 || exit 1
Index: testsuite/shuffle6.sh
===================================================================
--- testsuite/shuffle6.sh (revision 196)
+++ testsuite/shuffle6.sh (working copy)
@@ -10,7 +10,7 @@
-Wl,--verbose 2>&1 | sed -e '/^=========/,/^=========/!d;/^=========/d' \
-e 's/0x08048000/0x08000000/;s/SIZEOF_HEADERS.*$/& . += 56;/' > shuffle6.lds
$CCLINK -o shuffle6 $srcdir/reloc1.c -Wl,--rpath-link,. shuffle6lib2.so \
- -Wl,-T,shuffle6.lds
+ shuffle6lib1.so -Wl,-T,shuffle6.lds
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./shuffle6 > shuffle6.log
$PRELINK ${PRELINK_OPTS--vm} ./shuffle6 >> shuffle6.log 2>&1 || exit 1
Index: testsuite/tls1.sh
===================================================================
--- testsuite/tls1.sh (revision 196)
+++ testsuite/tls1.sh (working copy)
@@ -11,7 +11,7 @@
$CC -shared -O2 -fpic -o tls1lib2.so $srcdir/tls1lib2.c tls1lib1.so
BINS="tls1"
LIBS="tls1lib1.so tls1lib2.so"
-$CCLINK -o tls1 $srcdir/tls1.c -Wl,--rpath-link,. tls1lib2.so
+$CCLINK -o tls1 $srcdir/tls1.c -Wl,--rpath-link,. tls1lib2.so tls1lib1.so
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./tls1 > tls1.log
$PRELINK ${PRELINK_OPTS--vm} ./tls1 >> tls1.log 2>&1 || exit 1
Index: testsuite/reloc1.sh
===================================================================
--- testsuite/reloc1.sh (revision 196)
+++ testsuite/reloc1.sh (working copy)
@@ -6,7 +6,8 @@
$CC -shared -O2 -fpic -o reloc1lib2.so $srcdir/reloc1lib2.c reloc1lib1.so
BINS="reloc1"
LIBS="reloc1lib1.so reloc1lib2.so"
-$CCLINK -o reloc1 $srcdir/reloc1.c -Wl,--rpath-link,. reloc1lib2.so
+$CCLINK -o reloc1 $srcdir/reloc1.c -Wl,--rpath-link,. reloc1lib2.so \
+ reloc1lib1.so
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./reloc1 > reloc1.log
$PRELINK ${PRELINK_OPTS--vm} ./reloc1 >> reloc1.log 2>&1 || exit 1
Index: testsuite/cxx3.sh
===================================================================
--- testsuite/cxx3.sh (revision 196)
+++ testsuite/cxx3.sh (working copy)
@@ -6,7 +6,7 @@
$CXX -shared -O2 -fpic -o cxx3lib2.so $srcdir/cxx3lib2.C cxx3lib1.so
BINS="cxx3"
LIBS="cxx3lib1.so cxx3lib2.so"
-$CXXLINK -o cxx3 $srcdir/cxx3.C -Wl,--rpath-link,. cxx3lib2.so
+$CXXLINK -o cxx3 $srcdir/cxx3.C -Wl,--rpath-link,. cxx3lib2.so cxx3lib1.so
savelibs
echo $PRELINK -vvvv ${PRELINK_OPTS--vm} ./cxx3 > cxx3.log
$PRELINK -vvvv ${PRELINK_OPTS--vm} ./cxx3 >> cxx3.log 2>&1 || exit 1
Index: testsuite/ifunc1.sh
===================================================================
--- testsuite/ifunc1.sh (revision 196)
+++ testsuite/ifunc1.sh (working copy)
@@ -9,7 +9,8 @@
$CC -shared -O2 -fpic -o ifunc1lib2.so $srcdir/ifunc1lib2.c ifunc1lib1.so
BINS="ifunc1"
LIBS="ifunc1lib1.so ifunc1lib2.so"
-$CCLINK -o ifunc1 $srcdir/ifunc1.c -Wl,--rpath-link,. ifunc1lib2.so
+$CCLINK -o ifunc1 $srcdir/ifunc1.c -Wl,--rpath-link,. ifunc1lib2.so \
+ ifunc1lib1.so
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./ifunc1 >> ifunc1.log
$PRELINK ${PRELINK_OPTS--vm} ./ifunc1 >> ifunc1.log 2>&1 || exit 1
Index: testsuite/tls5.sh
===================================================================
--- testsuite/tls5.sh (revision 196)
+++ testsuite/tls5.sh (working copy)
@@ -13,7 +13,7 @@
-Wl,--rpath-link,. tls5lib1.so
BINS="tls5"
LIBS="tls5lib1.so tls5lib2.so tls5lib3.so"
-$CCLINK -o tls5 $srcdir/tls1.c -Wl,--rpath-link,. tls5lib2.so
+$CCLINK -o tls5 $srcdir/tls1.c -Wl,--rpath-link,. tls5lib2.so tls5lib1.so
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./tls5 > tls5.log
$PRELINK ${PRELINK_OPTS--vm} ./tls5 >> tls5.log 2>&1 || exit 1
Index: testsuite/quick3.sh
===================================================================
--- testsuite/quick3.sh (revision 196)
+++ testsuite/quick3.sh (working copy)
@@ -43,7 +43,7 @@
cp -dp $lib quick3.tree/lib
done
$CCLINK -o quick3.tree/usr/bin/bin1 $srcdir/reloc1.c \
- -Wl,--rpath-link,quick3.tree/usr/lib -L quick3.tree/usr/lib -l2
+ -Wl,--rpath-link,quick3.tree/usr/lib -L quick3.tree/usr/lib -l2 -l1
cat > quick3.tree/etc/prelink.conf <<EOF
quick3.tree/usr/bin
quick3.tree/lib
Index: testsuite/deps1.sh
===================================================================
--- testsuite/deps1.sh (revision 196)
+++ testsuite/deps1.sh (working copy)
@@ -25,7 +25,7 @@
cp -dp $lib deps1.tree/lib
done
$CCLINK -o deps1.tree/usr/bin/bin1 $srcdir/deps1.c \
- -Wl,-rpath,deps1.tree/usr/lib -L deps1.tree/usr/lib -l3
+ -Wl,-rpath,deps1.tree/usr/lib -L deps1.tree/usr/lib -l3 -l1 -l2
cat > deps1.tree/etc/prelink.conf <<EOF
deps1.tree/usr/bin
deps1.tree/lib
Index: testsuite/shuffle1.sh
===================================================================
--- testsuite/shuffle1.sh (revision 196)
+++ testsuite/shuffle1.sh (working copy)
@@ -10,7 +10,7 @@
-Wl,--verbose 2>&1 | sed -e '/^=========/,/^=========/!d;/^=========/d' \
-e 's/0x08048000/0x08000000/;s/SIZEOF_HEADERS.*$/& . += 56;/' > shuffle1.lds
$CCLINK -o shuffle1 $srcdir/reloc1.c -Wl,--rpath-link,. shuffle1lib2.so \
- -Wl,-T,shuffle1.lds
+ shuffle1lib1.so -Wl,-T,shuffle1.lds
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./shuffle1 > shuffle1.log
$PRELINK ${PRELINK_OPTS--vm} ./shuffle1 >> shuffle1.log 2>&1 || exit 1
Index: testsuite/shuffle5.sh
===================================================================
--- testsuite/shuffle5.sh (revision 196)
+++ testsuite/shuffle5.sh (working copy)
@@ -10,7 +10,7 @@
-Wl,--verbose 2>&1 | sed -e '/^=========/,/^=========/!d;/^=========/d' \
-e 's/0x08048000/0x08000000/;s/SIZEOF_HEADERS.*$/& . += 180;/' > shuffle5.lds
$CCLINK -o shuffle5 $srcdir/reloc1.c -Wl,--rpath-link,. shuffle5lib2.so \
- -Wl,-T,shuffle5.lds
+ shuffle5lib1.so -Wl,-T,shuffle5.lds
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./shuffle5 > shuffle5.log
$PRELINK ${PRELINK_OPTS--vm} ./shuffle5 >> shuffle5.log 2>&1 || exit 1
Index: testsuite/cxx2.sh
===================================================================
--- testsuite/cxx2.sh (revision 196)
+++ testsuite/cxx2.sh (working copy)
@@ -6,7 +6,7 @@
$CXX -shared -O2 -fpic -o cxx2lib2.so $srcdir/cxx1lib2.C cxx2lib1.so
BINS="cxx2"
LIBS="cxx2lib1.so cxx2lib2.so"
-$CXXLINK -o cxx2 $srcdir/cxx2.C -Wl,--rpath-link,. cxx2lib2.so
+$CXXLINK -o cxx2 $srcdir/cxx2.C -Wl,--rpath-link,. cxx2lib2.so cxx2lib1.so
savelibs
echo $PRELINK -vvvv ${PRELINK_OPTS--vm} ./cxx2 > cxx2.log
$PRELINK -vvvv ${PRELINK_OPTS--vm} ./cxx2 >> cxx2.log 2>&1 || exit 1
Index: testsuite/shuffle9.sh
===================================================================
--- testsuite/shuffle9.sh (revision 196)
+++ testsuite/shuffle9.sh (working copy)
@@ -6,7 +6,8 @@
esac
rm -f shuffle9 shuffle9.log
BINS="shuffle9"
-$CCLINK -o shuffle9 $srcdir/shuffle9.c -Wl,--rpath-link,. shuffle3lib2.so
+$CCLINK -o shuffle9 $srcdir/shuffle9.c -Wl,--rpath-link,. shuffle3lib2.so \
+ shuffle3lib1.so
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./shuffle9 > shuffle9.log
$PRELINK ${PRELINK_OPTS--vm} ./shuffle9 >> shuffle9.log 2>&1 || exit 1
Index: testsuite/tls4.sh
===================================================================
--- testsuite/tls4.sh (revision 196)
+++ testsuite/tls4.sh (working copy)
@@ -12,7 +12,7 @@
tls4lib1.so 2>/dev/null
BINS="tls4"
LIBS="tls4lib1.so tls4lib2.so"
-$CCLINK -o tls4 $srcdir/tls4.c -Wl,--rpath-link,. tls4lib2.so
+$CCLINK -o tls4 $srcdir/tls4.c -Wl,--rpath-link,. tls4lib2.so tls4lib1.so
savelibs
echo $PRELINK ${PRELINK_OPTS--vm} ./tls4 > tls4.log
$PRELINK ${PRELINK_OPTS--vm} ./tls4 >> tls4.log 2>&1 || exit 1
Index: testsuite/quick2.sh
===================================================================
--- testsuite/quick2.sh (revision 196)
+++ testsuite/quick2.sh (working copy)
@@ -57,16 +57,16 @@
cp -dp $lib quick2.tree/lib
done
$CCLINK -o quick2.tree/usr/bin/bin1 $srcdir/reloc1.c \
- -Wl,--rpath-link,quick2.tree/usr/lib -L quick2.tree/usr/lib -l2
+ -Wl,--rpath-link,quick2.tree/usr/lib -L quick2.tree/usr/lib -l2 -l1
echo 'int main () { extern int foo; return foo; }' \
| $CCLINK -o quick2.tree/usr/bin/bin2 -xc - -xnone \
-L quick2.tree/usr/lib -l4
$CCLINK -o quick2.tree/usr/bin/bin3 $srcdir/reloc1.c \
- -Wl,--rpath-link,quick2.tree/usr/lib -L quick2.tree/usr/lib -l7
+ -Wl,--rpath-link,quick2.tree/usr/lib -L quick2.tree/usr/lib -l7 -l2 -l1
$CCLINK -o quick2.tree/usr/bin/bin4 $srcdir/quick1.c \
- -Wl,--rpath-link,quick2.tree/usr/lib -L quick2.tree/usr/lib -l2
+ -Wl,--rpath-link,quick2.tree/usr/lib -L quick2.tree/usr/lib -l2 -l1
$CCLINK -o quick2.tree/usr/bin/bin5 $srcdir/quick1.c \
- -Wl,--rpath-link,quick2.tree/usr/lib -L quick2.tree/usr/lib -l7
+ -Wl,--rpath-link,quick2.tree/usr/lib -L quick2.tree/usr/lib -l7 -l2 -l1
echo 'int main () { return 0; }' \
| $CCLINK -o quick2.tree/usr/bin/bin6 -xc - -xnone \
-Wl,--rpath-link,quick2.tree/usr/lib -L quick2.tree/usr/lib -l6
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-10-30 22:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-30 22:15 [PATCH]: Fix testsuite Meador Inge
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).