diff --git a/clang/PKGBUILD b/clang/PKGBUILD index 315277b629..be47bd43cf 100644 --- a/clang/PKGBUILD +++ b/clang/PKGBUILD @@ -1,16 +1,16 @@ # POWER Maintainer: Alexander Baldeck -# Maintainer: Evangelos Foutras +# Maintainer: Evangelos Foutras # Contributor: Jan "heftig" Steffens pkgname=clang -pkgver=17.0.6 -pkgrel=2 +pkgver=18.1.8 +pkgrel=1 pkgdesc="C language family frontend for LLVM" arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url="https://clang.llvm.org/" -license=('custom:Apache 2.0 with LLVM Exception') +license=('Apache-2.0 WITH LLVM-exception') depends=('llvm-libs' 'gcc' 'compiler-rt') -makedepends=('llvm' 'cmake' 'ninja' 'python-sphinx' 'python-recommonmark') +makedepends=('llvm' 'cmake' 'ninja' 'python-sphinx' 'python-myst-parser') optdepends=('openmp: OpenMP support in clang with -fopenmp' 'python: for scan-view and git-clang-format' 'llvm: referenced by some clang headers') @@ -28,23 +28,22 @@ source=($_source_base/clang-$pkgver.src.tar.xz{,.sig} clang-ppc64-elfv2.patch llvm-ppc64-elfv2.patch clang-ppc64-dynamic-linker-path.patch) -sha256sums=('a78f668a726ae1d3d9a7179996d97b12b90fb76ab9442a43110b972ff7ad9029' +sha256sums=('5724fe0a13087d5579104cedd2f8b3bc10a212fb79a0fcdac98f4880e19f4519' 'SKIP' - 'aa774642415d338d7b77a66fcbad6fd1f77f382dabcb67422a6230614eff1ab9' + 'e58877fcd95ed106824bd1a31276dd17ed0c53adcd60ca75289eac0654f0a7f1' 'SKIP' - 'b638167da139126ca11917b6880207cc6e8f9d1cbb1a48d87d017f697ef78188' + 'f68cf90f369bc7d0158ba70d860b0cb34dbc163d6ff0ebc6cfa5e515b9b2e28d' 'SKIP' - '807f069c54dc20cb47b21c1f6acafdd9c649f3ae015609040d6182cab01140f4' + '59badef592dd34893cd319d42b323aaa990b452d05c7180ff20f23ab1b41e837' 'SKIP' - '3054d0a9c9375dab1a4539cc2cc45ab340341c5d71475f9599ba7752e222947b' + 'b76b810f3d3dc5d08e83c4236cb6e395aa9bd5e3ea861e8c319b216d093db074' 'SKIP' 'c102e8a6a2adb0e8729865ffb8799b22bb8a9bdf0f421991880fa4393378370a' - '45da5783f4e89e4507a351ed0ffbbe6ec240e21ff7070797a89c5ccf434ac612' + 'ef319e65f927718e1d3b1a23c480d686b1d292e2a0bf27229540964f9734117a' '8483b3bfaa31bee7a074bc83a1c7b7fec4cc6579836edb2802348b1340df3e41' '8c4e8db0b80b1a86f8cff9aa678b70458503bc8926ecc41e0df953ea14ab3559' '654b9eafcd20125319b3c319ab6674a940ddef400821c80813c16011ef8b6086') -validpgpkeys=('474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard - 'D574BD5D1D0E98895E3BF90044F2485E45D59042') # Tobias Hieta +validpgpkeys=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard # Utilizing LLVM_DISTRIBUTION_COMPONENTS to avoid # installing static libraries; inspired by Gentoo @@ -79,14 +78,14 @@ prepare() { sed 's|clang-tools-extra|clang/tools/extra|' \ clangd-handle-missing-ending-brace.patch | patch -Np2 + # Attempt to convert script to Python 3 + 2to3 -wn --no-diffs \ + tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py + # powerpc64 uses ELFv2 patch -Np0 -i ../clang-ppc64-elfv2.patch patch -Np2 -i ../clang-ppc64-dynamic-linker-path.patch patch -Np2 -d "$srcdir/llvm-$pkgver.src" -i ../llvm-ppc64-elfv2.patch - - # Attempt to convert script to Python 3 - 2to3 -wn --no-diffs \ - tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py } build() { diff --git a/clang/enable-fstack-protector-strong-by-default.patch b/clang/enable-fstack-protector-strong-by-default.patch index ba2a298f25..7c7fc3110a 100644 --- a/clang/enable-fstack-protector-strong-by-default.patch +++ b/clang/enable-fstack-protector-strong-by-default.patch @@ -1,6 +1,6 @@ -From 5346dc41bee9546db1fc649f39f1c44629495cc5 Mon Sep 17 00:00:00 2001 +From 669e0924afcedf27350469a944267cad4aabb866 Mon Sep 17 00:00:00 2001 From: Evangelos Foutras -Date: Fri, 18 Aug 2023 13:31:57 +0000 +Date: Sun, 30 Jun 2024 08:51:20 +0000 Subject: [PATCH] Enable -fstack-protector-strong by default --- @@ -33,25 +33,25 @@ index 524391743090..0d4e1944118b 100644 void addProfileRTLibs(const llvm::opt::ArgList &Args, llvm::opt::ArgStringList &CmdArgs) const override; diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c -index 8ad6dc25b4d1..1619b59a40f0 100644 +index 1671825042c3..5d8ac7009f8c 100644 --- a/clang/test/Driver/fsanitize.c +++ b/clang/test/Driver/fsanitize.c -@@ -695,12 +695,12 @@ +@@ -700,12 +700,12 @@ // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP // NOSP-NOT: "-fsanitize=safe-stack" -// RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP +// RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP - // RUN: %clang --target=x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN + // RUN: not %clang --target=x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN // RUN: %clang --target=x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP // RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP -// RUN: %clang --target=arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP -// RUN: %clang --target=aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP +// RUN: %clang --target=arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP +// RUN: %clang --target=aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP - // RUN: %clang --target=i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP // NO-SP-NOT: stack-protector // NO-SP: "-fsanitize=safe-stack" + // SP-ASAN: error: invalid argument '-fsanitize=safe-stack' not allowed with '-fsanitize=address' diff --git a/clang/test/Driver/stack-protector.c b/clang/test/Driver/stack-protector.c index 169376919a71..2470b7f7e39e 100644 --- a/clang/test/Driver/stack-protector.c