Skip to content

Commit 1a0cf24

Browse files
jplehrjplehr
authored
[Offload] Change x86_64-pc-linux to x86_64-unknown-linux (#107023)
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.
1 parent c80cabf commit 1a0cf24

Some content is hidden

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

45 files changed

+114
-119
lines changed

‎offload/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} powerpc64le-ibm-linux
192192
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} powerpc64le-ibm-linux-gnu-LTO")
193193
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} powerpc64-ibm-linux-gnu")
194194
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} powerpc64-ibm-linux-gnu-LTO")
195-
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} x86_64-pc-linux-gnu")
196-
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} x86_64-pc-linux-gnu-LTO")
195+
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} x86_64-unknown-linux-gnu")
196+
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} x86_64-unknown-linux-gnu-LTO")
197197
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} nvptx64-nvidia-cuda")
198198
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} nvptx64-nvidia-cuda-LTO")
199199
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} nvptx64-nvidia-cuda-JIT-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
@@ -188,8 +188,8 @@ def add_libraries(source):
188188
host_targets = [
189189
"aarch64-unknown-linux-gnu",
190190
"aarch64-unknown-linux-gnu-LTO",
191-
"x86_64-pc-linux-gnu",
192-
"x86_64-pc-linux-gnu-LTO",
191+
"x86_64-unknown-linux-gnu",
192+
"x86_64-unknown-linux-gnu-LTO",
193193
"s390x-ibm-linux-gnu",
194194
"s390x-ibm-linux-gnu-LTO",
195195
]

‎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>

‎offload/test/mapping/map_both_pointer_pointee.c

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
// REQUIRES: unified_shared_memory

0 commit comments

Comments
 (0)