From 1c5b310fd9903b96bcdf052e2582e269bbc006b2 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 2 Aug 2016 00:44:06 +0000
Subject: [PATCH] extra/llvm to 3.8.1-1

---
 ...ler-part-of-attrbute-abi_tag-support.patch | 20 ++++++++++---------
 extra/llvm/PKGBUILD                           | 20 +++++++++----------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/extra/llvm/D18035-PR23529-Mangler-part-of-attrbute-abi_tag-support.patch b/extra/llvm/D18035-PR23529-Mangler-part-of-attrbute-abi_tag-support.patch
index 33e9d52ba..b935a10fd 100644
--- a/extra/llvm/D18035-PR23529-Mangler-part-of-attrbute-abi_tag-support.patch
+++ b/extra/llvm/D18035-PR23529-Mangler-part-of-attrbute-abi_tag-support.patch
@@ -884,7 +884,7 @@ Index: lib/AST/ItaniumMangle.cpp
      mangleTemplateArgs(DTST->getArgs(), DTST->getNumArgs());
      break;
    }
-@@ -2082,7 +2360,9 @@
+@@ -2088,7 +2366,9 @@
    case BuiltinType::Id:
  #include "clang/AST/BuiltinTypes.def"
    case BuiltinType::Dependent:
@@ -895,7 +895,7 @@ Index: lib/AST/ItaniumMangle.cpp
    case BuiltinType::ObjCId:
      Out << "11objc_object";
      break;
-@@ -2614,7 +2894,11 @@
+@@ -2620,7 +2900,11 @@
  
  void CXXNameMangler::mangleType(const TemplateSpecializationType *T) {
    if (TemplateDecl *TD = T->getTemplateName().getAsTemplateDecl()) {
@@ -908,7 +908,7 @@ Index: lib/AST/ItaniumMangle.cpp
    } else {
      if (mangleSubstitution(QualType(T, 0)))
        return;
-@@ -2940,12 +3224,14 @@
+@@ -2946,12 +3230,14 @@
    case Expr::PseudoObjectExprClass:
    case Expr::AtomicExprClass:
    {
@@ -929,7 +929,7 @@ Index: lib/AST/ItaniumMangle.cpp
      break;
    }
  
-@@ -4088,6 +4374,97 @@
+@@ -4094,6 +4380,97 @@
    Substitutions[Ptr] = SeqID++;
  }
  
@@ -1027,7 +1027,7 @@ Index: lib/AST/ItaniumMangle.cpp
  //
  
  /// Mangles the name of the declaration D and emits that name to the given
-@@ -4189,6 +4566,8 @@
+@@ -4195,6 +4572,8 @@
    //  <special-name> ::= GV <object name>       # Guard variable for one-time
    //                                            # initialization
    CXXNameMangler Mangler(*this, Out);
@@ -1040,7 +1040,7 @@ Index: lib/Sema/SemaDeclAttr.cpp
 ===================================================================
 --- lib/Sema/SemaDeclAttr.cpp
 +++ lib/Sema/SemaDeclAttr.cpp
-@@ -4694,10 +4694,6 @@
+@@ -4700,10 +4700,6 @@
    D->addAttr(::new (S.Context)
               AbiTagAttr(Attr.getRange(), S.Context, Tags.data(), Tags.size(),
                          Attr.getAttributeSpellingListIndex()));
@@ -1055,8 +1055,10 @@ Index: test/CodeGenCXX/mangle-abi-tag.cpp
 ===================================================================
 --- /dev/null
 +++ test/CodeGenCXX/mangle-abi-tag.cpp
-@@ -0,0 +1,144 @@
+@@ -0,0 +1,146 @@
 +// RUN: %clang_cc1 %s -emit-llvm -triple %itanium_abi_triple -std=c++11 -o - | FileCheck %s
++// RUN: %clang_cc1 %s -emit-llvm -triple i686-linux-gnu -std=c++11 -o - | FileCheck %s
++// RUN: %clang_cc1 %s -emit-llvm -triple x86_64-linux-gnu -std=c++11 -o - | FileCheck %s
 +
 +struct __attribute__((abi_tag("A", "B"))) A { };
 +
@@ -1170,13 +1172,13 @@ Index: test/CodeGenCXX/mangle-abi-tag.cpp
 +    class C1 {};
 +}
 +C1 f9() { return C1(); }
-+// CHECK: @_Z2f9B6Names1v()
++// CHECK: @_Z2f9B6Names1v(
 +
 +inline namespace Names2 __attribute__((__abi_tag__("Tag1", "Tag2"))) {
 +    class C2 {};
 +}
 +C2 f10() { return C2(); }
-+// CHECK: @_Z3f10B4Tag1B4Tag2v()
++// CHECK: @_Z3f10B4Tag1B4Tag2v(
 +
 +void __attribute__((abi_tag("A"))) f11(A) {}
 +// f11[abi:A](A[abi:A][abi:B])
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index e2659b4da..bcdde95b7 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -16,7 +16,7 @@
 #  - v8: disable lldb, unsupported architecture
 
 pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'lldb' 'clang' 'clang-tools-extra')
-pkgver=3.8.0
+pkgver=3.8.1
 pkgrel=1
 _ocaml_ver=4.02.3
 arch=('i686' 'x86_64')
@@ -36,21 +36,22 @@ source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
         D18035-PR23529-Mangler-part-of-attrbute-abi_tag-support.patch
         llvm-Config-llvm-config.h
         remove-threadpool.patch)
-sha256sums=('555b028e9ee0f6445ff8f949ea10e9cd8be0d084840e21fbbe1d31d51fc06e46'
+sha256sums=('6e82ce4adb54ff3afc18053d6981b6aed1406751b8742582ed50f04b5ab475f9'
             'SKIP'
-            '04149236de03cf05232d68eb7cb9c50f03062e339b68f4f8a03b650a11536cf9'
+            '4cd3836dfb4b88b597e075341cae86d61c63ce3963e45c7fe6a8bf59bb382cdf'
             'SKIP'
-            'afbda810106a6e64444bc164b921be928af46829117c95b996f2678ce4cb1ec4'
+            '664a5c60220de9c290bf2a5b03d902ab731a4f95fe73a00856175ead494ec396'
             'SKIP'
-            'c8d3387e55f229543dac1941769120f24dc50183150bf19d1b070d53d29d56b0'
+            '0df011dae14d8700499dfc961602ee0a9572fef926202ade5dcdfe7858411e5c'
             'SKIP'
-            'e3f68f44147df0433e7989bf6ed1c58ff28d7c68b9c47553cb9915f744785a35'
+            '349148116a47e39dcb5d5042f10d8a6357d2c865034563283ca512f81cdce8a3'
             'SKIP'
             '406754764e83d58bc3b859ab4b7893abd48c760278c4619cf4341ef9b9b75c85'
-            'd2ea6d06352d378961a6970cdefb23ef1ba8e4c046c0ace0c479e2dd674aabce'
+            'd71f8677882c86accddb8a5b720f298a4d7a2ad3bce6091951a46396b8f14da1'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48'
             'ea686a21076aeefdb81af22ab7e5d786e4f6d490507320275f443d8bcf663040')
-validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D')
+validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D'
+              '11E521D646982372EB577A1F8F0871F202119294')
 
 prepare() {
   cd "$srcdir/llvm-$pkgver.src"
@@ -113,8 +114,7 @@ build() {
 check() {
   cd "$srcdir/llvm-$pkgver.src/build"
   make check
-  make check-clang || { [[ $CARCH == i686 ]] && warning \
-    'Ignoring clang test failures caused by name mangling differences'; }
+  make check-clang
 }
 
 package_llvm() {