Update to snapshot from git for LLVM12 support

This commit is contained in:
Tom Stellard 2021-02-19 00:59:27 +00:00
parent 245ee7e9d6
commit 05afb146cd
4 changed files with 44 additions and 18 deletions

View File

@ -1,12 +0,0 @@
diff -Naur pocl-1.6.orig/lib/CL/devices/pthread/pthread_scheduler.c pocl-1.6/lib/CL/devices/pthread/pthread_scheduler.c
--- pocl-1.6.orig/lib/CL/devices/pthread/pthread_scheduler.c 2020-12-18 07:47:41.000000000 +0100
+++ pocl-1.6/lib/CL/devices/pthread/pthread_scheduler.c 2020-12-18 07:48:03.000000000 +0100
@@ -409,7 +409,7 @@
cl_device_id subd = cmd->device;
if (shall_we_run_this (td, subd))
{
- DL_DELETE (scheduler.work_queue, cmd)
+ DL_DELETE (scheduler.work_queue, cmd);
return cmd;
}
}

View File

@ -0,0 +1,33 @@
From 8b4a9ea55eae467d286959f5e63a58ad533f4d87 Mon Sep 17 00:00:00 2001
From: KOLANICH <kolan_n@mail.ru>
Date: Wed, 10 Feb 2021 13:36:35 +0300
Subject: [PATCH] Fixed LLVM 12 support:
clang::CompilerInvocation::setLangDefaults signature was changed in
https://github.com/llvm/llvm-project/commit/c495dfe0268bc2be8737725d657411baa1399e9d
---
lib/CL/pocl_llvm_build.cc | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/CL/pocl_llvm_build.cc b/lib/CL/pocl_llvm_build.cc
index 5c60743d..1fb838b4 100644
--- a/lib/CL/pocl_llvm_build.cc
+++ b/lib/CL/pocl_llvm_build.cc
@@ -419,7 +419,13 @@ int pocl_llvm_build_program(cl_program program,
#else
clang::InputKind::OpenCL,
#endif
- triple, po, clang::LangStandard::lang_opencl12);
+ triple,
+#ifndef LLVM_OLDER_THAN_12_0
+ po.Includes,
+#else
+ po,
+#endif
+ clang::LangStandard::lang_opencl12);
// LLVM 3.3 and older do not set that char is signed which is
// defined by the OpenCL C specs (but not by C specs).
--
2.26.2

View File

@ -1,19 +1,21 @@
%global sover 2
%global with_tests 1
%global commit a2d016c84d2034f43062d7f22b4874cfffe5c127
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: pocl
%global ver 1.6
%global ver 1.7
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(string.lower(ver))}
Release: 4%{?dist}
Release: 0.1.20210218git%{shortcommit}%{?dist}
Summary: Portable Computing Language - an OpenCL implementation
# The whole code is under MIT
# except include/utlist.h which is under BSD (and unbundled) and
# except lib/kernel/vecmath which is under GPLv3+ or LGPLv3+ (and unbundled in future)
License: MIT and BSD and (GPLv3+ or LGPLv3+)
URL: http://portablecl.org/
Source0: https://github.com/pocl/pocl/archive/v%{version}/%{name}-%{version}.tar.gz
Source0: https://github.com/pocl/pocl/archive/%{commit}/pocl-%{shortcommit}.tar.gz
Patch0: 0001-Fix-build-failure.patch
Patch0: 0001-Fixed-LLVM-12-support-clang-CompilerInvocation-setLa.patch
BuildRequires: cmake
BuildRequires: clang clang-devel
@ -62,7 +64,7 @@ Requires: uthash-devel
Portable Computing Language development files.
%prep
%autosetup -p1 -n pocl-%{ver}
%autosetup -p1 -n pocl-%{commit}
# Unbundle uthash
find . -depth -name utlist* -print -delete
@ -124,6 +126,9 @@ find . -depth -name utlist* -print -delete
%{_libdir}/pkgconfig/%{name}.pc
%changelog
* Thu Feb 18 2021 Tom Stellard <tstellar@redhat.com> - pocl-1.7-0.1.20210218gita2d016c
- Update to snapshot from git for LLVM12 support
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (pocl-1.6.tar.gz) = ecd3a3867a62a2a555183741fa4586eeefae00514d66d15a79b9094ff0a0248b213f62ab23b3e61bdb1042e760cd34b07e546f97b304ac86c3f861a9161df1b1
SHA512 (pocl-a2d016c.tar.gz) = 2971eb5e690c90b9699e9d5f68b2aa6593287643b3da5689781537921f6ab7c87c590def6d1a07784d2486c00ff39088c5c58f2d132abf31fc969bfbebb23b63