Update D12834 patch and rebase

1 files changed, 4 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d25702b70f39..6c038390bc0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,7 +21,7 @@ pkgname=(
 )
 _pkgname='llvm'
 
-pkgver=3.9.0svn_r257739
+pkgver=3.9.0svn_r258302
 pkgrel=1
 
 arch=('i686' 'x86_64')
@@ -47,8 +47,7 @@ source=(
     'clang-tools-extra::svn+http://llvm.org/svn/llvm-project/clang-tools-extra/trunk'
     'compiler-rt::svn+http://llvm.org/svn/llvm-project/compiler-rt/trunk'
     'llvm-Config-llvm-config.h'
-    '0001-add-gcc-abi_tag-support.patch'
-    '0002-Fix-handling-of-abi_tag-attribute-on-namespaces.patch'
+    'D12834-add-gcc-abi_tag-support.patch'
 )
 
 sha256sums=(
@@ -57,8 +56,7 @@ sha256sums=(
     'SKIP'
     'SKIP'
     '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48'
-    'cea6130d231f17e3c98f12f4f7a308879fe69a2d49907127f4ad725d2f88ab6b'
-    '3d19adbd6fe0f4ec4511b7dd3db472c8019aa08b8970059892bd6761c51996c9'
+    '94824e71efbf7b4efdfd23bf7d86a1d59a2b6b620df1259fac0d81dcb7e9699e'
 )
 
 #
@@ -146,8 +144,7 @@ prepare() {
 
     # https://llvm.org/bugs/show_bug.cgi?id=23529
     # http://reviews.llvm.org/D12834
-    patch -N -p1 -d tools/clang -i "${srcdir}/0001-add-gcc-abi_tag-support.patch"
-    patch -N -p1 -d tools/clang -i "${srcdir}/0002-Fix-handling-of-abi_tag-attribute-on-namespaces.patch"
+    patch -N -p0 -d tools/clang -i "${srcdir}/D12834-add-gcc-abi_tag-support.patch"
 
     mkdir -p "${srcdir}/build"
 }