Skip to content

Commit 930fecd

Browse files
Merge branch 'sycl' into ns-cl
2 parents eaf3b39 + 82d423c commit 930fecd

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

sycl/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ include(SYCLUtils)
2828
set(SYCL_MAJOR_VERSION 5)
2929
set(SYCL_MINOR_VERSION 7)
3030
set(SYCL_PATCH_VERSION 0)
31+
# Don't forget to re-enable sycl_symbols_windows.dump once we leave ABI-breaking
32+
# window!
3133
set(SYCL_DEV_ABI_VERSION 5)
3234
if (SYCL_ADD_DEV_VERSION_POSTFIX)
3335
set(SYCL_VERSION_POSTFIX "-${SYCL_DEV_ABI_VERSION}")

sycl/test/abi/sycl_symbols_windows.dump

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
# REQUIRES: windows
88
# UNSUPPORTED: libcxx
99

10+
11+
# Disabled for the duration of ABI-breaking window. Need to re-enable before
12+
# release.
13+
# UNSUPPORTED: *
14+
1015
??$compile@V?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@?$online_compiler@$00@INTEL@sycl@cl@@QEAA?AV?$vector@EV?$allocator@E@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@5@AEBV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@5@@Z
1116
??$compile@V?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@?$online_compiler@$00@experimental@intel@ext@sycl@cl@@QEAA?AV?$vector@EV?$allocator@E@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@7@AEBV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@7@@Z
1217
??$compile@V?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@std@@@?$online_compiler@$00@intel@ext@sycl@cl@@QEAA?AV?$vector@EV?$allocator@E@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@6@AEBV?$vector@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$allocator@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@@6@@Z

0 commit comments

Comments
 (0)