[arch-commits] Commit in clang/trunk (10 files)
Evangelos Foutras
foutrelis at gemini.archlinux.org
Tue Jun 21 23:13:56 UTC 2022
Date: Tuesday, June 21, 2022 @ 23:13:56
Author: foutrelis
Revision: 449257
upgpkg: clang 14.0.5-1: new upstream release
Added:
clang/trunk/clang-tidy-fix-standalone-build.patch
clang/trunk/enable-fstack-protector-strong-by-default.patch
clang/trunk/keys/
clang/trunk/keys/pgp/
clang/trunk/keys/pgp/474E22316ABF4785A88C6E8EA2C794A986419D8A.asc
clang/trunk/keys/pgp/B6C8F98282B944E3B0D5C2530FC3042E345AD05D.asc
Modified:
clang/trunk/PKGBUILD
Deleted:
clang/trunk/enable-SSP-and-PIE-by-default.patch
clang/trunk/fix-scan-build-py-executable-lookup-path.patch
clang/trunk/strip-exception-specifications-in-CFI-type-names.patch
--------------------------------------------------------+
PKGBUILD | 40 -
clang-tidy-fix-standalone-build.patch | 8
enable-SSP-and-PIE-by-default.patch | 374 ---------------
enable-fstack-protector-strong-by-default.patch | 72 ++
fix-scan-build-py-executable-lookup-path.patch | 31 -
keys/pgp/474E22316ABF4785A88C6E8EA2C794A986419D8A.asc | 1
keys/pgp/B6C8F98282B944E3B0D5C2530FC3042E345AD05D.asc | 1
strip-exception-specifications-in-CFI-type-names.patch | 59 --
8 files changed, 102 insertions(+), 484 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-06-21 23:01:44 UTC (rev 449256)
+++ PKGBUILD 2022-06-21 23:13:56 UTC (rev 449257)
@@ -2,14 +2,14 @@
# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
pkgname=clang
-pkgver=13.0.1
-pkgrel=2
+pkgver=14.0.5
+pkgrel=1
pkgdesc="C language family frontend for LLVM"
arch=('x86_64')
url="https://clang.llvm.org/"
license=('custom:Apache 2.0 with LLVM Exception')
depends=('llvm-libs' 'gcc' 'compiler-rt')
-makedepends=('llvm' 'cmake' 'ninja' 'python-sphinx')
+makedepends=('llvm' 'cmake' 'ninja' 'python-sphinx' 'python-recommonmark')
optdepends=('openmp: OpenMP support in clang with -fopenmp'
'python: for scan-view and git-clang-format'
'llvm: referenced by some clang headers')
@@ -17,21 +17,19 @@
conflicts=('clang-analyzer' 'clang-tools-extra')
replaces=('clang-analyzer' 'clang-tools-extra')
_source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver
-source=($_source_base/$pkgname-$pkgver.src.tar.xz{,.sig}
+source=($_source_base/clang-$pkgver.src.tar.xz{,.sig}
$_source_base/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
$_source_base/llvm-$pkgver.src.tar.xz{,.sig}
- fix-scan-build-py-executable-lookup-path.patch
- strip-exception-specifications-in-CFI-type-names.patch
- enable-SSP-and-PIE-by-default.patch)
-sha256sums=('787a9e2d99f5c8720aa1773e4be009461cd30d3bd40fdd24591e473467c917c9'
+ clang-tidy-fix-standalone-build.patch
+ enable-fstack-protector-strong-by-default.patch)
+sha256sums=('a8e2e3ce217f4c2682c3fe2d2691f826cf1f0ab0a1dff4b5b8f6264baa1f2a79'
'SKIP'
- 'cc2bc8598848513fa2257a270083e986fd61048347eccf1d801926ea709392d0'
+ '443d7d3dc1e2a39e36b4a99989065e0328da788e4df96fd359d60fce962b3edd'
'SKIP'
- 'ec6b80d82c384acad2dc192903a6cf2cdbaffb889b84bfb98da9d71e630fc834'
+ '234c8ed02ed1338aa4f0ffa955e45eb13abe7ba0032569d6bc17ae9334257b02'
'SKIP'
- '578b960121c42b8db80566dcb51558409d04455b618cdd608e41b35ded36c13e'
- '3f4a2784a4c2b2df13e03beb0b66d5805c520f2b9f16ff76e0557daeb284c8fa'
- '67706047fc93a2e79185d344bdac48219ce042c55ddb9b9397bc98db2153ba58')
+ '081a7ebc1ae524b13fc6be3dc73feb2c9eb7cf4b99f7f13d9ed37a688311f58a'
+ '7a9ce949579a3b02d4b91b6835c4fb45adc5f743007572fb0e28e6433e48f3a5')
validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar at redhat.com>
@@ -58,13 +56,13 @@
}
prepare() {
- cd "$srcdir/$pkgname-$pkgver.src"
+ cd clang-$pkgver.src
mkdir build
mv "$srcdir/clang-tools-extra-$pkgver.src" tools/extra
- patch -Np2 -i ../enable-SSP-and-PIE-by-default.patch
+ patch -Np2 -i ../enable-fstack-protector-strong-by-default.patch
- patch -Np2 -i ../fix-scan-build-py-executable-lookup-path.patch
- patch -Np2 -i ../strip-exception-specifications-in-CFI-type-names.patch
+ # https://github.com/llvm/llvm-project/issues/54116
+ patch -Np0 -i ../clang-tidy-fix-standalone-build.patch
# Attempt to convert script to Python 3
2to3 -wn --no-diffs \
@@ -72,13 +70,15 @@
}
build() {
- cd "$srcdir/$pkgname-$pkgver.src/build"
+ cd clang-$pkgver.src/build
local cmake_args=(
-G Ninja
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_DOCDIR=share/doc
-DCMAKE_SKIP_RPATH=ON
+ -DCLANG_DEFAULT_PIE_ON_LINUX=ON
-DCLANG_LINK_CLANG_DYLIB=ON
-DLLVM_BUILD_DOCS=ON
-DLLVM_BUILD_TESTS=ON
@@ -101,7 +101,7 @@
}
check() {
- cd "$srcdir/$pkgname-$pkgver.src/build"
+ cd clang-$pkgver.src/build
LD_LIBRARY_PATH=$PWD/lib ninja check-clang{,-tools}
}
@@ -112,7 +112,7 @@
}
package() {
- cd "$srcdir/$pkgname-$pkgver.src/build"
+ cd clang-$pkgver.src/build
DESTDIR="$pkgdir" ninja install-distribution
install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
Added: clang-tidy-fix-standalone-build.patch
===================================================================
--- clang-tidy-fix-standalone-build.patch (rev 0)
+++ clang-tidy-fix-standalone-build.patch 2022-06-21 23:13:56 UTC (rev 449257)
@@ -0,0 +1,8 @@
+--- tools/extra/unittests/clang-tidy/ReadabilityModuleTest.cpp.orig 2022-04-24 02:31:36.544185904 +0000
++++ tools/extra/unittests/clang-tidy/ReadabilityModuleTest.cpp 2022-04-24 02:32:20.390088782 +0000
+@@ -1,4 +1,4 @@
+-#include "../../clang/unittests/ASTMatchers/ASTMatchersTest.h"
++#include "../../../../unittests/ASTMatchers/ASTMatchersTest.h"
+ #include "ClangTidyTest.h"
+ #include "readability/BracesAroundStatementsCheck.h"
+ #include "readability/NamespaceCommentCheck.h"
Deleted: enable-SSP-and-PIE-by-default.patch
===================================================================
--- enable-SSP-and-PIE-by-default.patch 2022-06-21 23:01:44 UTC (rev 449256)
+++ enable-SSP-and-PIE-by-default.patch 2022-06-21 23:13:56 UTC (rev 449257)
@@ -1,374 +0,0 @@
-From 683787b5c5c075f53a95f4d85f76302111c89914 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Sat, 23 Oct 2021 05:08:48 +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
-default on Arch Linux. Tests that were easy to adjust have been changed
-accordingly; only test/Driver/linux-ld.c has been marked as "expected
-failure" due to the number of changes it would require (mostly replacing
-crtbegin.o with crtbeginS.o).
-
-Doing so is needed in order to align clang with the new default GCC
-behavior in Arch which generates PIE executables by default and also
-defaults to -fstack-protector-strong. It is not meant to be a long term
-solution, but a simple temporary fix.
-
-Hopefully these changes will be obsoleted by the introduction upstream
-of a compile-time option (https://bugs.llvm.org/show_bug.cgi?id=13410)
----
- clang/lib/Driver/ToolChains/Linux.cpp | 10 ++++++++--
- clang/lib/Driver/ToolChains/Linux.h | 5 +++++
- clang/test/Driver/cross-linux.c | 16 ++++++++--------
- clang/test/Driver/env.c | 2 +-
- clang/test/Driver/fsanitize.c | 14 +++++++-------
- clang/test/Driver/gcc-toolchain.cpp | 6 +++---
- clang/test/Driver/hexagon-toolchain-elf.c | 2 +-
- clang/test/Driver/hip-fpie-option.hip | 4 ++--
- clang/test/Driver/linux-as.c | 4 ++--
- clang/test/Driver/linux-ld.c | 2 ++
- clang/test/Driver/ppc-abi.c | 18 +++++++++++-------
- clang/test/Driver/riscv32-toolchain.c | 4 ++--
- clang/test/Driver/riscv64-toolchain.c | 4 ++--
- clang/test/Driver/stack-protector.c | 4 ++--
- 14 files changed, 56 insertions(+), 39 deletions(-)
-
-diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index c9360fc67165..2b60460e6604 100644
---- a/clang/lib/Driver/ToolChains/Linux.cpp
-+++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -652,8 +652,14 @@ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs,
- }
-
- bool Linux::isPIEDefault() const {
-- return (getTriple().isAndroid() && !getTriple().isAndroidVersionLT(16)) ||
-- getTriple().isMusl() || getSanitizerArgs().requiresPIE();
-+ const bool IsMips = getTriple().isMIPS();
-+ const bool IsAndroid = getTriple().isAndroid();
-+
-+ if (IsMips || IsAndroid)
-+ return (getTriple().isAndroid() && !getTriple().isAndroidVersionLT(16)) ||
-+ getTriple().isMusl() || getSanitizerArgs().requiresPIE();
-+
-+ return true;
- }
-
- bool Linux::IsAArch64OutlineAtomicsDefault(const ArgList &Args) const {
-diff --git a/clang/lib/Driver/ToolChains/Linux.h b/clang/lib/Driver/ToolChains/Linux.h
-index 169a37c44072..a6458092462e 100644
---- a/clang/lib/Driver/ToolChains/Linux.h
-+++ b/clang/lib/Driver/ToolChains/Linux.h
-@@ -10,6 +10,7 @@
- #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_LINUX_H
-
- #include "Gnu.h"
-+#include "clang/Basic/LangOptions.h"
- #include "clang/Driver/ToolChain.h"
-
- namespace clang {
-@@ -46,6 +47,10 @@ public:
- bool isPIEDefault() const override;
- bool isNoExecStackDefault() const override;
- bool IsMathErrnoDefault() const override;
-+ LangOptions::StackProtectorMode
-+ GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
-+ return LangOptions::SSPStrong;
-+ }
- SanitizerMask getSupportedSanitizers() const override;
- void addProfileRTLibs(const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs) const override;
-diff --git a/clang/test/Driver/cross-linux.c b/clang/test/Driver/cross-linux.c
-index 59f5a97d2d9d..8d0e9e724aa0 100644
---- a/clang/test/Driver/cross-linux.c
-+++ b/clang/test/Driver/cross-linux.c
-@@ -43,8 +43,8 @@
- // CHECK-MULTI32-I386: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/10.2.0/../../../../i386-unknown-linux/bin{{/|\\\\}}ld"
- // CHECK-MULTI32-I386: "--sysroot=[[sysroot:.*/Inputs/basic_linux_tree]]"
- // CHECK-MULTI32-I386: "-m" "elf_i386"
--// CHECK-MULTI32-I386: "crti.o" "[[gcc_install:.*/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/10.2.0]]{{/|\\\\}}crtbegin.o"
--// CHECK-MULTI32-I386: "-L[[gcc_install]]"
-+// CHECK-MULTI32-I386: "crti.o" "crtbeginS.o"
-+// CHECK-MULTI32-I386: "-L[[gcc_install:.*/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/10.2.0]]"
- // CHECK-MULTI32-I386: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib/../lib32"
- // CHECK-MULTI32-I386: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib"
- // CHECK-MULTI32-I386: "-L[[sysroot]]/lib"
-@@ -61,8 +61,8 @@
- // CHECK-MULTI32-X86-64: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/10.2.0/../../../../i386-unknown-linux/bin{{/|\\\\}}ld"
- // CHECK-MULTI32-X86-64: "--sysroot=[[sysroot:.*/Inputs/basic_linux_tree]]"
- // CHECK-MULTI32-X86-64: "-m" "elf_x86_64"
--// CHECK-MULTI32-X86-64: "crti.o" "[[gcc_install:.*/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/10.2.0]]/64{{/|\\\\}}crtbegin.o"
--// CHECK-MULTI32-X86-64: "-L[[gcc_install]]/64"
-+// CHECK-MULTI32-X86-64: "crti.o" "crtbeginS.o"
-+// CHECK-MULTI32-X86-64: "-L[[gcc_install:.*/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/10.2.0]]/64"
- // CHECK-MULTI32-X86-64: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib/../lib64"
- // CHECK-MULTI32-X86-64: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib"
- // CHECK-MULTI32-X86-64: "-L[[sysroot]]/lib"
-@@ -79,8 +79,8 @@
- // CHECK-MULTI64-I386: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/10.2.0/../../../../x86_64-unknown-linux/bin{{/|\\\\}}ld"
- // CHECK-MULTI64-I386: "--sysroot=[[sysroot:.*/Inputs/basic_linux_tree]]"
- // CHECK-MULTI64-I386: "-m" "elf_i386"
--// CHECK-MULTI64-I386: "crti.o" "[[gcc_install:.*/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/10.2.0]]/32{{/|\\\\}}crtbegin.o"
--// CHECK-MULTI64-I386: "-L[[gcc_install]]/32"
-+// CHECK-MULTI64-I386: "crti.o" "crtbeginS.o"
-+// CHECK-MULTI64-I386: "-L[[gcc_install:.*/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/10.2.0]]/32"
- // CHECK-MULTI64-I386: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib/../lib32"
- // CHECK-MULTI64-I386: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib"
- // CHECK-MULTI64-I386: "-L[[sysroot]]/lib"
-@@ -97,8 +97,8 @@
- // CHECK-MULTI64-X86-64: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/10.2.0/../../../../x86_64-unknown-linux/bin{{/|\\\\}}ld"
- // CHECK-MULTI64-X86-64: "--sysroot=[[sysroot:.*/Inputs/basic_linux_tree]]"
- // CHECK-MULTI64-X86-64: "-m" "elf_x86_64"
--// CHECK-MULTI64-X86-64: "crti.o" "[[gcc_install:.*/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/10.2.0]]{{/|\\\\}}crtbegin.o"
--// CHECK-MULTI64-X86-64: "-L[[gcc_install]]"
-+// CHECK-MULTI64-X86-64: "crti.o" "crtbeginS.o"
-+// CHECK-MULTI64-X86-64: "-L[[gcc_install:.*/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/10.2.0]]"
- // CHECK-MULTI64-X86-64: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib/../lib64"
- // CHECK-MULTI64-X86-64: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib"
- // CHECK-MULTI64-X86-64: "-L[[sysroot]]/lib"
-diff --git a/clang/test/Driver/env.c b/clang/test/Driver/env.c
-index e9b86cbcf428..47f304c0420d 100644
---- a/clang/test/Driver/env.c
-+++ b/clang/test/Driver/env.c
-@@ -22,7 +22,7 @@
- //
- // CHECK-LD-32-NOT: warning:
- // CHECK-LD-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
--// CHECK-LD-32: "{{.*}}/usr/lib/gcc/i386-unknown-linux/10.2.0{{/|\\\\}}crtbegin.o"
-+// CHECK-LD-32: "crtbeginS.o"
- // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/10.2.0"
- // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/10.2.0/../../../../i386-unknown-linux/lib"
- // CHECK-LD-32: "-L[[SYSROOT]]/lib"
-diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
-index b7d61abe7ec5..461b69b0ac15 100644
---- a/clang/test/Driver/fsanitize.c
-+++ b/clang/test/Driver/fsanitize.c
-@@ -344,15 +344,15 @@
- // RUN: %clang -target x86_64-linux-gnu -fsanitize=vptr -fno-sanitize=vptr -fsanitize=undefined,address %s -### 2>&1
- // OK
-
--// RUN: %clang -target x86_64-linux-gnu -fsanitize=thread %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-NO-PIE
--// RUN: %clang -target x86_64-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-NO-PIE
-+// RUN: %clang -target x86_64-linux-gnu -fsanitize=thread %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
-+// RUN: %clang -target x86_64-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
- // RUN: %clang -target x86_64-unknown-freebsd -fsanitize=memory %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
- // RUN: %clang -target aarch64-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
- // RUN: %clang -target arm-linux-androideabi -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIC-NO-PIE
- // RUN: %clang -target arm-linux-androideabi24 -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
- // RUN: %clang -target aarch64-linux-android -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
--// RUN: %clang -target x86_64-linux-gnu -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-NO-PIE
--// RUN: %clang -target i386-linux-gnu -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-NO-PIE
-+// RUN: %clang -target x86_64-linux-gnu -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
-+// RUN: %clang -target i386-linux-gnu -fsanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-PIE
-
- // CHECK-NO-PIE-NOT: "-pie"
- // CHECK-NO-PIE: "-mrelocation-model" "static"
-@@ -687,12 +687,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: %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"
-diff --git a/clang/test/Driver/gcc-toolchain.cpp b/clang/test/Driver/gcc-toolchain.cpp
-index 7cdba0841b8c..655457d62bf8 100644
---- a/clang/test/Driver/gcc-toolchain.cpp
-+++ b/clang/test/Driver/gcc-toolchain.cpp
-@@ -23,7 +23,7 @@
- // the same precise formatting of the path as the '-internal-system' flags
- // above, so we just blanket wildcard match the 'crtbegin.o'.
- // CHECK: "{{[^"]*}}ld{{(.exe)?}}"
--// CHECK-SAME: "{{[^"]*}}/usr/lib/gcc/x86_64-linux-gnu/4.8{{/|\\\\}}crtbegin.o"
-+// CHECK-SAME: "crtbeginS.o"
- // CHECK-SAME: "-L[[TOOLCHAIN]]/usr/lib/gcc/x86_64-linux-gnu/4.8"
- /// On x86_64, there is an extra usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu but we should not test it.
-
-@@ -35,5 +35,5 @@
- // RUN: --target=aarch64-suse-linux -B%S/Inputs/opensuse_42.2_aarch64_tree/usr | \
- // RUN: FileCheck %s --check-prefix=NO_AARCH64
-
--// AARCH64: Inputs{{[^"]+}}aarch64-suse-linux/{{[^"]+}}crt1.o"
--// NO_AARCH64-NOT: Inputs{{[^"]+}}aarch64-suse-linux/{{[^"]+}}crt1.o"
-+// AARCH64: Inputs{{[^"]+}}aarch64-suse-linux/{{[^"]+}}crti.o"
-+// NO_AARCH64-NOT: Inputs{{[^"]+}}aarch64-suse-linux/{{[^"]+}}crti.o"
-diff --git a/clang/test/Driver/hexagon-toolchain-elf.c b/clang/test/Driver/hexagon-toolchain-elf.c
-index cc11f9fcba9e..1fe8b5db587b 100644
---- a/clang/test/Driver/hexagon-toolchain-elf.c
-+++ b/clang/test/Driver/hexagon-toolchain-elf.c
-@@ -487,7 +487,7 @@
- // RUN: %s 2>&1 \
- // RUN: | FileCheck -check-prefix=CHECK042 %s
- // CHECK042: "-cc1"
--// CHECK042: "-mrelocation-model" "static"
-+// CHECK042: "-mrelocation-model" "pic"
- // CHECK042: "-mllvm" "-hexagon-small-data-threshold=8"
- // CHECK042-NEXT: llvm-mc
- // CHECK042: "-gpsize=8"
-diff --git a/clang/test/Driver/hip-fpie-option.hip b/clang/test/Driver/hip-fpie-option.hip
-index 2e296a099dea..86915f1c8c25 100644
---- a/clang/test/Driver/hip-fpie-option.hip
-+++ b/clang/test/Driver/hip-fpie-option.hip
-@@ -5,11 +5,11 @@
-
- // RUN: %clang -### -target x86_64-unknown-linux-gnu \
- // RUN: --offload-arch=gfx906 %s -nogpulib -nogpuinc \
--// RUN: 2>&1 | FileCheck -check-prefixes=DEV,HOST-STATIC %s
-+// RUN: 2>&1 | FileCheck -check-prefixes=DEV,HOST-PIE %s
-
- // RUN: %clang -### -target x86_64-unknown-linux-gnu \
- // RUN: -fgpu-rdc --offload-arch=gfx906 %s -nogpulib -nogpuinc \
--// RUN: 2>&1 | FileCheck -check-prefixes=DEV,HOST-STATIC %s
-+// RUN: 2>&1 | FileCheck -check-prefixes=DEV,HOST-PIE %s
-
- // RUN: %clang -### -target x86_64-unknown-linux-gnu \
- // RUN: --offload-arch=gfx906 %s -nogpulib -nogpuinc \
-diff --git a/clang/test/Driver/linux-as.c b/clang/test/Driver/linux-as.c
-index 0959bd7ba0a1..4056a672b6f9 100644
---- a/clang/test/Driver/linux-as.c
-+++ b/clang/test/Driver/linux-as.c
-@@ -164,7 +164,7 @@
- // CHECK-PPC-NO-MCPU-NOT: as{{.*}} "-mcpu=invalid-cpu"
- //
- // RUN: %clang -target sparc64-linux -mcpu=invalid-cpu -### \
--// RUN: -no-integrated-as -c %s 2>&1 \
-+// RUN: -no-integrated-as -fno-pic -c %s 2>&1 \
- // RUN: | FileCheck -check-prefix=CHECK-SPARCV9 %s
- // CHECK-SPARCV9: as
- // CHECK-SPARCV9: -64
-@@ -173,7 +173,7 @@
- // CHECK-SPARCV9: -o
- //
- // RUN: %clang -target sparc64-linux -mcpu=invalid-cpu -### \
--// RUN: -no-integrated-as -fpic -c %s 2>&1 \
-+// RUN: -no-integrated-as -c %s 2>&1 \
- // RUN: | FileCheck -check-prefix=CHECK-SPARCV9PIC %s
- // CHECK-SPARCV9PIC: as
- // CHECK-SPARCV9PIC: -64
-diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c
-index cc505588331b..c7f81d2c5e49 100644
---- a/clang/test/Driver/linux-ld.c
-+++ b/clang/test/Driver/linux-ld.c
-@@ -1,4 +1,6 @@
- // UNSUPPORTED: system-windows
-+// XFAIL: linux
-+
- // General tests that ld invocations on Linux targets sane. Note that we use
- // 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 a74a19953ca2..0452661ba5a7 100644
---- a/clang/test/Driver/ppc-abi.c
-+++ b/clang/test/Driver/ppc-abi.c
-@@ -1,20 +1,20 @@
- // Check passing PowerPC ABI options to the backend.
-
- // RUN: %clang -target powerpc64-unknown-linux-gnu %s -### -o %t.o 2>&1 \
--// RUN: | FileCheck -check-prefix=CHECK-ELFv1 %s
-+// RUN: | FileCheck -check-prefix=CHECK-ELFv1-PIE %s
- // RUN: %clang -target powerpc64-unknown-linux-gnu %s -### -o %t.o 2>&1 \
--// RUN: -mabi=elfv1 | FileCheck -check-prefix=CHECK-ELFv1 %s
-+// RUN: -mabi=elfv1 | FileCheck -check-prefix=CHECK-ELFv1-PIE %s
- // RUN: %clang -target powerpc64-unknown-linux-gnu %s -### -o %t.o 2>&1 \
--// RUN: -mabi=elfv2 | FileCheck -check-prefix=CHECK-ELFv2-BE %s
-+// RUN: -mabi=elfv2 | FileCheck -check-prefix=CHECK-ELFv2-BE-PIE %s
-
- // RUN: %clang -target powerpc64le-unknown-linux-gnu %s -### -o %t.o 2>&1 \
--// RUN: | FileCheck -check-prefix=CHECK-ELFv2 %s
-+// RUN: | FileCheck -check-prefix=CHECK-ELFv2-PIE %s
- // RUN: %clang -target powerpc64le-unknown-linux-gnu %s -### -o %t.o 2>&1 \
- // RUN: -mabi=elfv1 | FileCheck -check-prefix=CHECK-ELFv1-LE %s
- // RUN: %clang -target powerpc64le-unknown-linux-gnu %s -### -o %t.o 2>&1 \
--// RUN: -mabi=elfv2 | FileCheck -check-prefix=CHECK-ELFv2 %s
-+// RUN: -mabi=elfv2 | FileCheck -check-prefix=CHECK-ELFv2-PIE %s
- // RUN: %clang -target powerpc64le-unknown-linux-gnu %s -### -o %t.o 2>&1 \
--// RUN: -mabi=altivec | FileCheck -check-prefix=CHECK-ELFv2 %s
-+// RUN: -mabi=altivec | FileCheck -check-prefix=CHECK-ELFv2-PIE %s
-
- // RUN: %clang -target powerpc64-unknown-freebsd11 %s -### 2>&1 | FileCheck --check-prefix=CHECK-ELFv1 %s
- // RUN: %clang -target powerpc64-unknown-freebsd12 %s -### 2>&1 | FileCheck --check-prefix=CHECK-ELFv1 %s
-@@ -26,10 +26,14 @@
-
- // CHECK-ELFv1: "-mrelocation-model" "static"
- // CHECK-ELFv1: "-target-abi" "elfv1"
--// CHECK-ELFv1-LE: "-mrelocation-model" "static"
-+// CHECK-ELFv1-PIE: "-mrelocation-model" "pic" "-pic-level" "2"
-+// CHECK-ELFv1-PIE: "-target-abi" "elfv1"
-+// CHECK-ELFv1-LE: "-mrelocation-model" "pic" "-pic-level" "2"
- // CHECK-ELFv1-LE: "-target-abi" "elfv1"
- // CHECK-ELFv2: "-mrelocation-model" "static"
- // CHECK-ELFv2: "-target-abi" "elfv2"
-+// CHECK-ELFv2-PIE: "-mrelocation-model" "pic" "-pic-level" "2"
-+// CHECK-ELFv2-PIE: "-target-abi" "elfv2"
- // CHECK-ELFv2-BE: "-mrelocation-model" "static"
- // CHECK-ELFv2-BE: "-target-abi" "elfv2"
- // CHECK-ELFv2-BE-PIE: "-mrelocation-model" "pic" "-pic-level" "2" "-pic-is-pie"
-diff --git a/clang/test/Driver/riscv32-toolchain.c b/clang/test/Driver/riscv32-toolchain.c
-index a5852f5f3997..233d9ef003cf 100644
---- a/clang/test/Driver/riscv32-toolchain.c
-+++ b/clang/test/Driver/riscv32-toolchain.c
-@@ -84,7 +84,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"
--// C-RV32-LINUX-MULTI-ILP32: "{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib32/ilp32{{/|\\\\}}crtbegin.o"
-+// C-RV32-LINUX-MULTI-ILP32: "crtbeginS.o"
- // 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"
-@@ -99,7 +99,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"
--// C-RV32-LINUX-MULTI-ILP32D: "{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib32/ilp32d{{/|\\\\}}crtbegin.o"
-+// C-RV32-LINUX-MULTI-ILP32D: "crtbeginS.o"
- // C-RV32-LINUX-MULTI-ILP32D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib32/ilp32d"
- // 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 e727f20bb601..a801e5eee462 100644
---- a/clang/test/Driver/riscv64-toolchain.c
-+++ b/clang/test/Driver/riscv64-toolchain.c
-@@ -84,7 +84,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"
--// C-RV64-LINUX-MULTI-LP64: "{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib64/lp64{{/|\\\\}}crtbegin.o"
-+// C-RV64-LINUX-MULTI-LP64: "crtbeginS.o"
- // 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"
-@@ -99,7 +99,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"
--// C-RV64-LINUX-MULTI-LP64D: "{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib64/lp64d{{/|\\\\}}crtbegin.o"
-+// C-RV64-LINUX-MULTI-LP64D: "crtbeginS.o"
- // C-RV64-LINUX-MULTI-LP64D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib64/lp64d"
- // C-RV64-LINUX-MULTI-LP64D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/lib64/lp64d"
- // C-RV64-LINUX-MULTI-LP64D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/usr/lib64/lp64d"
-diff --git a/clang/test/Driver/stack-protector.c b/clang/test/Driver/stack-protector.c
-index a3e40b50eed8..dfffe0d6cf85 100644
---- a/clang/test/Driver/stack-protector.c
-+++ b/clang/test/Driver/stack-protector.c
-@@ -3,11 +3,11 @@
- // NOSSP-NOT: "-stack-protector-buffer-size"
-
- // RUN: %clang -target i386-unknown-linux -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=SSP
--// SSP: "-stack-protector" "1"
-+// SSP: "-stack-protector" "2"
- // SSP-NOT: "-stack-protector-buffer-size"
-
- // RUN: %clang -target i386-unknown-linux -fstack-protector --param ssp-buffer-size=16 -### %s 2>&1 | FileCheck %s -check-prefix=SSP-BUF
--// SSP-BUF: "-stack-protector" "1"
-+// SSP-BUF: "-stack-protector" "2"
- // SSP-BUF: "-stack-protector-buffer-size" "16"
-
- // RUN: %clang -target i386-pc-openbsd -### %s 2>&1 | FileCheck %s -check-prefix=OPENBSD
Added: enable-fstack-protector-strong-by-default.patch
===================================================================
--- enable-fstack-protector-strong-by-default.patch (rev 0)
+++ enable-fstack-protector-strong-by-default.patch 2022-06-21 23:13:56 UTC (rev 449257)
@@ -0,0 +1,72 @@
+From 75c02a21f954574675020e1d76391b4896211fc7 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Sun, 24 Apr 2022 06:29:44 +0300
+Subject: [PATCH] Enable -fstack-protector-strong by default
+
+---
+ clang/lib/Driver/ToolChains/Linux.h | 5 +++++
+ clang/test/Driver/fsanitize.c | 6 +++---
+ clang/test/Driver/stack-protector.c | 4 ++--
+ 3 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/clang/lib/Driver/ToolChains/Linux.h b/clang/lib/Driver/ToolChains/Linux.h
+index a5648d79d655..3c4546cb9204 100644
+--- a/clang/lib/Driver/ToolChains/Linux.h
++++ b/clang/lib/Driver/ToolChains/Linux.h
+@@ -10,6 +10,7 @@
+ #define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_LINUX_H
+
+ #include "Gnu.h"
++#include "clang/Basic/LangOptions.h"
+ #include "clang/Driver/ToolChain.h"
+
+ namespace clang {
+@@ -46,6 +47,10 @@ public:
+ IsAArch64OutlineAtomicsDefault(const llvm::opt::ArgList &Args) const override;
+ bool isPIEDefault(const llvm::opt::ArgList &Args) const override;
+ bool IsMathErrnoDefault() const override;
++ LangOptions::StackProtectorMode
++ GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
++ return LangOptions::SSPStrong;
++ }
+ SanitizerMask getSupportedSanitizers() const override;
+ 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 17fce1981eea..a732d29b7688 100644
+--- a/clang/test/Driver/fsanitize.c
++++ b/clang/test/Driver/fsanitize.c
+@@ -666,12 +666,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: %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"
+diff --git a/clang/test/Driver/stack-protector.c b/clang/test/Driver/stack-protector.c
+index a3e40b50eed8..dfffe0d6cf85 100644
+--- a/clang/test/Driver/stack-protector.c
++++ b/clang/test/Driver/stack-protector.c
+@@ -3,11 +3,11 @@
+ // NOSSP-NOT: "-stack-protector-buffer-size"
+
+ // RUN: %clang -target i386-unknown-linux -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=SSP
+-// SSP: "-stack-protector" "1"
++// SSP: "-stack-protector" "2"
+ // SSP-NOT: "-stack-protector-buffer-size"
+
+ // RUN: %clang -target i386-unknown-linux -fstack-protector --param ssp-buffer-size=16 -### %s 2>&1 | FileCheck %s -check-prefix=SSP-BUF
+-// SSP-BUF: "-stack-protector" "1"
++// SSP-BUF: "-stack-protector" "2"
+ // SSP-BUF: "-stack-protector-buffer-size" "16"
+
+ // RUN: %clang -target i386-pc-openbsd -### %s 2>&1 | FileCheck %s -check-prefix=OPENBSD
Deleted: fix-scan-build-py-executable-lookup-path.patch
===================================================================
--- fix-scan-build-py-executable-lookup-path.patch 2022-06-21 23:01:44 UTC (rev 449256)
+++ fix-scan-build-py-executable-lookup-path.patch 2022-06-21 23:13:56 UTC (rev 449257)
@@ -1,31 +0,0 @@
-From c84755a046bbdcd0564693e30b2508034b06002b Mon Sep 17 00:00:00 2001
-From: serge-sans-paille <sguelton at redhat.com>
-Date: Mon, 13 Sep 2021 10:25:45 +0200
-Subject: [PATCH] Fix scan-build-py executable lookup path
-
-Once installed, scan-build-py doesn't know anything about its auxiliary
-executable and can't find them.
-Use relative path wrt. scan-build-py script.
-
-Differential Revision: https://reviews.llvm.org/D109659
----
- clang/tools/scan-build-py/lib/libscanbuild/analyze.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/clang/tools/scan-build-py/lib/libscanbuild/analyze.py b/clang/tools/scan-build-py/lib/libscanbuild/analyze.py
-index 9a249a8e15cb..d83ff2aefab9 100644
---- a/clang/tools/scan-build-py/lib/libscanbuild/analyze.py
-+++ b/clang/tools/scan-build-py/lib/libscanbuild/analyze.py
-@@ -39,8 +39,10 @@ from libscanbuild.shell import decode
-
- __all__ = ['scan_build', 'analyze_build', 'analyze_compiler_wrapper']
-
--COMPILER_WRAPPER_CC = 'analyze-cc'
--COMPILER_WRAPPER_CXX = 'analyze-c++'
-+scanbuild_dir = os.path.dirname(__import__('sys').argv[0])
-+
-+COMPILER_WRAPPER_CC = os.path.join(scanbuild_dir, '..', 'libexec', 'analyze-cc')
-+COMPILER_WRAPPER_CXX = os.path.join(scanbuild_dir, '..', 'libexec', 'analyze-c++')
-
- CTU_EXTDEF_MAP_FILENAME = 'externalDefMap.txt'
- CTU_TEMP_DEFMAP_FOLDER = 'tmpExternalDefMaps'
Added: keys/pgp/474E22316ABF4785A88C6E8EA2C794A986419D8A.asc
===================================================================
(Binary files differ)
Index: clang/trunk/keys/pgp/474E22316ABF4785A88C6E8EA2C794A986419D8A.asc
===================================================================
--- keys/pgp/474E22316ABF4785A88C6E8EA2C794A986419D8A.asc 2022-06-21 23:01:44 UTC (rev 449256)
+++ keys/pgp/474E22316ABF4785A88C6E8EA2C794A986419D8A.asc 2022-06-21 23:13:56 UTC (rev 449257)
Property changes on: clang/trunk/keys/pgp/474E22316ABF4785A88C6E8EA2C794A986419D8A.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property
Added: keys/pgp/B6C8F98282B944E3B0D5C2530FC3042E345AD05D.asc
===================================================================
(Binary files differ)
Index: clang/trunk/keys/pgp/B6C8F98282B944E3B0D5C2530FC3042E345AD05D.asc
===================================================================
--- keys/pgp/B6C8F98282B944E3B0D5C2530FC3042E345AD05D.asc 2022-06-21 23:01:44 UTC (rev 449256)
+++ keys/pgp/B6C8F98282B944E3B0D5C2530FC3042E345AD05D.asc 2022-06-21 23:13:56 UTC (rev 449257)
Property changes on: clang/trunk/keys/pgp/B6C8F98282B944E3B0D5C2530FC3042E345AD05D.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property
Deleted: strip-exception-specifications-in-CFI-type-names.patch
===================================================================
--- strip-exception-specifications-in-CFI-type-names.patch 2022-06-21 23:01:44 UTC (rev 449256)
+++ strip-exception-specifications-in-CFI-type-names.patch 2022-06-21 23:13:56 UTC (rev 449257)
@@ -1,59 +0,0 @@
-From 0a14674f276b598d23353290635fc62f93e9ab30 Mon Sep 17 00:00:00 2001
-From: Peter Collingbourne <peter at pcc.me.uk>
-Date: Fri, 3 Dec 2021 14:48:57 -0500
-Subject: [PATCH] CodeGen: Strip exception specifications from function types
- in CFI type names.
-
-With C++17 the exception specification has been made part of the
-function type, and therefore part of mangled type names.
-
-However, it's valid to convert function pointers with an exception
-specification to function pointers with the same argument and return
-types but without an exception specification, which means that e.g. a
-function of type "void () noexcept" can be called through a pointer
-of type "void ()". We must therefore consider the two types to be
-compatible for CFI purposes.
-
-We can do this by stripping the exception specification before mangling
-the type name, which is what this patch does.
-
-Differential Revision: https://reviews.llvm.org/D115015
----
- clang/lib/CodeGen/CodeGenModule.cpp | 5 +++++
- clang/test/CodeGenCXX/cfi-icall-noexcept.cpp | 11 +++++++++++
- 2 files changed, 16 insertions(+)
- create mode 100644 clang/test/CodeGenCXX/cfi-icall-noexcept.cpp
-
-diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
-index 9ba1a5c25e81a..39044617d6774 100644
---- a/clang/lib/CodeGen/CodeGenModule.cpp
-+++ b/clang/lib/CodeGen/CodeGenModule.cpp
-@@ -6398,6 +6398,11 @@ void CodeGenModule::EmitOMPThreadPrivateDecl(const OMPThreadPrivateDecl *D) {
- llvm::Metadata *
- CodeGenModule::CreateMetadataIdentifierImpl(QualType T, MetadataTypeMap &Map,
- StringRef Suffix) {
-+ if (auto *FnType = T->getAs<FunctionProtoType>())
-+ T = getContext().getFunctionType(
-+ FnType->getReturnType(), FnType->getParamTypes(),
-+ FnType->getExtProtoInfo().withExceptionSpec(EST_None));
-+
- llvm::Metadata *&InternalId = Map[T.getCanonicalType()];
- if (InternalId)
- return InternalId;
-diff --git a/clang/test/CodeGenCXX/cfi-icall-noexcept.cpp b/clang/test/CodeGenCXX/cfi-icall-noexcept.cpp
-new file mode 100644
-index 0000000000000..eabc4862b4c52
---- /dev/null
-+++ b/clang/test/CodeGenCXX/cfi-icall-noexcept.cpp
-@@ -0,0 +1,11 @@
-+// RUN: %clang_cc1 -triple x86_64-unknown-linux -fsanitize=cfi-icall -emit-llvm -std=c++17 -o - %s | FileCheck %s
-+
-+// Tests that exception specifiers are stripped when forming the
-+// mangled CFI type name.
-+
-+void f() noexcept {}
-+
-+// CHECK: define{{.*}} void @_Z1fv({{.*}} !type [[TS1:![0-9]+]] !type [[TS2:![0-9]+]]
-+
-+// CHECK: [[TS1]] = !{i64 0, !"_ZTSFvvE"}
-+// CHECK: [[TS2]] = !{i64 0, !"_ZTSFvvE.generalized"}
More information about the arch-commits
mailing list