From 8fd33ecd09b9877eb709d31d176ee57a1f477c75 Mon Sep 17 00:00:00 2001
From: Steffen Larsen <steffen.larsen@codeplay.com>
Date: Thu, 15 Jul 2021 11:53:36 +0100
Subject: [PATCH] [SYCL] Pass bound arch to unbundler

This commit propagates the bound arch to the clang unbundler for SYCL
actions.

Co-authored-by: Michel Migdal <michel.migdal@codeplay.com>
Signed-off-by: Steffen Larsen <steffen.larsen@codeplay.com>
---
 clang/lib/Driver/Driver.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 4cfff71b0fa6b..af174a25f08be 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -4151,8 +4151,10 @@ class OffloadingActionBuilder final {
         }
         for (unsigned I = 0; I < ToolChains.size(); ++I) {
           SYCLDeviceActions.push_back(UA);
-          UA->registerDependentActionInfo(
-            ToolChains[I], /*BoundArch=*/StringRef(), Action::OFK_SYCL);
+          withBoundArchForToolChain(ToolChains[I], [&](const char *BoundArch) {
+            UA->registerDependentActionInfo(ToolChains[I], BoundArch,
+                                            Action::OFK_SYCL);
+          });
         }
         return ABRT_Success;
       }