[llvm] Reapply [Offload][lit] Link against SPIR-V DeviceRTL if present (PR #180231)

[Nick Sarnie via llvm-commits]

https://github.com/sarnex created https://github.com/llvm/llvm-project/pull/180231

…030)

This reverts commit 6844af142e5c8309055bcf107b57161f5c7801fe.

>From 3f476a4c66c6f6f9c1c000ed7f46f9d54c2b1fc2 Mon Sep 17 00:00:00 2001
From: Nick Sarnie <nick.sarnie at intel.com>
Date: Fri, 6 Feb 2026 16:48:36 +0000
Subject: [PATCH] Reapply [Offload][lit] Link against SPIR-V DeviceRTL if
 present (#180030)

This reverts commit 6844af142e5c8309055bcf107b57161f5c7801fe.
---
 offload/test/lit.cfg                          | 5 +++--
 offload/test/mapping/firstprivate_aligned.cpp | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/offload/test/lit.cfg b/offload/test/lit.cfg
index 0d5a9c95c1d95..898258f3e3cd0 100644
--- a/offload/test/lit.cfg
+++ b/offload/test/lit.cfg
@@ -166,7 +166,8 @@ elif config.operating_system == 'Darwin':
     config.test_flags += " -Wl,-rpath," + config.library_dir
     config.test_flags += " -Wl,-rpath," + config.omp_host_rtl_directory
 else: # Unices
-    if config.libomptarget_current_target != "nvptx64-nvidia-cuda":
+    if config.libomptarget_current_target != "nvptx64-nvidia-cuda" and \
+       not config.libomptarget_current_target.startswith('spirv'):
         config.test_flags += " -nogpulib"
     config.test_flags += " -Wl,-rpath," + config.library_dir
     config.test_flags += " -Wl,-rpath," + config.omp_host_rtl_directory
@@ -214,7 +215,7 @@ def add_libraries(source):
     if "gpu" not in config.available_features:
         return source
     if "intelgpu" in config.available_features:
-        # There is no DeviceRTL for Intel yet and libc doesn't work.
+        # SPIR-V uses an out-of-tree linker and libc doesn't work.
         return source
     if config.libomptarget_has_libc:
         return source + " -Xoffload-linker -lc " + \
diff --git a/offload/test/mapping/firstprivate_aligned.cpp b/offload/test/mapping/firstprivate_aligned.cpp
index bf09eb0b0f589..ae6be0f0c07f4 100644
--- a/offload/test/mapping/firstprivate_aligned.cpp
+++ b/offload/test/mapping/firstprivate_aligned.cpp
@@ -1,5 +1,4 @@
 // RUN: %libomptarget-compilexx-generic -O3 && %libomptarget-run-generic
-// XFAIL: intelgpu
 
 #include <stdio.h>