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

Evangelos Foutras foutrelis at archlinux.org
Mon Oct 12 20:17:25 UTC 2020


    Date: Monday, October 12, 2020 @ 20:17:24
  Author: foutrelis
Revision: 723725

upgpkg: lib32-clang 11.0.0-1: new upstream release

Modified:
  lib32-clang/trunk/PKGBUILD
  lib32-clang/trunk/enable-SSP-and-PIE-by-default.patch

-------------------------------------+
 PKGBUILD                            |   22 ++++++-----------
 enable-SSP-and-PIE-by-default.patch |   42 +++++++++++++++++-----------------
 2 files changed, 29 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-12 20:09:41 UTC (rev 723724)
+++ PKGBUILD	2020-10-12 20:17:24 UTC (rev 723725)
@@ -2,12 +2,12 @@
 # Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
 
 pkgname=lib32-clang
-pkgver=10.0.1
+pkgver=11.0.0
 pkgrel=1
 pkgdesc="C language family frontend for LLVM (32-bit)"
 arch=('x86_64')
 url="https://clang.llvm.org/"
-license=('custom:Apache 2.0 with LLVM Execption')
+license=('custom:Apache 2.0 with LLVM Exception')
 depends=('lib32-llvm-libs' 'gcc-multilib')
 makedepends=('lib32-llvm' 'cmake' 'ninja' 'python')
 _source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver
@@ -14,11 +14,11 @@
 source=($_source_base/clang-$pkgver.src.tar.xz{,.sig}
         $_source_base/llvm-$pkgver.src.tar.xz{,.sig}
         enable-SSP-and-PIE-by-default.patch)
-sha256sums=('f99afc382b88e622c689b6d96cadfa6241ef55dca90e87fc170352e12ddb2b24'
+sha256sums=('0f96acace1e8326b39f220ba19e055ba99b0ab21c2475042dbc6a482649c5209'
             'SKIP'
-            'c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3'
+            '913f68c898dfb4a03b397c5e11c6a2f39d0f22ed7665c9cefa87a34423a72469'
             'SKIP'
-            '9e557a18f3ca96cc5cc9b62d2e308b993025523b2aca0735248118a928c8c3ff')
+            '248a0e8609b00689e82ce5e05e1de58b7c8ae09a35bbb9625e9069e1f13d2fec')
 validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
 validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar at redhat.com>
 
@@ -31,6 +31,9 @@
       clang-libraries|distribution)
         continue
         ;;
+      clang-tidy-headers)
+        continue
+        ;;
       clang|clangd|clang-*)
         ;;
       clang*|findAllSymbols)
@@ -45,15 +48,6 @@
   cd "$srcdir/clang-$pkgver.src"
   mkdir build
   patch -Np2 -i ../enable-SSP-and-PIE-by-default.patch
-
-  if [[ $pkgver != 10.* ]]; then
-    echo "Remove libclangHandleLLVM hack!"
-    return 1
-  fi
-  # Remove libclangHandleLLVM; breaks zig (https://reviews.llvm.org/D75579)
-  # (copied from extra/clang; might not apply here but better safe than sorry)
-  sed -i '/add_clang_subdirectory(handle-llvm)/d' \
-    tools/clang-fuzzer/CMakeLists.txt
 }
 
 build() {

Modified: enable-SSP-and-PIE-by-default.patch
===================================================================
--- enable-SSP-and-PIE-by-default.patch	2020-10-12 20:09:41 UTC (rev 723724)
+++ enable-SSP-and-PIE-by-default.patch	2020-10-12 20:17:24 UTC (rev 723725)
@@ -1,6 +1,6 @@
-From 9641fc2459b07c806c1e4d2a2345213ee6c2bafd Mon Sep 17 00:00:00 2001
+From bb7bdc61f8a80db9aa16370d9c9fd0ae7be825cc Mon Sep 17 00:00:00 2001
 From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Sat, 11 Apr 2020 06:52:09 +0300
+Date: Mon, 12 Oct 2020 16:40:41 +0300
 Subject: [PATCH] Enable SSP and PIE by default
 
 This is a minimal set of changes needed to make clang use SSP and PIE by
@@ -33,10 +33,10 @@
  13 files changed, 50 insertions(+), 35 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index bff1ab1009b..da54a08657d 100644
+index 180350476c3..119f32ceec6 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -917,8 +917,18 @@ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs,
+@@ -819,8 +819,18 @@ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs,
  }
  
  bool Linux::isPIEDefault() const {
@@ -58,10 +58,10 @@
  
  bool Linux::isNoExecStackDefault() const {
 diff --git a/clang/lib/Driver/ToolChains/Linux.h b/clang/lib/Driver/ToolChains/Linux.h
-index f5518eac218..2d4973cf40c 100644
+index 6b16b0e6499..d0024110aef 100644
 --- a/clang/lib/Driver/ToolChains/Linux.h
 +++ b/clang/lib/Driver/ToolChains/Linux.h
-@@ -37,6 +37,7 @@ public:
+@@ -39,6 +39,7 @@ public:
    bool isPIEDefault() const override;
    bool isNoExecStackDefault() const override;
    bool IsMathErrnoDefault() const override;
@@ -131,10 +131,10 @@
  // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib"
  // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../.."
 diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
-index f02f94d8c5a..358917588c7 100644
+index 7340bfb35e4..681bb90b50e 100644
 --- a/clang/test/Driver/fsanitize.c
 +++ b/clang/test/Driver/fsanitize.c
-@@ -328,15 +328,15 @@
+@@ -329,15 +329,15 @@
  // RUN: %clang -target x86_64-linux-gnu -fsanitize=vptr -fno-sanitize=vptr -fsanitize=undefined,address %s -### 2>&1
  // OK
  
@@ -154,7 +154,7 @@
  
  // CHECK-NO-PIE-NOT: "-pie"
  // CHECK-NO-PIE: "-mrelocation-model" "static"
-@@ -661,12 +661,12 @@
+@@ -662,12 +662,12 @@
  // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
  // NOSP-NOT: "-fsanitize=safe-stack"
  
@@ -183,10 +183,10 @@
  // CHECK: "-L[[TOOLCHAIN]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5"
  // CHECK: "-L[[TOOLCHAIN]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../.."
 diff --git a/clang/test/Driver/hexagon-toolchain-elf.c b/clang/test/Driver/hexagon-toolchain-elf.c
-index 44bff6f703a..6575d032f5d 100644
+index cc11f9fcba9..1fe8b5db587 100644
 --- a/clang/test/Driver/hexagon-toolchain-elf.c
 +++ b/clang/test/Driver/hexagon-toolchain-elf.c
-@@ -470,7 +470,7 @@
+@@ -487,7 +487,7 @@
  // RUN:   %s 2>&1 \
  // RUN:   | FileCheck -check-prefix=CHECK042 %s
  // CHECK042:      "-cc1"
@@ -196,7 +196,7 @@
  // CHECK042-NEXT: llvm-mc
  // CHECK042:      "-gpsize=8"
 diff --git a/clang/test/Driver/linux-as.c b/clang/test/Driver/linux-as.c
-index 77ac05f3094..cb474f32898 100644
+index 0959bd7ba0a..4056a672b6f 100644
 --- a/clang/test/Driver/linux-as.c
 +++ b/clang/test/Driver/linux-as.c
 @@ -164,7 +164,7 @@
@@ -218,7 +218,7 @@
  // CHECK-SPARCV9PIC: as
  // CHECK-SPARCV9PIC: -64
 diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c
-index 51227550b52..d01d6627131 100644
+index ec539522c25..caf96020a15 100644
 --- a/clang/test/Driver/linux-ld.c
 +++ b/clang/test/Driver/linux-ld.c
 @@ -1,3 +1,5 @@
@@ -228,7 +228,7 @@
  // sysroot to make these tests independent of the host system.
  //
 diff --git a/clang/test/Driver/ppc-abi.c b/clang/test/Driver/ppc-abi.c
-index acc4981a2ee..50c798912d3 100644
+index aef8d8576ad..ec595f4cd96 100644
 --- a/clang/test/Driver/ppc-abi.c
 +++ b/clang/test/Driver/ppc-abi.c
 @@ -1,9 +1,9 @@
@@ -255,7 +255,7 @@
  
  // RUN: %clang -target powerpc64le-unknown-linux-gnu %s -### -o %t.o 2>&1 \
  // RUN:   | FileCheck -check-prefix=CHECK-ELFv2 %s
-@@ -32,11 +32,13 @@
+@@ -33,11 +33,13 @@
  
  // CHECK-ELFv1: "-mrelocation-model" "static"
  // CHECK-ELFv1: "-target-abi" "elfv1"
@@ -273,10 +273,10 @@
  // CHECK-ELFv2-BE: "-mrelocation-model" "static"
  // CHECK-ELFv2-BE: "-target-abi" "elfv2"
 diff --git a/clang/test/Driver/riscv32-toolchain.c b/clang/test/Driver/riscv32-toolchain.c
-index 2ff3a585bda..f923b728c0f 100644
+index b83c9aafcbf..15b6f6496b2 100644
 --- a/clang/test/Driver/riscv32-toolchain.c
 +++ b/clang/test/Driver/riscv32-toolchain.c
-@@ -76,7 +76,7 @@
+@@ -81,7 +81,7 @@
  // C-RV32-LINUX-MULTI-ILP32: "--sysroot={{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot"
  // C-RV32-LINUX-MULTI-ILP32: "-m" "elf32lriscv"
  // C-RV32-LINUX-MULTI-ILP32: "-dynamic-linker" "/lib/ld-linux-riscv32-ilp32.so.1"
@@ -285,7 +285,7 @@
  // C-RV32-LINUX-MULTI-ILP32: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib32/ilp32"
  // C-RV32-LINUX-MULTI-ILP32: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/lib32/ilp32"
  // C-RV32-LINUX-MULTI-ILP32: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/usr/lib32/ilp32"
-@@ -91,7 +91,7 @@
+@@ -96,7 +96,7 @@
  // C-RV32-LINUX-MULTI-ILP32D: "--sysroot={{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot"
  // C-RV32-LINUX-MULTI-ILP32D: "-m" "elf32lriscv"
  // C-RV32-LINUX-MULTI-ILP32D: "-dynamic-linker" "/lib/ld-linux-riscv32-ilp32d.so.1"
@@ -295,10 +295,10 @@
  // C-RV32-LINUX-MULTI-ILP32D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/lib32/ilp32d"
  // C-RV32-LINUX-MULTI-ILP32D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/usr/lib32/ilp32d"
 diff --git a/clang/test/Driver/riscv64-toolchain.c b/clang/test/Driver/riscv64-toolchain.c
-index 42cac51de59..42a05e02fcc 100644
+index 5df069eb9fd..2617551ec35 100644
 --- a/clang/test/Driver/riscv64-toolchain.c
 +++ b/clang/test/Driver/riscv64-toolchain.c
-@@ -76,7 +76,7 @@
+@@ -81,7 +81,7 @@
  // C-RV64-LINUX-MULTI-LP64: "--sysroot={{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot"
  // C-RV64-LINUX-MULTI-LP64: "-m" "elf64lriscv"
  // C-RV64-LINUX-MULTI-LP64: "-dynamic-linker" "/lib/ld-linux-riscv64-lp64.so.1"
@@ -307,7 +307,7 @@
  // C-RV64-LINUX-MULTI-LP64: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib64/lp64"
  // C-RV64-LINUX-MULTI-LP64: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/lib64/lp64"
  // C-RV64-LINUX-MULTI-LP64: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/usr/lib64/lp64"
-@@ -91,7 +91,7 @@
+@@ -96,7 +96,7 @@
  // C-RV64-LINUX-MULTI-LP64D: "--sysroot={{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot"
  // C-RV64-LINUX-MULTI-LP64D: "-m" "elf64lriscv"
  // C-RV64-LINUX-MULTI-LP64D: "-dynamic-linker" "/lib/ld-linux-riscv64-lp64d.so.1"



More information about the arch-commits mailing list