2 changed files with 20 additions and 36 deletions
--- a/libclc.spec
+++ b/libclc.spec
@ -1,4 +1,4 @@
-%global commit 9f6204ec04a8cadb6bef57caa71e3161c4f398f2
+%global commit 1cb3fbf504e25d86d972e8b2af3e24571767046b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global checkout git%{shortcommit}

@ -9,7 +9,7 @@

 Name:           libclc
 Version:        0.2.0
-Release:        17.git%{shortcommit}%{?dist}
+Release:        7.git%{shortcommit}%{?dist}
 Summary:        An open source implementation of the OpenCL 1.1 library requirements

 License:        BSD
@ -20,7 +20,7 @@ ExclusiveArch:	%{ix86} x86_64 %{arm} aarch64 %{power64} s390x

 BuildRequires:  clang-devel
 BuildRequires:  libedit-devel
-BuildRequires:  llvm-devel >= 3.9
+BuildRequires:  llvm-devel >= 3.7
 BuildRequires:  python
 BuildRequires:  zlib-devel

@ -63,10 +63,24 @@ developing applications that use %{name}.
 %autosetup -n %{name}-%{commit}

 %build
-export CFLAGS="%{build_cflags} -D__extern_always_inline=inline"
-%set_build_flags
+CFLAGS="%{optflags} -D__extern_always_inline=inline"
 ./configure.py --prefix=%{_prefix} --libexecdir=%{_libdir}/%{shortname}/ --pkgconfigdir=%{_libdir}/pkgconfig/

+%ifarch s390 s390x
+# clang requires z10 at minimum
+# workaround until we change the defaults for Fedora
+sed -i 's/-march=z9-109 /-march=z10 /' Makefile
+%endif
+%ifarch %{power64} s390 s390x
+# temporary disable stack-protector on power64 as workaround due to the bug in llvm
+# which causes the build failure on secondary arch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1324085
+sed -i "s/fstack-protector-strong/fno-stack-protector/" Makefile
+%else
+# fstack-protector-strong is currently not supported by clang++
+sed -i "s/fstack-protector-strong/fstack-protector/" Makefile
+%endif
+
 %make_build

 %install
@ -83,36 +97,6 @@ export CFLAGS="%{build_cflags} -D__extern_always_inline=inline"
 %{_libdir}/pkgconfig/%{name}.pc

 %changelog
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-17.git9f6204e
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-16.git9f6204e
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Apr 03 2019 Dave Airlie <airlied@redhat.com> - 0.2.0-15.git9f6204e
- Update to latest upstream snapshot (prior to moving to cmake)
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-14.git1ecb16d
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Dec 04 2018 Dave Airlie <airlied@redhat.com> - 0.2.0-13.git1ecb16d
- Update to latest libclc snapshot
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-12.gitc45b9df
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jul 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.2.0-11.gitc45b9df
- Update to latest git snapshot
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-10.git1cb3fbf
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Dan Horák <dan[at]danny.cz> - 0.2.0-9.git1cb3fbf
- Drop build workarounds
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-8.git1cb3fbf
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
 * Mon Jul 24 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.2.0-7.git1cb3fbf
 - Update to latest git snapshot

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (libclc-git9f6204e.tar.gz) = 066a12c8a431ab1071fa9e0b4a06bf4852f67fb72ee204d1acf699ff64de1b4038ce06f5571e30f7f537b301367915e5758e82b58bf39799301c957541fbed39
+SHA512 (libclc-git1cb3fbf.tar.gz) = 507ba4c7ff7229f02a5846059907ee15b4a15f98d2d0f73047fc4ac73d23d0aeb9e9a4dcfc7b60ccbd4c2b57ce001805c768a8f6a36cea5100fb7d5fe891416a