Timm Bäder
parent
8b48974868
commit
a456636437
|
|
@ -77,3 +77,5 @@
|
|||
/compiler-rt-12.0.0.src.tar.xz.sig
|
||||
/compiler-rt-12.0.1.src.tar.xz
|
||||
/compiler-rt-12.0.1.src.tar.xz.sig
|
||||
/compiler-rt-13.0.0.src.tar.xz
|
||||
/compiler-rt-13.0.0.src.tar.xz.sig
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
From 72191190adea8e861e9a383b83799e7472b80e30 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Stellard <tstellar@redhat.com>
|
||||
Date: Thu, 23 Sep 2021 18:06:41 -0700
|
||||
Subject: [PATCH] Fix compiler-rt arch detection for ppc64le
|
||||
|
||||
---
|
||||
compiler-rt/cmake/base-config-ix.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake
|
||||
index c11342e68813..3ca9dc0f5515 100644
|
||||
--- a/compiler-rt/cmake/base-config-ix.cmake
|
||||
+++ b/compiler-rt/cmake/base-config-ix.cmake
|
||||
@@ -204,7 +204,7 @@ macro(test_targets)
|
||||
test_target_arch(x86_64 "" "")
|
||||
endif()
|
||||
endif()
|
||||
- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc64le")
|
||||
+ elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc64le|ppc64le")
|
||||
test_target_arch(powerpc64le "" "-m64")
|
||||
elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc")
|
||||
if(CMAKE_SYSTEM_NAME MATCHES "AIX")
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
#%%global rc_ver 5
|
||||
#global rc_ver 3
|
||||
|
||||
%global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src
|
||||
%global compiler_rt_version 13.0.0
|
||||
%global crt_srcdir compiler-rt-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src
|
||||
|
||||
# see https://sourceware.org/bugzilla/show_bug.cgi?id=25271
|
||||
%global optflags %(echo %{optflags} -D_DEFAULT_SOURCE)
|
||||
|
|
@ -9,17 +10,18 @@
|
|||
%global optflags %(echo %{optflags} -Dasm=__asm__)
|
||||
|
||||
Name: compiler-rt
|
||||
Version: 12.0.1%{?rc_ver:~rc%{rc_ver}}
|
||||
Release: 3%{?dist}
|
||||
Version: %{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}}
|
||||
Release: 1%{?dist}
|
||||
Summary: LLVM "compiler-rt" runtime libraries
|
||||
|
||||
License: NCSA or MIT
|
||||
URL: http://llvm.org
|
||||
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz
|
||||
Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz.sig
|
||||
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz
|
||||
Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz.sig
|
||||
Source2: tstellar-gpg-key.asc
|
||||
|
||||
Patch0: 0001-PATCH-compiler-rt-Workaround-libstdc-limitation-wrt..patch
|
||||
Patch1: 0001-Fix-compiler-rt-arch-detection-for-ppc64le.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
|
|
@ -51,6 +53,7 @@ pathfix.py -i %{__python3} -pn lib/hwasan/scripts/hwasan_symbolize
|
|||
%cmake -GNinja \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DLLVM_CONFIG_PATH:FILEPATH=%{_bindir}/llvm-config-%{__isa_bits} \
|
||||
-DCMAKE_SKIP_RPATH:BOOL=ON \
|
||||
\
|
||||
%if 0%{?__isa_bits} == 64
|
||||
-DLLVM_LIBDIR_SUFFIX=64 \
|
||||
|
|
@ -66,15 +69,15 @@ pathfix.py -i %{__python3} -pn lib/hwasan/scripts/hwasan_symbolize
|
|||
%cmake_install
|
||||
|
||||
# move blacklist/abilist files to where clang expect them
|
||||
mkdir -p %{buildroot}%{_libdir}/clang/%{version}/share
|
||||
mv -v %{buildroot}%{_datadir}/*list.txt %{buildroot}%{_libdir}/clang/%{version}/share/
|
||||
mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/share
|
||||
mv -v %{buildroot}%{_datadir}/*list.txt %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/share/
|
||||
|
||||
# move sanitizer libs to better place
|
||||
%global libclang_rt_installdir lib/linux
|
||||
mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib
|
||||
mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*clang_rt* %{buildroot}%{_libdir}/clang/%{version}/lib
|
||||
mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib/linux/
|
||||
pushd %{buildroot}%{_libdir}/clang/%{version}/lib
|
||||
mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib
|
||||
mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*clang_rt* %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib
|
||||
mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib/linux/
|
||||
pushd %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib
|
||||
for i in *.a *.so
|
||||
do
|
||||
ln -s ../$i linux/$i
|
||||
|
|
@ -84,11 +87,11 @@ done
|
|||
# the symlinks will be dangling if the 32 bits version is not installed, but that should be fine
|
||||
%ifarch x86_64
|
||||
|
||||
mkdir -p %{buildroot}/%{_exec_prefix}/lib/clang/%{version}/lib/linux
|
||||
mkdir -p %{buildroot}/%{_exec_prefix}/lib/clang/%{compiler_rt_version}/lib/linux
|
||||
for i in *.a *.so
|
||||
do
|
||||
target=`echo "$i" | sed -e 's/x86_64/i386/'`
|
||||
ln -s ../../../../../lib/clang/%{version}/lib/$target ../../../../%{_lib}/clang/%{version}/lib/linux/
|
||||
ln -s ../../../../../lib/clang/%{compiler_rt_version}/lib/$target ../../../../%{_lib}/clang/%{compiler_rt_version}/lib/linux/
|
||||
done
|
||||
|
||||
%endif
|
||||
|
|
@ -109,6 +112,10 @@ popd
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Oct 12 2021 Timm Bäder <tbaeder@redhat.com> - 13.0.0-1
|
||||
- 13.0.0 Release
|
||||
- skip rpath
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 12.0.1-3
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (compiler-rt-12.0.1.src.tar.xz) = 708780aa47ef289a9700eb76c17cc1f3bab19b8245174e612b5f684c48448030263a72eeef1021b10bdffa6ace2df489adcbba9e7a790ccbcd5fe72056f63f92
|
||||
SHA512 (compiler-rt-12.0.1.src.tar.xz.sig) = f0feb25e0cc7431e47d2966c0d5cb5739a585b00ba61f0c65f5fa34368941a43ad7cbccb4c46c81b4339f7582f472c0b7e7a74c17ee663faa5f444cb54e16450
|
||||
SHA512 (compiler-rt-13.0.0.src.tar.xz) = b35643553d0d3d4deb2f31e2dad8bbac4b772ee3e0c86aa532ce7161da276620fe820193004ee08c62eb8dfd015e04d3853e6a7cc939ac3fb57345702386d583
|
||||
SHA512 (compiler-rt-13.0.0.src.tar.xz.sig) = c2626f6b0d813e00fdd9abc2ffcdc30d3a906e192da470ea24c010421ff4cc812b171704899ab15e53edb49ff5dd4ebd447425a2469ff80f9503a77e7ee8cdcd
|
||||
|
|
|
|||
Loading…
Reference in New Issue