Updated to 6.0.0

This commit is contained in:
Алзим 2018-04-23 15:41:27 +03:00
parent 4dd0dc5b21
commit c66c93e6ab
3 changed files with 40 additions and 43 deletions

View file

@ -1,6 +1,6 @@
sources:
cfe-3.9.0.src.tar.xz: 00d49ee82451130a8e1e7b1d56cffa37b783bcb2
clang-tools-extra-3.9.0.src.tar.xz: 396ad1af7a8d3cff015a644e595f35553a7548c4
compiler-rt-3.9.0.src.tar.xz: a306d576e84b7ee048ebb0ae5ca72e6ec9e1c549
llvm-3.9.0.src.tar.xz: da792f11a208d5b994c4fe1c8faa20f90ff0e4a3
polly-3.9.0.src.tar.xz: 9d5809bd413b05de18480b69fcf6dbe8d3b1f9ac
cfe-6.0.0.src.tar.xz: 4cc7bef72fda70ac5e065ca0ae2d66957abe6f2a
clang-tools-extra-6.0.0.src.tar.xz: c960a0d565e46e4c4f6976fac389f753076ca72e
compiler-rt-6.0.0.src.tar.xz: 5725f19be611034e77196461cdb4989f4258cfa4
llvm-6.0.0.src.tar.xz: f61e0a35feb76644ba160a413ee209dd24c88f47
polly-6.0.0.src.tar.xz: 118be6f5e0ddddc3f3510df82b02bcfb485ee590

View file

@ -0,0 +1,12 @@
diff -Naur cfe-6.0.0.src-orig/lib/Driver/ToolChains/Gnu.cpp cfe-6.0.0.src/lib/Driver/ToolChains/Gnu.cpp
--- cfe-6.0.0.src-orig/lib/Driver/ToolChains/Gnu.cpp 2017-12-09 03:34:01.000000000 +0300
+++ cfe-6.0.0.src/lib/Driver/ToolChains/Gnu.cpp 2018-04-13 13:47:48.199744983 +0300
@@ -1743,7 +1743,7 @@
"i386-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux",
"i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux",
"i486-slackware-linux", "i686-montavista-linux", "i686-linux-android",
- "i586-linux-gnu"};
+ "i586-linux-gnu", "i586-unknown-linux-gnu"};
static const char *const MIPSLibDirs[] = {"/lib"};
static const char *const MIPSTriples[] = {"mips-linux-gnu", "mips-mti-linux",

View file

@ -11,13 +11,14 @@
%bcond_without clang
%define major_ver 3.9
%define maj_ver 6
%define major_ver %{maj_ver}.0
%define minor_ver 0
Summary: Low Level Virtual Machine (LLVM)
Name: llvm
Version: %{major_ver}.%{minor_ver}
Release: 5
Release: 2
License: NCSA
Group: Development/Other
Url: http://llvm.org/
@ -31,7 +32,9 @@ Source1000: llvm.rpmlintrc
# Adjust the search paths to match the OS, adjust the default compiler flags
# as well.
Patch1: clang-rosa.patch
#Patch1: clang-rosa.patch
#
Patch2: cfe-6.0.0-i586-unknown-linux-gnu.patch
# Claim compatibility with gcc 4.9.1 rather than 4.2.1, it's
# much much closer in terms of standards supported etc.
Patch7: clang-gcc-compat.patch
@ -71,36 +74,9 @@ for effective implementation, proper tail calls or garbage collection.
%{_bindir}/bugpoint
%{_bindir}/llc
%{_bindir}/lli
%{_bindir}/llvm*
%exclude %{_bindir}/llvm-config
%{_bindir}/opt
%{_bindir}/llvm-ar
%{_bindir}/llvm-as
%{_bindir}/llvm-bcanalyzer
%{_bindir}/llvm-diff
%{_bindir}/llvm-dis
%{_bindir}/llvm-extract
%{_bindir}/llvm-link
%{_bindir}/llvm-mc
%{_bindir}/llvm-nm
%{_bindir}/llvm-objdump
%{_bindir}/llvm-ranlib
%{_bindir}/llvm-readobj
%{_bindir}/llvm-cov
%{_bindir}/llvm-dwarfdump
%{_bindir}/llvm-mcmarkup
%{_bindir}/llvm-profdata
%{_bindir}/llvm-rtdyld
%{_bindir}/llvm-size
%{_bindir}/llvm-stress
%{_bindir}/llvm-symbolizer
%{_bindir}/llvm-tblgen
%{_bindir}/llvm-cxxdump
%{_bindir}/llvm-dsymutil
%{_bindir}/llvm-pdbdump
%{_bindir}/llvm-c-test
%{_bindir}/llvm-dwp
%{_bindir}/llvm-lib
%{_bindir}/llvm-lto
%{_bindir}/llvm-split
%{_bindir}/modularize
%{_bindir}/sancov
%{_bindir}/verify-uselistorder
@ -108,6 +84,7 @@ for effective implementation, proper tail calls or garbage collection.
%{_bindir}/yaml2obj
%{_bindir}/find-all-symbols
%{_bindir}/sanstats
%{_datadir}/opt-viewer
#----------------------------------------------------------------------------
@ -126,6 +103,7 @@ LLVM plugins.
%files -n %{plugins}
%{_libdir}/BugpointPasses.so
%{_libdir}/libLTO.so
%{_libdir}/libLTO.so.%{maj_ver}*
%{_libdir}/LLVMgold.so
%{_libdir}/LLVMHello.so
@ -175,6 +153,7 @@ This package contains the development files for LLVM.
%{_libdir}/libLLVM*.a
%{_libdir}/libfindAllSymbols.a
%{_libdir}/cmake/%{name}/*
%{_libdir}/cmake/polly/*.cmake
%{_includedir}/%{name}
%{_includedir}/%{name}-c
%{_includedir}/polly
@ -193,7 +172,6 @@ Documentation for the LLVM compiler infrastructure.
%files doc
%doc README.txt
%doc docs/*.html
%doc docs/tutorial
%doc examples
%if %{compile_apidox}
@ -227,7 +205,7 @@ short vector instructions as well as dedicated accelerators.
#----------------------------------------------------------------------------
%if %{with clang}
# TODO: %{_bindir}/clang is linked against static libclang.a, could it be
# TODO: %%{_bindir}/clang is linked against static libclang.a, could it be
# linked against libclang.so instead, like llvm-* are against livLLVM.so?
%package -n clang
@ -262,6 +240,10 @@ as libraries and designed to be loosely-coupled and extensible.
%{_datadir}/clang/run-clang-tidy.py
%{_datadir}/clang/clang-include-fixer.py
%{_datadir}/clang/run-find-all-symbols.py
%{_datadir}/clang/bash-autocomplete.sh
%{_datadir}/clang/clang-include-fixer.el
%{_datadir}/clang/clang-rename.el
%{_datadir}/clang/clang-rename.py
%endif
#----------------------------------------------------------------------------
@ -280,6 +262,7 @@ programs that are dynamically linked against libclang.
%files -n %{libclang}
%{_libdir}/libclang.so.%{clang_major}
%{_libdir}/libclang.so.%{maj_ver}
%{_libdir}/libclang-%{clang_major}.so
%{_libdir}/libclang-%{clang_major}.%{minor_ver}.so
%endif
@ -351,10 +334,11 @@ mv polly-%{version}.src tools/polly
mv clang-tools-extra-%{version}.src tools/clang/tools/extra
mv compiler-rt-%{version}.src projects/compiler-rt
cd tools/clang
%patch1 -p1 -b .rosa~
#%patch1 -p1 -b .rosa~
%patch2 -p1 -b .gnu~
cd -
%endif
%patch7 -p1 -b .gcc49~
#%patch7 -p1 -b .gcc49~
%build
@ -408,8 +392,7 @@ done
-DWITH_POLLY:BOOL=ON \
-DLINK_POLLY_INTO_TOOLS:BOOL=ON
%make
%make -s
%install
@ -439,3 +422,5 @@ chmod 0755 %{buildroot}%{_bindir}/pollycc %{buildroot}%{_bindir}/pollyc++
ln -s %{_libdir}/libclang.so.%{clang_major} %{buildroot}%{_libdir}/libclang-%{clang_major}.so
ln -s %{_libdir}/libclang.so.%{clang_major} %{buildroot}%{_libdir}/libclang-%{clang_major}.%{minor_ver}.so
%endif
%changelog