[llvm-branch-commits] [lld] r341367 - Merging r339253:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Sep  4 07:17:36 2018
New Revision: 341367

URL: http://llvm.org/viewvc/llvm-project?rev=341367&view=rev
Log:
Merging r339253:
------------------------------------------------------------------------
r339253 | psmith | 2018-08-08 16:50:33 +0200 (Wed, 08 Aug 2018) | 7 lines

Add missing REQUIRES x86 to tests.

Add REQUIRES to tests that fail when an x86 backend is not present.

Differential Revision: https://reviews.llvm.org/D50440


------------------------------------------------------------------------

Modified:
    lld/branches/release_70/   (props changed)
    lld/branches/release_70/test/COFF/guardcf-align.s
    lld/branches/release_70/test/ELF/icf13.s
    lld/branches/release_70/test/ELF/icf15.s
    lld/branches/release_70/test/ELF/icf16.s
    lld/branches/release_70/test/ELF/icf17.s
    lld/branches/release_70/test/ELF/lto/libcall-archive.ll

Propchange: lld/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep  4 07:17:36 2018
@@ -1 +1 @@
-/lld/trunk:338679,338684,338697,338699,338877,338911,339049,339058,339075,339165,339904
+/lld/trunk:338679,338684,338697,338699,338877,338911,339049,339058,339075,339165,339253,339904

Modified: lld/branches/release_70/test/COFF/guardcf-align.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_70/test/COFF/guardcf-align.s?rev=341367&r1=341366&r2=341367&view=diff
==============================================================================
--- lld/branches/release_70/test/COFF/guardcf-align.s (original)
+++ lld/branches/release_70/test/COFF/guardcf-align.s Tue Sep  4 07:17:36 2018
@@ -1,3 +1,4 @@
+# REQUIRES: x86
 # RUN: llvm-mc -triple x86_64-windows-msvc -filetype=obj -o %t.obj %s
 # RUN: yaml2obj < %p/Inputs/guardcf-align-foobar.yaml \
 # RUN:     > %T/guardcf-align-foobar.obj

Modified: lld/branches/release_70/test/ELF/icf13.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_70/test/ELF/icf13.s?rev=341367&r1=341366&r2=341367&view=diff
==============================================================================
--- lld/branches/release_70/test/ELF/icf13.s (original)
+++ lld/branches/release_70/test/ELF/icf13.s Tue Sep  4 07:17:36 2018
@@ -1,3 +1,4 @@
+# REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 # RUN: ld.lld -shared -z notext %t1 -o /dev/null --icf=all --print-icf-sections 2>&1 | FileCheck -allow-empty %s
 

Modified: lld/branches/release_70/test/ELF/icf15.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_70/test/ELF/icf15.s?rev=341367&r1=341366&r2=341367&view=diff
==============================================================================
--- lld/branches/release_70/test/ELF/icf15.s (original)
+++ lld/branches/release_70/test/ELF/icf15.s Tue Sep  4 07:17:36 2018
@@ -1,3 +1,4 @@
+# REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 # RUN: ld.lld %t1 -o /dev/null --icf=all --print-icf-sections 2>&1 | FileCheck -allow-empty %s
 

Modified: lld/branches/release_70/test/ELF/icf16.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_70/test/ELF/icf16.s?rev=341367&r1=341366&r2=341367&view=diff
==============================================================================
--- lld/branches/release_70/test/ELF/icf16.s (original)
+++ lld/branches/release_70/test/ELF/icf16.s Tue Sep  4 07:17:36 2018
@@ -1,3 +1,4 @@
+# REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 # RUN: ld.lld -shared -z notext %t1 -o /dev/null --icf=all --print-icf-sections 2>&1 | FileCheck -allow-empty %s
 

Modified: lld/branches/release_70/test/ELF/icf17.s
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_70/test/ELF/icf17.s?rev=341367&r1=341366&r2=341367&view=diff
==============================================================================
--- lld/branches/release_70/test/ELF/icf17.s (original)
+++ lld/branches/release_70/test/ELF/icf17.s Tue Sep  4 07:17:36 2018
@@ -1,3 +1,4 @@
+# REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 # RUN: ld.lld %t1 -o /dev/null --icf=all --print-icf-sections 2>&1 | FileCheck -allow-empty %s
 

Modified: lld/branches/release_70/test/ELF/lto/libcall-archive.ll
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_70/test/ELF/lto/libcall-archive.ll?rev=341367&r1=341366&r2=341367&view=diff
==============================================================================
--- lld/branches/release_70/test/ELF/lto/libcall-archive.ll (original)
+++ lld/branches/release_70/test/ELF/lto/libcall-archive.ll Tue Sep  4 07:17:36 2018
@@ -1,3 +1,4 @@
+; REQUIRES: x86
 ; RUN: rm -f %t.a
 ; RUN: llvm-as -o %t.o %s
 ; RUN: llvm-as -o %t2.o %S/Inputs/libcall-archive.ll