- fix building with gcc 5.x

- updated files

diff --git a/gcc5.patch b/gcc5.patch
new file mode 100644 (file)
index 0000000..66ee14e
--- /dev/null
+++ b/gcc5.patch
@@ -0,0 +1,50 @@
+--- llvm-3.7.0.src/tools/lld/lib/ReaderWriter/CMakeLists.txt~  2015-04-10 23:23:51.000000000 +0200
++++ llvm-3.7.0.src/tools/lld/lib/ReaderWriter/CMakeLists.txt   2015-10-10 15:15:06.115524723 +0200
+@@ -12,6 +12,7 @@
+   FileArchive.cpp
+   LinkerScript.cpp
+   LINK_LIBS
++    pthread
+     lldCore
+     lldYAML
+     LLVMObject
+--- llvm-3.7.0.src/tools/lld/lib/ReaderWriter/ELF/CMakeLists.txt~      2015-05-22 18:01:12.000000000 +0200
++++ llvm-3.7.0.src/tools/lld/lib/ReaderWriter/ELF/CMakeLists.txt       2015-10-10 15:19:12.926627682 +0200
+@@ -12,6 +12,7 @@
+   TargetLayout.cpp
+   Writer.cpp
+   LINK_LIBS
++    pthread
+     lldReaderWriter
+     lldCore
+     lldYAML
+--- llvm-3.7.0.src/tools/lld/lib/ReaderWriter/MachO/CMakeLists.txt~    2015-06-23 22:35:31.000000000 +0200
++++ llvm-3.7.0.src/tools/lld/lib/ReaderWriter/MachO/CMakeLists.txt     2015-10-10 15:24:10.011714287 +0200
+@@ -18,6 +18,7 @@
+   TLVPass.cpp
+   WriterMachO.cpp
+   LINK_LIBS
++    pthread
+     lldCore
+     lldYAML
+     LLVMObject
+--- llvm-3.7.0.src/tools/lld/lib/ReaderWriter/PECOFF/CMakeLists.txt~   2015-02-20 23:10:28.000000000 +0100
++++ llvm-3.7.0.src/tools/lld/lib/ReaderWriter/PECOFF/CMakeLists.txt    2015-10-10 15:28:57.175693671 +0200
+@@ -10,6 +10,7 @@
+   WriterImportLibrary.cpp
+   WriterPECOFF.cpp
+   LINK_LIBS
++    pthread
+     lldCore
+     LLVMObject
+     LLVMSupport
+--- llvm-3.7.0.src/tools/lld/lib/Driver/CMakeLists.txt~        2015-06-23 21:54:57.000000000 +0200
++++ llvm-3.7.0.src/tools/lld/lib/Driver/CMakeLists.txt 2015-10-10 15:31:58.673629341 +0200
+@@ -19,6 +19,7 @@
+   WinLinkDriver.cpp
+   WinLinkModuleDef.cpp
+   LINK_LIBS
++    pthread
+     lldConfig
+     lldMachO
+     lldCOFF

diff --git a/llvm.spec b/llvm.spec
index e0d0810f8334fb7d0427ddf0600a30702dd3c3b0..bc54fb51219aa4525a955280cdfc54ad7b206e9b 100644 (file)
--- a/llvm.spec
+++ b/llvm.spec
@@ -50,6 +50,7 @@ Patch4:               %{name}-lldb.patch
 Patch5:                %{name}-lldb-atomic.patch
 Patch6:                libdir.patch
 Patch7:                x32-gcc-toolchain.patch
+Patch8:                gcc5.patch
 URL:           http://llvm.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.9.6
@@ -123,6 +124,9 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # strip corrupts: $RPM_BUILD_ROOT/usr/lib64/llvm-gcc/bin/llvm-c++ ...
 %define                _noautostrip    .*/\\(libmud.*\\.a\\|bin/llvm-.*\\|lib.*++\\.a\\)
 
+# once_callable and once_call symbols defined in lldb-server binary
+%define                skip_post_check_so      liblld.*.so.*
+
 # clang doesn't know it, and leaving it here would pollute llvm-config
 %define                filterout_c     -fvar-tracking-assignments
 %define                filterout_cxx   -fvar-tracking-assignments
@@ -450,6 +454,7 @@ mv lld-%{version}.src tools/lld
 %endif
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 # configure does not properly specify libdir
 #%{__sed} -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}|g' Makefile.config.in
@@ -747,6 +752,8 @@ rm -rf $RPM_BUILD_ROOT
 %ifarch %{ix86} %{x8664}
 %{_libdir}/clang/%{version}/lib
 %{_libdir}/clang/%{version}/asan_blacklist.txt
+%{_libdir}/clang/%{version}/dfsan_abilist.txt
+%{_libdir}/clang/%{version}/msan_blacklist.txt
 %endif
 %ifarch %{x8664}
 %{_libdir}/clang/%{version}/dfsan_abilist.txt