- fix debug info extraction

- fix duplicate files

diff --git a/debuginfo-fix.patch b/debuginfo-fix.patch
new file mode 100644 (file)
index 0000000..72ad371
--- /dev/null
+++ b/debuginfo-fix.patch
@@ -0,0 +1,11 @@
+--- llvm-3.7.0.src/include/llvm/CodeGen/CommandFlags.h~        2015-07-06 19:44:26.000000000 +0200
++++ llvm-3.7.0.src/include/llvm/CodeGen/CommandFlags.h 2015-10-11 11:59:10.130862977 +0200
+@@ -21,7 +21,7 @@
+ #include "llvm/IR/Intrinsics.h"
+ #include "llvm/IR/Module.h"
+ #include "llvm/MC/MCTargetOptionsCommandFlags.h"
+-#include "llvm//MC/SubtargetFeature.h"
++#include "llvm/MC/SubtargetFeature.h"
+ #include "llvm/Support/CodeGen.h"
+ #include "llvm/Support/CommandLine.h"
+ #include "llvm/Support/Host.h"

diff --git a/llvm.spec b/llvm.spec
index 3232e9bcdb0274fabe11f2b6d708259dccdee98a..e4373169e17ee8d0258f33c5c91c3e429edf8453 100644 (file)
--- a/llvm.spec
+++ b/llvm.spec
@@ -46,6 +46,7 @@ Patch1:               %{name}-pld.patch
 Patch2:                libdir.patch
 Patch3:                x32-gcc-toolchain.patch
 Patch4:                gcc5.patch
+Patch5:                debuginfo-fix.patch
 URL:           http://llvm.org/
 BuildRequires: bash
 BuildRequires: bison
@@ -437,6 +438,7 @@ mv lld-%{version}.src tools/lld
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__sed} -i 's|"lib"|"%{_lib}"|' tools/clang/lib/Driver/Driver.cpp
 
@@ -704,8 +706,6 @@ 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