Skip to content

Commit 9e9f6ad

Browse files
jplehrronlieb
authored andcommitted
[Offload] Change x86_64-pc-linux to x86_64-unknown-linux
It appears that the RUNTIMES build prefers the x86-64-unknown-linux-gnu triple notation for the host. This fixes runtime / test breakages when compiler-rt is used as the CLANG_DEFAULT_RTLIB. Change-Id: I7919cabf876b294a6343ac8fa0022d0d919e9b35
1 parent c33900e commit 9e9f6ad

File tree

57 files changed

+121
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+121
-124
lines changed

offload/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} powerpc64le-ibm-linux
195195
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} powerpc64-ibm-linux-gnu")
196196
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} powerpc64-ibm-linux-gnu-oldDriver")
197197
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} powerpc64-ibm-linux-gnu-LTO")
198-
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} x86_64-pc-linux-gnu")
199-
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} x86_64-pc-linux-gnu-oldDriver")
200-
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} x86_64-pc-linux-gnu-LTO")
198+
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} x86_64-unknown-linux-gnu")
199+
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} x86_64-unknown-linux-gnu-oldDriver")
200+
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} x86_64-unknown-linux-gnu-LTO")
201201
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} nvptx64-nvidia-cuda")
202202
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} nvptx64-nvidia-cuda-oldDriver")
203203
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} nvptx64-nvidia-cuda-LTO")

offload/plugins-nextgen/host/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64$")
4949
set(LIBOMPTARGET_SYSTEM_TARGETS "${LIBOMPTARGET_SYSTEM_TARGETS}" PARENT_SCOPE)
5050
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64$")
5151
list(APPEND LIBOMPTARGET_SYSTEM_TARGETS
52-
"x86_64-pc-linux-gnu" "x86_64-pc-linux-gnu-LTO")
52+
"x86_64-unknown-linux-gnu" "x86_64-unknown-linux-gnu-LTO")
5353
set(LIBOMPTARGET_SYSTEM_TARGETS "${LIBOMPTARGET_SYSTEM_TARGETS}" PARENT_SCOPE)
5454
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64$")
5555
list(APPEND LIBOMPTARGET_SYSTEM_TARGETS

offload/test/api/is_initial_device.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// RUN: %libomptarget-compile-run-and-check-x86_64-pc-linux-gnu
2-
// RUN: %libomptarget-compile-x86_64-pc-linux-gnu -DUNUSED -Wall -Werror
1+
// RUN: %libomptarget-compile-run-and-check-x86_64-unknown-linux-gnu
2+
// RUN: %libomptarget-compile-x86_64-unknown-linux-gnu -DUNUSED -Wall -Werror
33

44
// only run for x86_64 host offloading:
5-
// REQUIRES: x86_64-pc-linux-gnu
5+
// REQUIRES: x86_64-unknown-linux-gnu
66

77
#include <omp.h>
88
#include <stdio.h>

offload/test/lit.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ def get_arch_from_target(libomptarget_target):
228228
host_targets = [
229229
"aarch64-unknown-linux-gnu",
230230
"aarch64-unknown-linux-gnu-LTO",
231-
"x86_64-pc-linux-gnu",
232-
"x86_64-pc-linux-gnu-LTO",
231+
"x86_64-unknown-linux-gnu",
232+
"x86_64-unknown-linux-gnu-LTO",
233233
"s390x-ibm-linux-gnu",
234234
"s390x-ibm-linux-gnu-LTO",
235235
]

offload/test/mapping/coarse_grain.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
1212
// UNSUPPORTED: nvptx64-nvidia-cuda
1313
// UNSUPPORTED: nvptx64-nvidia-cuda-LTO
14-
// UNSUPPORTED: x86_64-pc-linux-gnu
15-
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
14+
// UNSUPPORTED: x86_64-unknown-linux-gnu
15+
// UNSUPPORTED: x86_64-unknown-linux-gnu-LTO
1616

1717
// REQUIRES: unified_shared_memory
1818
// REQUIRES: mi200

offload/test/mapping/declare_mapper_nested_default_mappers_array.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %libomptarget-compilexx-run-and-check-aarch64-unknown-linux-gnu
22
// RUN: %libomptarget-compilexx-run-and-check-powerpc64-ibm-linux-gnu
33
// RUN: %libomptarget-compilexx-run-and-check-powerpc64le-ibm-linux-gnu
4-
// RUN: %libomptarget-compilexx-run-and-check-x86_64-pc-linux-gnu
4+
// RUN: %libomptarget-compilexx-run-and-check-x86_64-unknown-linux-gnu
55
// RUN: %libomptarget-compilexx-run-and-check-nvptx64-nvidia-cuda
66

77
// UNSUPPORTED: clang

offload/test/mapping/declare_mapper_nested_default_mappers_array_subscript.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %libomptarget-compilexx-run-and-check-aarch64-unknown-linux-gnu
22
// RUN: %libomptarget-compilexx-run-and-check-powerpc64-ibm-linux-gnu
33
// RUN: %libomptarget-compilexx-run-and-check-powerpc64le-ibm-linux-gnu
4-
// RUN: %libomptarget-compilexx-run-and-check-x86_64-pc-linux-gnu
4+
// RUN: %libomptarget-compilexx-run-and-check-x86_64-unknown-linux-gnu
55
// RUN: %libomptarget-compilexx-run-and-check-nvptx64-nvidia-cuda
66

77
#include <cstdio>

offload/test/mapping/declare_mapper_nested_default_mappers_complex_structure.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %libomptarget-compilexx-run-and-check-aarch64-unknown-linux-gnu
22
// RUN: %libomptarget-compilexx-run-and-check-powerpc64-ibm-linux-gnu
33
// RUN: %libomptarget-compilexx-run-and-check-powerpc64le-ibm-linux-gnu
4-
// RUN: %libomptarget-compilexx-run-and-check-x86_64-pc-linux-gnu
4+
// RUN: %libomptarget-compilexx-run-and-check-x86_64-unknown-linux-gnu
55
// RUN: %libomptarget-compilexx-run-and-check-nvptx64-nvidia-cuda
66

77
#include <assert.h>

offload/test/mapping/declare_mapper_nested_default_mappers_ptr_subscript.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %libomptarget-compilexx-run-and-check-aarch64-unknown-linux-gnu
22
// RUN: %libomptarget-compilexx-run-and-check-powerpc64-ibm-linux-gnu
33
// RUN: %libomptarget-compilexx-run-and-check-powerpc64le-ibm-linux-gnu
4-
// RUN: %libomptarget-compilexx-run-and-check-x86_64-pc-linux-gnu
4+
// RUN: %libomptarget-compilexx-run-and-check-x86_64-unknown-linux-gnu
55
// RUN: %libomptarget-compilexx-run-and-check-nvptx64-nvidia-cuda
66

77
#include <cstdio>

offload/test/mapping/declare_mapper_nested_default_mappers_var.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %libomptarget-compilexx-run-and-check-aarch64-unknown-linux-gnu
22
// RUN: %libomptarget-compilexx-run-and-check-powerpc64-ibm-linux-gnu
33
// RUN: %libomptarget-compilexx-run-and-check-powerpc64le-ibm-linux-gnu
4-
// RUN: %libomptarget-compilexx-run-and-check-x86_64-pc-linux-gnu
4+
// RUN: %libomptarget-compilexx-run-and-check-x86_64-unknown-linux-gnu
55
// RUN: %libomptarget-compilexx-run-and-check-nvptx64-nvidia-cuda
66

77
#include <cstdio>

0 commit comments

Comments
 (0)