From ca2a27c7f82a7b227eb98264ac81e4218d160138 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 18 Feb 2015 20:10:28 +0100
Subject: [PATCH] 3.5.0-11

---
 clang-pr22625.patch | 14 ++++++++++++++
 llvm.spec           |  8 +++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 clang-pr22625.patch

diff --git a/clang-pr22625.patch b/clang-pr22625.patch
new file mode 100644
index 0000000..9fb977b
--- /dev/null
+++ b/clang-pr22625.patch
@@ -0,0 +1,14 @@
+Index: lib/Driver/ToolChains.cpp
+===================================================================
+--- lib/Driver/ToolChains.cpp	(revision 229718)
++++ lib/Driver/ToolChains.cpp	(revision 229719)
+@@ -3154,7 +3154,8 @@
+     SmallVector<StringRef, 5> dirs;
+     CIncludeDirs.split(dirs, ":");
+     for (StringRef dir : dirs) {
+-      StringRef Prefix = llvm::sys::path::is_absolute(dir) ? SysRoot : "";
++      StringRef Prefix =
++          llvm::sys::path::is_absolute(dir) ? StringRef(SysRoot) : "";
+       addExternCSystemInclude(DriverArgs, CC1Args, Prefix + dir);
+     }
+     return;
diff --git a/llvm.spec b/llvm.spec
index e2871e1..975a3a6 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -35,7 +35,7 @@
 
 Name:           llvm
 Version:        3.5.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -74,6 +74,8 @@ Patch3:         llvm-IntrusiveRefCntPtr.patch
 # be to build everything herein with gcc, but i don't have the patience
 # atm, so in the interest of bootstrapping...
 Patch100:       clang-fake-gcc43.patch
+# http://llvm.org/bugs/show_bug.cgi?id=22625
+Patch101:       clang-pr22625.patch
 
 Patch200:       lldb-python.patch
 Patch201:       lldb-fix-expression-parser.patch
@@ -331,6 +333,7 @@ mv lldb-*/ tools/lldb
 %if %{with clang}
 pushd tools/clang
 %patch100 -p1
+%patch101 -p1
 popd
 %endif
 
@@ -699,6 +702,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Feb 18 2015 Jonathan Wakely <jwakely@redhat.com> - 3.5.0-11
+- Add patch for http://llvm.org/bugs/show_bug.cgi?id=22625
+
 * Wed Feb 18 2015 Richard W.M. Jones <rjones@redhat.com> - 3.5.0-10
 - Bump release and rebuild.