[lld] r229487 - Fix AArhc64 ELF test failure on Windows

Will Newton will.newton at linaro.org
Tue Feb 17 03:16:55 PST 2015


Author: wnewton
Date: Tue Feb 17 05:16:54 2015
New Revision: 229487

URL: http://llvm.org/viewvc/llvm-project?rev=229487&view=rev
Log:
Fix AArhc64 ELF test failure on Windows

The atoms may be processed in different orders on different systems
based on allocated addresses. This is a bit unfortunate as it would
be nice to have error messages emitted in order of file contents.
However we are emitting errors inside a parallel_for_each so even if
we stabilize the order of atom processing we would need to do some
further work in order to ensure that thread scheduling doesn't perturb
the order of errors. For now switch to using CHECK-DAG instead of CHECK.

Modified:
    lld/trunk/test/elf/AArch64/rel-abs32-overflow.test

Modified: lld/trunk/test/elf/AArch64/rel-abs32-overflow.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/AArch64/rel-abs32-overflow.test?rev=229487&r1=229486&r2=229487&view=diff
==============================================================================
--- lld/trunk/test/elf/AArch64/rel-abs32-overflow.test (original)
+++ lld/trunk/test/elf/AArch64/rel-abs32-overflow.test Tue Feb 17 05:16:54 2015
@@ -2,8 +2,8 @@
 # RUN: yaml2obj -format=elf %s > %t-obj
 # RUN: not lld -flavor gnu -target arm64 -o %t-exe %t-obj 2>&1 | FileCheck %s
 
-# CHECK: Relocation out of range in file {{.*}}: reference from data1+0 to data2+34359738369 of type 258 (R_AARCH64_ABS32)
-# CHECK: Relocation out of range in file {{.*}}: reference from data2+0 to data1+34359738369 of type 258 (R_AARCH64_ABS32)
+# CHECK-DAG: Relocation out of range in file {{.*}}: reference from data1+0 to data2+34359738369 of type 258 (R_AARCH64_ABS32)
+# CHECK-DAG: Relocation out of range in file {{.*}}: reference from data2+0 to data1+34359738369 of type 258 (R_AARCH64_ABS32)
 
 !ELF
 FileHeader: !FileHeader





More information about the llvm-commits mailing list