Revert "[libomptarget] Build plugins-nextgen for SystemZ (#83978)"
This reverts commit 3ecd38c8e1d34b1e4639a1de9f0cb56c7957cbd2.
GitOrigin-RevId: 70677c81debbeacfc2a2fe968e632522ea1b53e1
diff --git a/libomptarget/CMakeLists.txt b/libomptarget/CMakeLists.txt
index b382137..a74eff0 100644
--- a/libomptarget/CMakeLists.txt
+++ b/libomptarget/CMakeLists.txt
@@ -56,8 +56,6 @@
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} nvptx64-nvidia-cuda")
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} nvptx64-nvidia-cuda-LTO")
set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} nvptx64-nvidia-cuda-JIT-LTO")
-set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} s390x-ibm-linux-gnu")
-set (LIBOMPTARGET_ALL_TARGETS "${LIBOMPTARGET_ALL_TARGETS} s390x-ibm-linux-gnu-LTO")
# Once the plugins for the different targets are validated, they will be added to
# the list of supported targets in the current system.
diff --git a/libomptarget/plugins-nextgen/CMakeLists.txt b/libomptarget/plugins-nextgen/CMakeLists.txt
index b6fc136..3ca0236 100644
--- a/libomptarget/plugins-nextgen/CMakeLists.txt
+++ b/libomptarget/plugins-nextgen/CMakeLists.txt
@@ -12,15 +12,12 @@
add_subdirectory(common)
-# void build_generic_elf64(string tmachine, string tmachine_name, string tmachine_libname,
-# string tmachine_llvm, string tmachine_triple, string elf_machine_id);
+# void build_generic_elf64(string tmachine, string tmachine_name, string tmachine_libname, string elf_machine_id);
# - build a plugin for an ELF based generic 64-bit target based on libffi.
# - tmachine: name of the machine processor as used in the cmake build system.
# - tmachine_name: name of the machine to be printed with the debug messages.
# - tmachine_libname: machine name to be appended to the plugin library name.
-# - tmachine_llvm: LLVM triple for the processor
-# - tmachine_triple: GNU target triple
-macro(build_generic_elf64 tmachine tmachine_name tmachine_libname tmachine_llvm tmachine_triple elf_machine_id)
+macro(build_generic_elf64 tmachine tmachine_name tmachine_libname tmachine_triple elf_machine_id)
if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tmachine}$")
# Define macro to be used as prefix of the runtime messages for this target.
add_definitions("-DTARGET_NAME=${tmachine_name}")
@@ -33,7 +30,7 @@
add_definitions("-DTARGET_ELF_ID=${elf_machine_id}")
# Define target triple
- add_definitions("-DLIBOMPTARGET_NEXTGEN_GENERIC_PLUGIN_TRIPLE=${tmachine_llvm}")
+ add_definitions("-DLIBOMPTARGET_NEXTGEN_GENERIC_PLUGIN_TRIPLE=${tmachine}")
add_llvm_library("omptarget.rtl.${tmachine_libname}"
SHARED
diff --git a/libomptarget/plugins-nextgen/aarch64/CMakeLists.txt b/libomptarget/plugins-nextgen/aarch64/CMakeLists.txt
index 663ab4d..2c2b753 100644
--- a/libomptarget/plugins-nextgen/aarch64/CMakeLists.txt
+++ b/libomptarget/plugins-nextgen/aarch64/CMakeLists.txt
@@ -11,7 +11,7 @@
##===----------------------------------------------------------------------===##
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
- build_generic_elf64("aarch64" "aarch64" "aarch64" "aarch64" "aarch64-unknown-linux-gnu" "183")
+ build_generic_elf64("aarch64" "aarch64" "aarch64" "aarch64-unknown-linux-gnu" "183")
else()
libomptarget_say("Not building aarch64 NextGen offloading plugin: machine not found in the system.")
endif()
diff --git a/libomptarget/plugins-nextgen/ppc64/CMakeLists.txt b/libomptarget/plugins-nextgen/ppc64/CMakeLists.txt
index 77466c1..0cccc9c 100644
--- a/libomptarget/plugins-nextgen/ppc64/CMakeLists.txt
+++ b/libomptarget/plugins-nextgen/ppc64/CMakeLists.txt
@@ -11,7 +11,7 @@
##===----------------------------------------------------------------------===##
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
- build_generic_elf64("ppc64" "PPC64" "ppc64" "ppc64" "powerpc64-ibm-linux-gnu" "21")
+ build_generic_elf64("ppc64" "PPC64" "ppc64" "powerpc64-ibm-linux-gnu" "21")
else()
libomptarget_say("Not building ppc64 NextGen offloading plugin: machine not found in the system.")
endif()
diff --git a/libomptarget/plugins-nextgen/ppc64le/CMakeLists.txt b/libomptarget/plugins-nextgen/ppc64le/CMakeLists.txt
index 91d2162..9461d79 100644
--- a/libomptarget/plugins-nextgen/ppc64le/CMakeLists.txt
+++ b/libomptarget/plugins-nextgen/ppc64le/CMakeLists.txt
@@ -11,7 +11,7 @@
##===----------------------------------------------------------------------===##
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
- build_generic_elf64("ppc64le" "PPC64le" "ppc64" "ppc64le" "powerpc64le-ibm-linux-gnu" "21")
+ build_generic_elf64("ppc64le" "PPC64le" "ppc64" "powerpc64le-ibm-linux-gnu" "21")
else()
libomptarget_say("Not building ppc64le NextGen offloading plugin: machine not found in the system.")
endif()
diff --git a/libomptarget/plugins-nextgen/s390x/CMakeLists.txt b/libomptarget/plugins-nextgen/s390x/CMakeLists.txt
index 0388a23..1b12a29 100644
--- a/libomptarget/plugins-nextgen/s390x/CMakeLists.txt
+++ b/libomptarget/plugins-nextgen/s390x/CMakeLists.txt
@@ -11,7 +11,7 @@
##===----------------------------------------------------------------------===##
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
- build_generic_elf64("s390x" "S390X" "s390x" "systemz" "s390x-ibm-linux-gnu" "22")
+ build_generic_elf64("SystemZ" "S390X" "s390x" "s390x-ibm-linux-gnu" "22")
else()
libomptarget_say("Not building s390x NextGen offloading plugin: machine not found in the system.")
endif()
diff --git a/libomptarget/plugins-nextgen/x86_64/CMakeLists.txt b/libomptarget/plugins-nextgen/x86_64/CMakeLists.txt
index 27cf3e0..129d526 100644
--- a/libomptarget/plugins-nextgen/x86_64/CMakeLists.txt
+++ b/libomptarget/plugins-nextgen/x86_64/CMakeLists.txt
@@ -11,7 +11,7 @@
##===----------------------------------------------------------------------===##
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
- build_generic_elf64("x86_64" "x86_64" "x86_64" "x86_64" "x86_64-pc-linux-gnu" "62")
+ build_generic_elf64("x86_64" "x86_64" "x86_64" "x86_64-pc-linux-gnu" "62")
else()
libomptarget_say("Not building x86_64 NextGen offloading plugin: machine not found in the system.")
endif()
diff --git a/libomptarget/src/CMakeLists.txt b/libomptarget/src/CMakeLists.txt
index d0971bd..9bc3f33 100644
--- a/libomptarget/src/CMakeLists.txt
+++ b/libomptarget/src/CMakeLists.txt
@@ -73,7 +73,6 @@
check_plugin_target(cuda)
check_plugin_target(aarch64)
check_plugin_target(amdgpu)
- check_plugin_target(s390x)
endif()
list(TRANSFORM LIBOMPTARGET_PLUGINS_TO_LOAD PREPEND "\"libomptarget.rtl.")
diff --git a/libomptarget/test/api/omp_dynamic_shared_memory.c b/libomptarget/test/api/omp_dynamic_shared_memory.c
index 3fe75f2..5095a69 100644
--- a/libomptarget/test/api/omp_dynamic_shared_memory.c
+++ b/libomptarget/test/api/omp_dynamic_shared_memory.c
@@ -10,8 +10,6 @@
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
// UNSUPPORTED: aarch64-unknown-linux-gnu
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
#include <omp.h>
#include <stdio.h>
diff --git a/libomptarget/test/jit/empty_kernel_lvl1.c b/libomptarget/test/jit/empty_kernel_lvl1.c
index a0b8cd4..c908c8b 100644
--- a/libomptarget/test/jit/empty_kernel_lvl1.c
+++ b/libomptarget/test/jit/empty_kernel_lvl1.c
@@ -32,7 +32,5 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
#include "empty_kernel.inc"
diff --git a/libomptarget/test/jit/empty_kernel_lvl2.c b/libomptarget/test/jit/empty_kernel_lvl2.c
index 81a04f5..0b88d33 100644
--- a/libomptarget/test/jit/empty_kernel_lvl2.c
+++ b/libomptarget/test/jit/empty_kernel_lvl2.c
@@ -92,7 +92,5 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
#include "empty_kernel.inc"
diff --git a/libomptarget/test/jit/type_punning.c b/libomptarget/test/jit/type_punning.c
index 10e3d2c..23aa69b 100644
--- a/libomptarget/test/jit/type_punning.c
+++ b/libomptarget/test/jit/type_punning.c
@@ -12,8 +12,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
// Ensure that there is only the kernel function left, not any outlined
// parallel regions.
diff --git a/libomptarget/test/mapping/auto_zero_copy.cpp b/libomptarget/test/mapping/auto_zero_copy.cpp
index 4664120..6f9d8c2 100644
--- a/libomptarget/test/mapping/auto_zero_copy.cpp
+++ b/libomptarget/test/mapping/auto_zero_copy.cpp
@@ -13,8 +13,6 @@
// UNSUPPORTED: nvptx64-nvidia-cuda-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
// REQUIRES: unified_shared_memory
diff --git a/libomptarget/test/mapping/auto_zero_copy_globals.cpp b/libomptarget/test/mapping/auto_zero_copy_globals.cpp
index 55dfb28..4a13d27 100644
--- a/libomptarget/test/mapping/auto_zero_copy_globals.cpp
+++ b/libomptarget/test/mapping/auto_zero_copy_globals.cpp
@@ -9,8 +9,6 @@
// UNSUPPORTED: nvptx64-nvidia-cuda-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
// REQUIRES: unified_shared_memory
diff --git a/libomptarget/test/offloading/barrier_fence.c b/libomptarget/test/offloading/barrier_fence.c
index b9a8ca2..5d10964 100644
--- a/libomptarget/test/offloading/barrier_fence.c
+++ b/libomptarget/test/offloading/barrier_fence.c
@@ -7,8 +7,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
#include <omp.h>
#include <stdio.h>
diff --git a/libomptarget/test/offloading/bug49334.cpp b/libomptarget/test/offloading/bug49334.cpp
index 1f19dab..a22d3fe 100644
--- a/libomptarget/test/offloading/bug49334.cpp
+++ b/libomptarget/test/offloading/bug49334.cpp
@@ -9,8 +9,6 @@
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
// UNSUPPORTED: aarch64-unknown-linux-gnu
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
// UNSUPPORTED: amdgcn-amd-amdhsa
// UNSUPPORTED: nvptx64-nvidia-cuda
// UNSUPPORTED: nvptx64-nvidia-cuda-LTO
diff --git a/libomptarget/test/offloading/default_thread_limit.c b/libomptarget/test/offloading/default_thread_limit.c
index 4da02bb..d32e7df 100644
--- a/libomptarget/test/offloading/default_thread_limit.c
+++ b/libomptarget/test/offloading/default_thread_limit.c
@@ -9,8 +9,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
__attribute__((optnone)) int optnone() { return 1; }
diff --git a/libomptarget/test/offloading/ompx_bare.c b/libomptarget/test/offloading/ompx_bare.c
index 3dabdcd..fb3810b 100644
--- a/libomptarget/test/offloading/ompx_bare.c
+++ b/libomptarget/test/offloading/ompx_bare.c
@@ -1,13 +1,10 @@
// RUN: %libomptarget-compile-generic
-// RUN: env LIBOMPTARGET_INFO=63 %libomptarget-run-generic 2>&1 | \
-// RUN: %fcheck-generic
+// RUN: env LIBOMPTARGET_INFO=63 %libomptarget-run-generic 2>&1 | %fcheck-generic
//
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
// UNSUPPORTED: aarch64-unknown-linux-gnu
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
#include <assert.h>
#include <ompx.h>
diff --git a/libomptarget/test/offloading/ompx_coords.c b/libomptarget/test/offloading/ompx_coords.c
index 5e4e14b..61dad61 100644
--- a/libomptarget/test/offloading/ompx_coords.c
+++ b/libomptarget/test/offloading/ompx_coords.c
@@ -4,8 +4,6 @@
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
// UNSUPPORTED: aarch64-unknown-linux-gnu
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
#include <omp.h>
#include <ompx.h>
diff --git a/libomptarget/test/offloading/ompx_saxpy_mixed.c b/libomptarget/test/offloading/ompx_saxpy_mixed.c
index f479be8..440b694 100644
--- a/libomptarget/test/offloading/ompx_saxpy_mixed.c
+++ b/libomptarget/test/offloading/ompx_saxpy_mixed.c
@@ -4,8 +4,6 @@
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
// UNSUPPORTED: aarch64-unknown-linux-gnu
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
#include <math.h>
#include <omp.h>
diff --git a/libomptarget/test/offloading/parallel_target_teams_reduction.cpp b/libomptarget/test/offloading/parallel_target_teams_reduction.cpp
index 10e1b33..5303a94 100644
--- a/libomptarget/test/offloading/parallel_target_teams_reduction.cpp
+++ b/libomptarget/test/offloading/parallel_target_teams_reduction.cpp
@@ -6,8 +6,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
#include <iostream>
#include <vector>
diff --git a/libomptarget/test/offloading/small_trip_count.c b/libomptarget/test/offloading/small_trip_count.c
index 65f094f..d8bef66 100644
--- a/libomptarget/test/offloading/small_trip_count.c
+++ b/libomptarget/test/offloading/small_trip_count.c
@@ -9,8 +9,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
#define N 128
diff --git a/libomptarget/test/offloading/small_trip_count_thread_limit.cpp b/libomptarget/test/offloading/small_trip_count_thread_limit.cpp
index b7ae52a..9796c2d 100644
--- a/libomptarget/test/offloading/small_trip_count_thread_limit.cpp
+++ b/libomptarget/test/offloading/small_trip_count_thread_limit.cpp
@@ -7,8 +7,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
int main(int argc, char *argv[]) {
constexpr const int block_size = 256;
diff --git a/libomptarget/test/offloading/spmdization.c b/libomptarget/test/offloading/spmdization.c
index 77913be..2cf30ff 100644
--- a/libomptarget/test/offloading/spmdization.c
+++ b/libomptarget/test/offloading/spmdization.c
@@ -11,8 +11,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
#include <omp.h>
#include <stdio.h>
diff --git a/libomptarget/test/offloading/target_critical_region.cpp b/libomptarget/test/offloading/target_critical_region.cpp
index 495632b..9a741be 100644
--- a/libomptarget/test/offloading/target_critical_region.cpp
+++ b/libomptarget/test/offloading/target_critical_region.cpp
@@ -6,8 +6,6 @@
// UNSUPPORTED: nvptx64-nvidia-cuda-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
// UNSUPPORTED: amdgcn-amd-amdhsa
#include <omp.h>
diff --git a/libomptarget/test/offloading/thread_limit.c b/libomptarget/test/offloading/thread_limit.c
index a8cc51b..65275a8 100644
--- a/libomptarget/test/offloading/thread_limit.c
+++ b/libomptarget/test/offloading/thread_limit.c
@@ -9,8 +9,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
int main() {
int n = 1 << 20;
diff --git a/libomptarget/test/ompt/target_memcpy.c b/libomptarget/test/ompt/target_memcpy.c
index 3224c5a..80a8d6a 100644
--- a/libomptarget/test/ompt/target_memcpy.c
+++ b/libomptarget/test/ompt/target_memcpy.c
@@ -4,8 +4,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
/*
* Verify that for the target OpenMP APIs, the return address is non-null and
diff --git a/libomptarget/test/ompt/target_memcpy_emi.c b/libomptarget/test/ompt/target_memcpy_emi.c
index fd7da13..5347f38 100644
--- a/libomptarget/test/ompt/target_memcpy_emi.c
+++ b/libomptarget/test/ompt/target_memcpy_emi.c
@@ -4,8 +4,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
/*
* Verify all three data transfer directions: H2D, D2D and D2H
diff --git a/libomptarget/test/ompt/veccopy.c b/libomptarget/test/ompt/veccopy.c
index bc70f5a..80e71fd 100644
--- a/libomptarget/test/ompt/veccopy.c
+++ b/libomptarget/test/ompt/veccopy.c
@@ -4,8 +4,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
/*
* Example OpenMP program that registers non-EMI callbacks
diff --git a/libomptarget/test/ompt/veccopy_data.c b/libomptarget/test/ompt/veccopy_data.c
index 264b484..cef1de3 100644
--- a/libomptarget/test/ompt/veccopy_data.c
+++ b/libomptarget/test/ompt/veccopy_data.c
@@ -4,8 +4,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
/*
* Example OpenMP program that registers EMI callbacks.
diff --git a/libomptarget/test/ompt/veccopy_disallow_both.c b/libomptarget/test/ompt/veccopy_disallow_both.c
index a011c21..06293e4 100644
--- a/libomptarget/test/ompt/veccopy_disallow_both.c
+++ b/libomptarget/test/ompt/veccopy_disallow_both.c
@@ -4,8 +4,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
/*
* Example OpenMP program that shows that both EMI and non-EMI
diff --git a/libomptarget/test/ompt/veccopy_emi.c b/libomptarget/test/ompt/veccopy_emi.c
index 8718a39..b597d7b 100644
--- a/libomptarget/test/ompt/veccopy_emi.c
+++ b/libomptarget/test/ompt/veccopy_emi.c
@@ -4,8 +4,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
/*
* Example OpenMP program that registers EMI callbacks
diff --git a/libomptarget/test/ompt/veccopy_emi_map.c b/libomptarget/test/ompt/veccopy_emi_map.c
index 2accba3..ce6f6e3 100644
--- a/libomptarget/test/ompt/veccopy_emi_map.c
+++ b/libomptarget/test/ompt/veccopy_emi_map.c
@@ -4,8 +4,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
/*
* Example OpenMP program that shows that map-EMI callbacks are not supported.
diff --git a/libomptarget/test/ompt/veccopy_map.c b/libomptarget/test/ompt/veccopy_map.c
index 56a0dd4..83f63a6 100644
--- a/libomptarget/test/ompt/veccopy_map.c
+++ b/libomptarget/test/ompt/veccopy_map.c
@@ -4,8 +4,6 @@
// UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
-// UNSUPPORTED: s390x-ibm-linux-gnu
-// UNSUPPORTED: s390x-ibm-linux-gnu-LTO
/*
* Example OpenMP program that shows that map callbacks are not supported.
