[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[committed] Fix pr24170.sh on x32



Hi,

For pr24170.sh on x32 we have:
...
dwz: 1: DWARF pointer size differs between CUs
dwz: 2: DWARF pointer size differs between CUs
dwz: Too few files for multifile optimization
FAIL: /<<PKGBUILDDIR>>/build/../src/testsuite/dwz.tests/pr24170.sh
...

The test-case uses the exec implptr-64bit-d2o4a8r8t0, which is build using:
- a .S file containing DWARF with pointer size 64.
- a main.c, which compiled for x32 will contain DWARF with pointer size 32
This explains the dwz failure.

Fix this by requiring a single pointer size in the exec.

Committed to trunk.

Thanks,
- Tom

Fix pr24170.sh on x32

2019-07-02  Tom de Vries  <tdevries@suse.de>

	* testsuite/dwz.tests/pr24170.sh: Require single pointer size in exec.

---
 testsuite/dwz.tests/pr24170.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/testsuite/dwz.tests/pr24170.sh b/testsuite/dwz.tests/pr24170.sh
index 20fe339..ec57a71 100644
--- a/testsuite/dwz.tests/pr24170.sh
+++ b/testsuite/dwz.tests/pr24170.sh
@@ -2,6 +2,15 @@
 
 exec=$execs/implptr-64bit-d2o4a8r8t0
 
+pointer_sizes=$(readelf -wi $exec \
+		    | grep "Pointer Size:" \
+		    | sort -u \
+		    | wc -l)
+
+if [ $pointer_sizes -ne 1 ]; then
+    exit 77
+fi
+
 cp $exec 1
 cp 1 2