Updated to 7.0.1

2025-02-23 23:32:50 +00:00 · 2019-03-22 12:55:58 +03:00 · 2019-03-22 12:55:58 +03:00 · 8a3ee911e7
commit 8a3ee911e7
parent d3772a3736
4 changed files with 38 additions and 31 deletions
--- a/.abf.yml
+++ b/.abf.yml
@ -1,6 +1,6 @@
 sources:
-  cfe-6.0.1.src.tar.xz: d93d8f3e3d7eb549ac58507383f7fcbdd78804d7
-  clang-tools-extra-6.0.1.src.tar.xz: 0e4077e46dba66f9db17eb55b1e913b44cb19fd3
-  compiler-rt-6.0.1.src.tar.xz: 4a61bd09f31d3079e921205bb93fb7d05a95946b
-  llvm-6.0.1.src.tar.xz: 09a6316c5225cab255ba12391e7abe5ff4d28935
-  polly-6.0.1.src.tar.xz: ace57e113a26c1244cf28c79012ff5e3f73ff076
+  cfe-7.0.1.src.tar.xz: 427e12762836d808583fb4149c033d02de0a8db2
+  clang-tools-extra-7.0.1.src.tar.xz: 6f4048482c4cf1818133120565c2dcd1d3a62747
+  compiler-rt-7.0.1.src.tar.xz: 5ac063b474abe730b551477cdc02db789228f9c7
+  llvm-7.0.1.src.tar.xz: f97632fcc3186eb0d396492ef8acfc807648580f
+  polly-7.0.1.src.tar.xz: 7c750261090168a4a219ab823cfbe76f0938850f
--- a/cfe-6.0.0-i586-unknown-linux-gnu.patch
+++ b/cfe-6.0.0-i586-unknown-linux-gnu.patch
@ -1,12 +0,0 @@
-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",
--- a/cfe-7.0.0-i586-unknown-linux-gnu.patch
+++ b/cfe-7.0.0-i586-unknown-linux-gnu.patch
@ -0,0 +1,13 @@
+diff -ur cfe-7.0.0.src-orig/lib/Driver/ToolChains/Gnu.cpp cfe-7.0.0.src/lib/Driver/ToolChains/Gnu.cpp
+--- cfe-7.0.0.src-orig/lib/Driver/ToolChains/Gnu.cpp	2018-07-31 17:21:46.000000000 +0300
+++ cfe-7.0.0.src/lib/Driver/ToolChains/Gnu.cpp	2018-12-16 22:15:06.858310620 +0300
+@@ -1842,7 +1842,8 @@
+       "i686-linux-gnu",       "i686-pc-linux-gnu",     "i486-linux-gnu",
+       "i386-linux-gnu",       "i386-redhat-linux6E",   "i686-redhat-linux",
+       "i586-redhat-linux",    "i386-redhat-linux",     "i586-suse-linux",
+-      "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu"};
+      "i486-slackware-linux", "i686-montavista-linux", "i586-unknown-linux-gnu",
+      "i586-linux-gnu"};
+ 
+   static const char *const MIPSLibDirs[] = {"/lib"};
+   static const char *const MIPSTriples[] = {"mips-linux-gnu", "mips-mti-linux",
--- a/llvm.spec
+++ b/llvm.spec
@ -1,5 +1,4 @@
 %define _disable_ld_no_undefined 0
-%define debug_package %{nil}
 %define debugcflags %{nil}

 # clang header paths are hard-coded at compile time
@ -11,7 +10,7 @@

 %bcond_without clang

-%define maj_ver 6
+%define maj_ver 7
 %define major_ver %{maj_ver}.0
 %define minor_ver 1

@ -28,7 +27,7 @@
 Summary:	Low Level Virtual Machine (LLVM)
 Name:		llvm
 Version:	%{major_ver}.%{minor_ver}
-Release:	3
+Release:	1
 License:	NCSA
 Group:		Development/Other
 Url:		http://llvm.org/
@ -46,7 +45,7 @@ Source1011:	clang-gcc-wrapper.sh
 # as well.
 #Patch1:		clang-rosa.patch
 #
-Patch2:		cfe-6.0.0-i586-unknown-linux-gnu.patch
+Patch2:		cfe-7.0.0-i586-unknown-linux-gnu.patch

 BuildRequires:	cmake
 BuildRequires:	bison
@ -78,6 +77,7 @@ for effective implementation, proper tail calls or garbage collection.
 %files
 %doc LICENSE.TXT
 %{_bindir}/bugpoint
+%{_bindir}/dsymutil
 %{_bindir}/llc
 %{_bindir}/lli
 %{_bindir}/llvm*
@ -110,6 +110,7 @@ LLVM plugins.
 %{_libdir}/BugpointPasses.so
 %{_libdir}/LLVMgold.so
 %{_libdir}/LLVMHello.so
+%{_libdir}/TestPlugin.so

 #----------------------------------------------------------------------------

@ -124,7 +125,7 @@ Shared libraries for the LLVM compiler infrastructure. This is needed by
 programs that are dynamically linked against libLLVM.

 %files -n %{libname}
-%{_libdir}/libLLVM-%{major}.so
+%{_libdir}/libLLVM-%{maj_ver}.so
 %{_libdir}/libLLVM-%{major}.%{minor_ver}.so

 #----------------------------------------------------------------------------
@ -250,6 +251,8 @@ as libraries and designed to be loosely-coupled and extensible.
 %files -n clang
 %{_bindir}/clang*
 %{_bindir}/c-index-test
+%{_bindir}/diagtool
+%{_bindir}/hmaptool
 %{_libdir}/clang/
 %{_datadir}/clang/clang-tidy-diff.py
 %{_datadir}/clang/run-clang-tidy.py
@ -275,7 +278,6 @@ Shared libraries for the clang compiler. This is needed by
 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
@ -366,10 +368,10 @@ export CXX=g++
 # 32 bit OSes
 %ifarch %ix86
 # compiler-rt doesn't support ix86 with x<6 either
-export CFLAGS="%{optflags} -march=i686 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64"
-export CXXFLAGS="%{optflags} -march=i686 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fno-devirtualize"
+export CFLAGS="%{optflags} -march=i686 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -g1"
+export CXXFLAGS="%{optflags} -march=i686 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fno-devirtualize -g1"
 %else
-export CXXFLAGS="%{optflags} -fno-devirtualize"
+export CXXFLAGS="%{optflags} -fno-devirtualize -g1"
 %endif


@ -388,20 +390,23 @@ done
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DBUILD_SHARED_LIBS:BOOL=OFF \
 	-DLLVM_LIBDIR_SUFFIX=$(echo %{_lib} | sed -e 's,^lib,,') \
+%if %{with clang}
 	-DCLANG_LIBDIR_SUFFIX=$(echo %{_lib} | sed -e 's,^lib,,') \
+	-DWITH_POLLY:BOOL=ON \
+	-DLINK_POLLY_INTO_TOOLS:BOOL=ON	\
+%endif
 	-DLLVM_ENABLE_FFI:BOOL=ON \
 	-DLLVM_ENABLE_RTTI:BOOL=ON \
 	-DLLVM_BINUTILS_INCDIR=%{_includedir} \
-	-DOCAMLFIND=NOTFOUND \
 	-DLLVM_INCLUDE_UTILS:BOOL=ON \
 	-DLLVM_BUILD_LLVM_DYLIB=ON \
 	-DLLVM_LINK_LLVM_DYLIB=ON \
+	-DOCAMLFIND=NOTFOUND \
 %if %{compile_apidox}
 	-DLLVM_INCLUDE_DOCS:BOOL=ON \
 	-DLLVM_BUILD_DOCS:BOOL=ON \
 %endif
-	-DWITH_POLLY:BOOL=ON \
-	-DLINK_POLLY_INTO_TOOLS:BOOL=ON
+	-DLLVM_OPTIMIZED_TABLEGEN=ON

 %make -s

@ -409,6 +414,7 @@ done

 %makeinstall_std -C build

+%if %{with clang}
 # [From OMV]
 # Polly bits as described on
 # http://polly.llvm.org/example_load_Polly_into_clang.html
@ -422,7 +428,7 @@ exec %{_bindir}/clang++ -O3 -Xclang -load -Xclang %{_libdir}/LLVMPolly.so "$@"
 EOF
 chmod 0755 %{buildroot}%{_bindir}/pollycc %{buildroot}%{_bindir}/pollyc++

-%if %{with clang}
+
 # Clang - Git integration. Not needed.
 	rm -f %{buildroot}%{_bindir}/git-clang-format

@ -432,9 +438,9 @@ chmod 0755 %{buildroot}%{_bindir}/pollycc %{buildroot}%{_bindir}/pollyc++
 # Symlinks for libclang to maintain compatibility with the older releases.
 	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

 # install clang-gcc-wrapper
 install -D -m 0644 %{SOURCE1011} %{buildroot}%{_datadir}/clang/
 mkdir -p %{buildroot}%{_sys_macros_dir}
 install -m 0644 %{SOURCE1010} %{buildroot}%{_sys_macros_dir}/
+%endif