From a92cf548fef29432b2a7b3289ede57afadf20a4e Mon Sep 17 00:00:00 2001 From: Ross Brunton Date: Fri, 20 Sep 2024 11:15:02 +0100 Subject: [PATCH] [UR] UR Hardening Pre-merge commit for: https://github.com/oneapi-src/unified-runtime/pull/2090 --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 3d5958be9c64e..891223df22319 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,14 +116,12 @@ if(SYCL_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit 185149248dd257bd37482aac43307a136204c051 - # Merge: 2af159d4 d619bcd1 - # Author: Piotr Balcer - # Date: Thu Sep 19 11:02:27 2024 +0200 - # Merge pull request #1934 from yingcong-wu/yc/0806-exclude-shadow-from-coredump - # [DeviceSanitizer] Exclude shadow memory from coredump file for CPU device. - set(UNIFIED_RUNTIME_TAG 185149248dd257bd37482aac43307a136204c051) + set(UNIFIED_RUNTIME_REPO "https://github.com/RossBrunton/unified-runtime.git") + # commit 64ca4eb070e33b721ac99fcd6d1a2f68b4edad21 (HEAD -> ross/harden, local/ross/harden) + # Author: Ross Brunton + # Date: Fri Sep 13 15:38:40 2024 +0100 + # Enable hardening flags on Linux + set(UNIFIED_RUNTIME_TAG 64ca4eb070e33b721ac99fcd6d1a2f68b4edad21) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need