[lld] r257027 - [ELF] Fix amdgpu tests

[Tom Stellard via llvm-commits]

Author: tstellar
Date: Wed Jan  6 22:22:24 2016
New Revision: 257027

URL: http://llvm.org/viewvc/llvm-project?rev=257027&view=rev
Log:
[ELF] Fix amdgpu tests

The triples in these tests were completely wrong, but the tests were
still passing for me locally.

Modified:
    lld/trunk/test/ELF/amdgpu-entry.s
    lld/trunk/test/ELF/amdgpu-globals.s
    lld/trunk/test/ELF/amdgpu-kernels.s

Modified: lld/trunk/test/ELF/amdgpu-entry.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/amdgpu-entry.s?rev=257027&r1=257026&r2=257027&view=diff
==============================================================================
--- lld/trunk/test/ELF/amdgpu-entry.s (original)
+++ lld/trunk/test/ELF/amdgpu-entry.s Wed Jan  6 22:22:24 2016
@@ -1,6 +1,8 @@
-# RUN: llvm-mc -filetype=obj -triple=amdgcpu--amdgcn -mcpu=kaveri %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri %s -o %t.o
 # RUN: not lld -e kernel0 -flavor gnu %t.o -o %t
 
+# Requires: amdgpu
+
 .hsa_code_object_version 1,0
 .hsa_code_object_isa 7,0,0,"AMD","AMDGPU"
 

Modified: lld/trunk/test/ELF/amdgpu-globals.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/amdgpu-globals.s?rev=257027&r1=257026&r2=257027&view=diff
==============================================================================
--- lld/trunk/test/ELF/amdgpu-globals.s (original)
+++ lld/trunk/test/ELF/amdgpu-globals.s Wed Jan  6 22:22:24 2016
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -filetype=obj -triple=amdgcpu--amdgcn -mcpu=kaveri %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri %s -o %t.o
 # RUN: lld -flavor gnu %t.o -o %t
 # RUN: llvm-readobj -sections -symbols -program-headers %t | FileCheck %s
 

Modified: lld/trunk/test/ELF/amdgpu-kernels.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/amdgpu-kernels.s?rev=257027&r1=257026&r2=257027&view=diff
==============================================================================
--- lld/trunk/test/ELF/amdgpu-kernels.s (original)
+++ lld/trunk/test/ELF/amdgpu-kernels.s Wed Jan  6 22:22:24 2016
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -filetype=obj -triple=amdgcpu--amdgcn -mcpu=kaveri %s -o %t.o
+# RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri %s -o %t.o
 # RUN: lld -flavor gnu %t.o -o %t
 # RUN: llvm-readobj -sections -symbols -program-headers %t | FileCheck %s