[arch-commits] Commit in clang/trunk (3 files)

Evangelos Foutras foutrelis at archlinux.org
Sun Dec 29 23:11:56 UTC 2019


    Date: Sunday, December 29, 2019 @ 23:11:56
  Author: foutrelis
Revision: 372344

upgpkg: clang 9.0.1-1: New upstream release.

Modified:
  clang/trunk/PKGBUILD
Deleted:
  clang/trunk/0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
  clang/trunk/0001-Initialize-all-fields-in-ABIArgInfo.patch

-----------------------------------------------------------------+
 0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch |   32 --------
 0001-Initialize-all-fields-in-ABIArgInfo.patch                  |   40 ----------
 PKGBUILD                                                        |   40 ++++------
 3 files changed, 18 insertions(+), 94 deletions(-)

Deleted: 0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
===================================================================
--- 0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch	2019-12-29 22:53:54 UTC (rev 372343)
+++ 0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch	2019-12-29 23:11:56 UTC (rev 372344)
@@ -1,32 +0,0 @@
-From 8ea70c9ede7ac82d9363c122a9a84aded054984c Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar at redhat.com>
-Date: Mon, 30 Sep 2019 23:42:17 +0000
-Subject: [PATCH] Fix Driver/modules.cpp test to work when build directory name
- contains '.s'
-
-Reviewers: dyung, rsmith, hansw
-
-Subscribers: mati865, mgorny, cfe-commits
-
-Tags: #clang
-
-Differential Revision: https://reviews.llvm.org/D66176
-
-git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@373275 91177308-0d34-0410-b5e6-96231b3b80d8
----
- test/Driver/modules.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/Driver/modules.cpp b/test/Driver/modules.cpp
-index 7c549c1300..4f4e3a4140 100644
---- a/test/Driver/modules.cpp
-+++ b/test/Driver/modules.cpp
-@@ -15,7 +15,7 @@
- // RUN: %clang -std=c++2a %t/module.pcm -S -o %t/module.pcm.o -v 2>&1 | FileCheck %s --check-prefix=CHECK-COMPILE
- //
- // CHECK-COMPILE: -cc1 {{.*}} {{-emit-obj|-S}}
--// CHECK-COMPILE-SAME: -o {{.*}}.{{pcm.o|s}}
-+// CHECK-COMPILE-SAME: -o {{.*}}module{{2*}}.pcm.o
- // CHECK-COMPILE-SAME: -x pcm
- // CHECK-COMPILE-SAME: {{.*}}.pcm
- 

Deleted: 0001-Initialize-all-fields-in-ABIArgInfo.patch
===================================================================
--- 0001-Initialize-all-fields-in-ABIArgInfo.patch	2019-12-29 22:53:54 UTC (rev 372343)
+++ 0001-Initialize-all-fields-in-ABIArgInfo.patch	2019-12-29 23:11:56 UTC (rev 372344)
@@ -1,40 +0,0 @@
-From a1445cd0340006d7635101c4c2b27ae51328642c Mon Sep 17 00:00:00 2001
-From: Serge Guelton <sguelton at redhat.com>
-Date: Thu, 19 Sep 2019 00:54:40 +0000
-Subject: [PATCH] Initialize all fields in ABIArgInfo.
-
-Due to usage of an uninitialized fields, we end up with
-a Conditional jump or move depends on uninitialised value
-
-Fixes https://bugs.llvm.org/show_bug.cgi?id=40547
-
-Commited on behalf of Martin Liska <mliska at suse.cz>
-
-git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@372281 91177308-0d34-0410-b5e6-96231b3b80d8
----
- include/clang/CodeGen/CGFunctionInfo.h | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/include/clang/CodeGen/CGFunctionInfo.h b/include/clang/CodeGen/CGFunctionInfo.h
-index 1f81072e23d0..5069d9af42a3 100644
---- a/include/clang/CodeGen/CGFunctionInfo.h
-+++ b/include/clang/CodeGen/CGFunctionInfo.h
-@@ -109,14 +109,12 @@ class ABIArgInfo {
-     UnpaddedCoerceAndExpandType = T;
-   }
- 
--  ABIArgInfo(Kind K)
--      : TheKind(K), PaddingInReg(false), InReg(false) {
--  }
--
- public:
--  ABIArgInfo()
-+  ABIArgInfo(Kind K = Direct)
-       : TypeData(nullptr), PaddingType(nullptr), DirectOffset(0),
--        TheKind(Direct), PaddingInReg(false), InReg(false) {}
-+        TheKind(K), PaddingInReg(false), InAllocaSRet(false),
-+        IndirectByVal(false), IndirectRealign(false), SRetAfterThis(false),
-+        InReg(false), CanBeFlattened(false), SignExt(false) {}
- 
-   static ABIArgInfo getDirect(llvm::Type *T = nullptr, unsigned Offset = 0,
-                               llvm::Type *Padding = nullptr,

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-29 22:53:54 UTC (rev 372343)
+++ PKGBUILD	2019-12-29 23:11:56 UTC (rev 372344)
@@ -2,8 +2,8 @@
 # Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
 
 pkgname=clang
-pkgver=9.0.0
-pkgrel=3
+pkgver=9.0.1
+pkgrel=1
 pkgdesc="C language family frontend for LLVM"
 arch=('x86_64')
 url="https://clang.llvm.org/"
@@ -16,42 +16,38 @@
 provides=("clang-analyzer=$pkgver" "clang-tools-extra=$pkgver")
 conflicts=('clang-analyzer' 'clang-tools-extra')
 replaces=('clang-analyzer' 'clang-tools-extra')
-source=(https://releases.llvm.org/$pkgver/cfe-$pkgver.src.tar.xz{,.sig}
-        https://releases.llvm.org/$pkgver/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
-        https://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
-        0001-Initialize-all-fields-in-ABIArgInfo.patch
-        0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
+
+_source_base=https://releases.llvm.org/$pkgver
+if [[ ${pkgver##*.} != 0 ]]; then
+  _source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver
+fi
+
+source=($_source_base/$pkgname-$pkgver.src.tar.xz{,.sig}
+        $_source_base/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
+        $_source_base/llvm-$pkgver.src.tar.xz{,.sig}
         enable-SSP-and-PIE-by-default.patch)
-sha256sums=('7ba81eef7c22ca5da688fdf9d88c20934d2d6b40bfe150ffd338900890aa4610'
+sha256sums=('5778512b2e065c204010f88777d44b95250671103e434f9dc7363ab2e3804253'
             'SKIP'
-            'ea1c86ce352992d7b6f6649bc622f6a2707b9f8b7153e9f9181a35c76aa3ac10'
+            'b26fd72a78bd7db998a26270ec9ec6a01346651d88fa87b4b323e13049fb6f07'
             'SKIP'
-            'd6a0565cf21f22e9b4353b2eb92622e8365000a9e90a16b09b56f8157eabfe84'
+            '00a1ee1f389f81e9979f3a640a01c431b3021de0d42278f6508391a2f0b81c9a'
             'SKIP'
-            '9245955509841e031f4c8169c2207b3029e8af9e30a39e662ac1bfd9d6186a51'
-            '72a15c9825a1f5c73cc4f04c831bf3a12620db90922af299599f029aab0d27f0'
             'fde58a4902bec3715bc3d0c9250fa4c5f241af90bfd1e46f7128fa1435c03026')
 validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
 validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar at redhat.com>
 
 prepare() {
-  cd "$srcdir/cfe-$pkgver.src"
+  cd "$srcdir/$pkgname-$pkgver.src"
   mkdir build
   mv "$srcdir/clang-tools-extra-$pkgver.src" tools/extra
   patch -Np1 -i ../enable-SSP-and-PIE-by-default.patch
 
-  # https://bugs.llvm.org/show_bug.cgi?id=40547
-  patch -Np1 -i ../0001-Initialize-all-fields-in-ABIArgInfo.patch
-
-  # https://reviews.llvm.org/D66176
-  patch -Np1 -i ../0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
-
   # Avoid shipping libclang-cpp before removing BUILD_SHARED_LIBS=ON
   sed -i '/add_clang_subdirectory(clang-shlib)/d' tools/CMakeLists.txt
 }
 
 build() {
-  cd "$srcdir/cfe-$pkgver.src/build"
+  cd "$srcdir/$pkgname-$pkgver.src/build"
 
   # Upstream strongly recommends against BUILD_SHARED_LIBS=ON for distro
   # builds but CLANG_LINK_CLANG_DYLIB=ON is not yet supported by clang's
@@ -76,7 +72,7 @@
 }
 
 check() {
-  cd "$srcdir/cfe-$pkgver.src/build"
+  cd "$srcdir/$pkgname-$pkgver.src/build"
   ninja check-clang{,-tools}
 }
 
@@ -92,7 +88,7 @@
 }
 
 package() {
-  cd "$srcdir/cfe-$pkgver.src/build"
+  cd "$srcdir/$pkgname-$pkgver.src/build"
 
   DESTDIR="$pkgdir" ninja install
   install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"



More information about the arch-commits mailing list