ispc: upgrade 1.20.0 -> 1.21.0

* Allows compilation with LLVM16.
* ISPC_NO_DUMPS is no longer an option and ISPC_PS4_TARGET has been
  renamed.
* Libraries now have proper so versions so packaging tweaks are no
  longer required.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal 2023-08-21 09:47:15 +08:00
parent 7368b9654e
commit 0685337893
2 changed files with 11 additions and 29 deletions

View File

@ -1,4 +1,4 @@
From 493e886d6dae2ed7bdc12ed03f717ee0e98dfe09 Mon Sep 17 00:00:00 2001
From cad70deae39566fa11814e27f06d5fe8ddcb1cbc Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Thu, 24 Feb 2022 20:01:11 +0530
Subject: [PATCH] cmake: don't build for 32-bit targets
@ -16,14 +16,14 @@ Upstream-Status: Inappropriate
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
cmake/GenerateBuiltins.cmake | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
cmake/GenerateBuiltins.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/GenerateBuiltins.cmake b/cmake/GenerateBuiltins.cmake
index fa228247..7adc7e52 100644
index 936590a7..b8f731de 100644
--- a/cmake/GenerateBuiltins.cmake
+++ b/cmake/GenerateBuiltins.cmake
@@ -272,7 +272,7 @@ function(builtin_to_cpp bit os_name arch supported_archs supported_oses resultFi
@@ -253,7 +253,7 @@ function(builtin_to_cpp bit os_name arch supported_archs supported_oses resultFi
# In this case headers will be installed in /usr/arm-linux-gnueabihf/include and will not be picked up
# by clang by default. So the following line adds such path explicitly. If this path doesn't exist and
# the headers can be found in other locations, this should not be a problem.
@ -32,7 +32,7 @@ index fa228247..7adc7e52 100644
endif()
endif()
@@ -354,7 +354,7 @@ function (generate_target_builtins resultList)
@@ -340,7 +340,7 @@ function (generate_target_builtins resultList)
set(regular_targets ${ARGN})
list(FILTER regular_targets EXCLUDE REGEX wasm)
foreach (ispc_target ${regular_targets})
@ -41,24 +41,15 @@ index fa228247..7adc7e52 100644
foreach (os_name ${TARGET_OS_LIST_FOR_LL})
target_ll_to_cpp(target-${ispc_target} ${bit} ${os_name} output${os_name}${bit})
list(APPEND tmpList ${output${os_name}${bit}})
@@ -415,7 +415,7 @@ function (generate_common_builtins resultList)
@@ -406,7 +406,7 @@ function (generate_common_builtins resultList)
endif()
message (STATUS "ISPC will be built with support of ${supported_oses} for ${supported_archs}")
- foreach (bit 32 64)
+ foreach (bit 64)
foreach (os_name "windows" "linux" "freebsd" "macos" "android" "ios" "ps4" "web")
foreach (arch "x86" "arm" "wasm32")
foreach (arch "x86" "arm" "wasm")
builtin_to_cpp(${bit} ${os_name} ${arch} "${supported_archs}" "${supported_oses}" res${bit}${os_name}${arch})
@@ -428,7 +428,7 @@ function (generate_common_builtins resultList)
endforeach()
endforeach()
if (XE_ENABLED)
- foreach (bit 32 64)
+ foreach (bit 64)
builtin_xe_to_cpp(${bit} res_xe_${bit})
list(APPEND tmpList ${res_xe_${bit}} )
if(MSVC)
--
2.17.1
2.41.0

View File

@ -18,7 +18,7 @@ SRC_URI = "git://github.com/ispc/ispc.git;protocol=https;branch=main \
file://run-ptest \
"
SRCREV = "14bd04aa7e68cd33eb1d96b33058cb64d7ef76f4"
SRCREV = "f925f2563441a36eff1cb7a617934253dc9c100c"
COMPATIBLE_HOST = '(x86_64).*-linux'
@ -48,14 +48,13 @@ do_install_ptest() {
EXTRA_OECMAKE += " \
-DISPC_INCLUDE_TESTS=OFF \
-DISPC_INCLUDE_EXAMPLES=OFF \
-DISPC_NO_DUMPS=ON \
-DARM_ENABLED=OFF \
-DISPC_CROSS=ON \
-DISPC_ANDROID_TARGET=OFF \
-DISPC_FREEBSD_TARGET=OFF \
-DISPC_WINDOWS_TARGET=OFF \
-DISPC_IOS_TARGET=OFF \
-DISPC_PS4_TARGET=OFF \
-DISPC_PS_TARGET=OFF \
-DSYSROOT_DIR=${STAGING_DIR} \
-DCLANG_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang \
-DCLANGPP_EXECUTABLE=${STAGING_BINDIR_NATIVE}/clang++ \
@ -63,12 +62,4 @@ EXTRA_OECMAKE += " \
-DLLVM_AS_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-as \
"
FILES:${PN}-dev = "\
${libdir}/libispcrt_device_cpu${SOLIBSDEV} \
${libdir}/cmake \
${includedir} \
"
FILES:${PN} += "${libdir}/libispcrt.so"
BBCLASSEXTEND = "native nativesdk"