[arch-commits] Commit in clang/repos (7 files)
Evangelos Foutras
foutrelis at archlinux.org
Thu May 27 03:07:51 UTC 2021
Date: Thursday, May 27, 2021 @ 03:07:51
Author: foutrelis
Revision: 416505
archrelease: copy trunk to staging-x86_64
Added:
clang/repos/staging-x86_64/
clang/repos/staging-x86_64/PKGBUILD
(from rev 416504, clang/trunk/PKGBUILD)
clang/repos/staging-x86_64/clang-link-with-Bsymbolic-functions.patch
(from rev 416504, clang/trunk/clang-link-with-Bsymbolic-functions.patch)
clang/repos/staging-x86_64/clangd-CompletionModel-cmake.patch
(from rev 416504, clang/trunk/clangd-CompletionModel-cmake.patch)
clang/repos/staging-x86_64/enable-SSP-and-PIE-by-default.patch
(from rev 416504, clang/trunk/enable-SSP-and-PIE-by-default.patch)
clang/repos/staging-x86_64/opencl-respect-calling-convention-for-builtin.patch
(from rev 416504, clang/trunk/opencl-respect-calling-convention-for-builtin.patch)
clang/repos/staging-x86_64/partially-revert-scan-view-remove-Reporter.py.patch
(from rev 416504, clang/trunk/partially-revert-scan-view-remove-Reporter.py.patch)
-----------------------------------------------------+
PKGBUILD | 156 +++++++
clang-link-with-Bsymbolic-functions.patch | 63 +++
clangd-CompletionModel-cmake.patch | 66 +++
enable-SSP-and-PIE-by-default.patch | 364 ++++++++++++++++++
opencl-respect-calling-convention-for-builtin.patch | 107 +++++
partially-revert-scan-view-remove-Reporter.py.patch | 225 +++++++++++
6 files changed, 981 insertions(+)
Copied: clang/repos/staging-x86_64/PKGBUILD (from rev 416504, clang/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2021-05-27 03:07:51 UTC (rev 416505)
@@ -0,0 +1,156 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+
+pkgname=clang
+pkgver=12.0.0
+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' 'python2')
+optdepends=('openmp: OpenMP support in clang with -fopenmp'
+ 'python: for scan-view and git-clang-format'
+ 'llvm: referenced by some clang headers')
+provides=("clang-analyzer=$pkgver" "clang-tools-extra=$pkgver")
+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_base/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
+ $_source_base/llvm-$pkgver.src.tar.xz{,.sig}
+ partially-revert-scan-view-remove-Reporter.py.patch
+ opencl-respect-calling-convention-for-builtin.patch
+ clangd-CompletionModel-cmake.patch
+ clang-link-with-Bsymbolic-functions.patch
+ enable-SSP-and-PIE-by-default.patch)
+sha256sums=('e26e452e91d4542da3ebbf404f024d3e1cbf103f4cd110c26bf0a19621cca9ed'
+ 'SKIP'
+ 'ad41e0b527a65ade95c1ba690a5434cefaab4a2daa1be307caaa1e8541fe6d5c'
+ 'SKIP'
+ '49dc47c8697a1a0abd4ee51629a696d7bfe803662f2a7252a3b16fc75f3a8b50'
+ 'SKIP'
+ '68be2fb78e62f76702a156d4c1759b4c6f0d805e1b492e9c6f490ce40862138d'
+ '859d34dac43999edfc4c33e1cbb6e7458921fa9f16a93514701c1a9706665d24'
+ '6739abedc8870879618414c5358fda4fcfd4a3ac7a22030ac7c409779b68f669'
+ '5bc0b47c70990bb8dd0cf4138a8ab9e15cf6b008b7c0cf2c7aac3736b559e0e6'
+ 'a877fa5cf1c1cca3bd55f9a36cf8c1bdd061ff398aeace90fe3cbd9e82550da3')
+validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
+validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar at redhat.com>
+
+# Utilizing LLVM_DISTRIBUTION_COMPONENTS to avoid
+# installing static libraries; inspired by Gentoo
+_get_distribution_components() {
+ local target
+ ninja -t targets | grep -Po 'install-\K.*(?=-stripped:)' | while read -r target; do
+ case $target in
+ clang-libraries|distribution)
+ continue
+ ;;
+ clang-tidy-headers)
+ continue
+ ;;
+ clang|clangd|clang-*)
+ ;;
+ clang*|findAllSymbols)
+ continue
+ ;;
+ esac
+ echo $target
+ done
+}
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver.src"
+ mkdir build
+ mv "$srcdir/clang-tools-extra-$pkgver.src" tools/extra
+ patch -Np2 -i ../enable-SSP-and-PIE-by-default.patch
+
+ # Some fixes from the release/12.x branch
+ patch -Np2 -i ../partially-revert-scan-view-remove-Reporter.py.patch
+ patch -Np2 -i ../opencl-respect-calling-convention-for-builtin.patch
+
+ # https://bugs.llvm.org/show_bug.cgi?id=49990
+ patch -Np2 -d tools/extra <../clangd-CompletionModel-cmake.patch
+
+ # https://bugs.archlinux.org/task/70697
+ patch -Np2 -i ../clang-link-with-Bsymbolic-functions.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver.src/build"
+
+ local cmake_args=(
+ -G Ninja
+ -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DLLVM_LINK_LLVM_DYLIB=ON
+ -DCLANG_LINK_CLANG_DYLIB=ON
+ -DLLVM_ENABLE_RTTI=ON
+ -DLLVM_BUILD_TESTS=ON
+ -DLLVM_INCLUDE_DOCS=ON
+ -DLLVM_BUILD_DOCS=ON
+ -DLLVM_ENABLE_SPHINX=ON
+ -DSPHINX_WARNINGS_AS_ERRORS=OFF
+ -DLLVM_EXTERNAL_LIT=/usr/bin/lit
+ -DLLVM_MAIN_SRC_DIR="$srcdir/llvm-$pkgver.src"
+ )
+
+ cmake .. "${cmake_args[@]}"
+ local distribution_components=$(_get_distribution_components | paste -sd\;)
+ test -n "$distribution_components"
+ cmake_args+=(-DLLVM_DISTRIBUTION_COMPONENTS="$distribution_components")
+
+ cmake .. "${cmake_args[@]}"
+ ninja
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver.src/build"
+ ninja check-clang{,-tools}
+}
+
+_python2_optimize() {
+ python2 -m compileall "$@"
+ python2 -O -m compileall "$@"
+}
+
+_python3_optimize() {
+ python3 -m compileall "$@"
+ python3 -O -m compileall "$@"
+ python3 -OO -m compileall "$@"
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver.src/build"
+
+ DESTDIR="$pkgdir" ninja install-distribution
+ install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ # Remove documentation sources
+ rm -r "$pkgdir"/usr/share/doc/clang{,-tools}/html/{_sources,.buildinfo}
+
+ # Move analyzer scripts out of /usr/libexec
+ mv "$pkgdir"/usr/libexec/{ccc,c++}-analyzer "$pkgdir/usr/lib/clang/"
+ rmdir "$pkgdir/usr/libexec"
+ sed -i 's|libexec|lib/clang|' "$pkgdir/usr/bin/scan-build"
+
+ # Install Python bindings
+ for _py in 2.7 3.9; do
+ install -d "$pkgdir/usr/lib/python$_py/site-packages"
+ cp -a ../bindings/python/clang "$pkgdir/usr/lib/python$_py/site-packages/"
+ _python${_py%%.*}_optimize "$pkgdir/usr/lib/python$_py"
+ done
+
+ # Fix shebang in Python 2 script
+ sed -i '1s|/usr/bin/env python$|&2|' \
+ "$pkgdir"/usr/share/$pkgname/run-find-all-symbols.py
+ touch -d @$SOURCE_DATE_EPOCH "$pkgdir"/usr/share/$pkgname/run-find-all-symbols.py
+
+ # Compile Python scripts
+ _python2_optimize "$pkgdir/usr/share/clang"
+ _python3_optimize "$pkgdir/usr/share" -x 'clang-include-fixer|run-find-all-symbols'
+}
+
+# vim:set ts=2 sw=2 et:
Copied: clang/repos/staging-x86_64/clang-link-with-Bsymbolic-functions.patch (from rev 416504, clang/trunk/clang-link-with-Bsymbolic-functions.patch)
===================================================================
--- staging-x86_64/clang-link-with-Bsymbolic-functions.patch (rev 0)
+++ staging-x86_64/clang-link-with-Bsymbolic-functions.patch 2021-05-27 03:07:51 UTC (rev 416505)
@@ -0,0 +1,63 @@
+From 4f05f4c8e66bc76b1d94f5283494404382e3bacd Mon Sep 17 00:00:00 2001
+From: Fangrui Song <i at maskray.me>
+Date: Thu, 13 May 2021 13:44:57 -0700
+Subject: [PATCH] [CMake][ELF] Link libLLVM.so and libclang-cpp.so with
+ -Bsymbolic-functions
+
+llvm-dev message: https://lists.llvm.org/pipermail/llvm-dev/2021-May/150465.html
+
+In an ELF shared object, a default visibility defined symbol is preemptible by
+default. This creates some missed optimization opportunities.
+-Bsymbolic-functions is more aggressive than our current -fvisibility-inlines-hidden
+(present since 2012) as it applies to all function definitions. It can
+
+* avoid PLT for cross-TU function calls && reduce dynamic symbol lookup
+* reduce dynamic symbol lookup for taking function addresses and optimize out GOT/TOC on x86-64/ppc64
+
+In a -DLLVM_TARGETS_TO_BUILD=X86 build, the number of JUMP_SLOT decreases from 12716 to 1628, and the number of GLOB_DAT decreases from 1918 to 1313
+The built clang with `-DLLVM_LINK_LLVM_DYLIB=on -DCLANG_LINK_CLANG_DYLIB=on` is significantly faster.
+See the Linux kernel build result https://bugs.archlinux.org/task/70697
+
+Note: the performance of -fno-semantic-interposition -Bsymbolic-functions
+libLLVM.so and libclang-cpp.so is close to a PIE binary linking against
+`libLLVM*.a` and `libclang*.a`. When the host compiler is Clang,
+-Bsymbolic-functions is the major contributor. On x86-64 (with GOTPCRELX) and
+ppc64 ELFv2, the GOT/TOC relocations can be optimized.
+
+Some implication:
+
+Interposing a subset of functions is no longer supported.
+(This is fragile on ELF and unsupported on Mach-O at all. For Mach-O we don't
+use `ld -interpose` or `-flat_namespace`)
+
+Compiling a program which takes the address of any LLVM function with
+`{gcc,clang} -fno-pic` and expects the address to equal to the address taken
+from libLLVM.so or libclang-cpp.so is unsupported. I am fairly confident that
+llvm-project shouldn't have different behaviors depending on such pointer
+equality (as we've been using -fvisibility-inlines-hidden which applies to
+inline functions for a long time), but if we accidentally do, users should be
+aware that they should not make assumption on pointer equality in `-fno-pic`
+mode.
+
+See more on https://maskray.me/blog/2021-05-09-fno-semantic-interposition
+
+Reviewed By: phosek
+
+Differential Revision: https://reviews.llvm.org/D102090
+---
+ clang/tools/clang-shlib/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/clang/tools/clang-shlib/CMakeLists.txt b/clang/tools/clang-shlib/CMakeLists.txt
+index 5949223fc8e3..d08cf8938328 100644
+--- a/clang/tools/clang-shlib/CMakeLists.txt
++++ b/clang/tools/clang-shlib/CMakeLists.txt
+@@ -48,3 +48,8 @@ add_clang_library(clang-cpp
+ ${_OBJECTS}
+ LINK_LIBS
+ ${_DEPS})
++# Optimize function calls for default visibility definitions to avoid PLT and
++# reduce dynamic relocations.
++if (NOT APPLE)
++ target_link_options(clang-cpp PRIVATE LINKER:-Bsymbolic-functions)
++endif()
Copied: clang/repos/staging-x86_64/clangd-CompletionModel-cmake.patch (from rev 416504, clang/trunk/clangd-CompletionModel-cmake.patch)
===================================================================
--- staging-x86_64/clangd-CompletionModel-cmake.patch (rev 0)
+++ staging-x86_64/clangd-CompletionModel-cmake.patch 2021-05-27 03:07:51 UTC (rev 416505)
@@ -0,0 +1,66 @@
+From f51ab1871655a9a96134c2636c37dcb5a6b01ac3 Mon Sep 17 00:00:00 2001
+From: serge-sans-paille <sguelton at redhat.com>
+Date: Mon, 22 Mar 2021 10:05:25 +0100
+Subject: [PATCH] Make clangd CompletionModel usable even with non-standard
+ (but supported) layout
+
+llvm supports specifying a non-standard layout where each project lies in its
+own place. Do not assume a fixed layout and use the appropriate cmake variable
+instead.
+
+Differential Revision: https://reviews.llvm.org/D96787
+---
+ clang-tools-extra/clangd/quality/CompletionModel.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/clang-tools-extra/clangd/quality/CompletionModel.cmake b/clang-tools-extra/clangd/quality/CompletionModel.cmake
+index 60c6d2aa8433..41bc2ed1890b 100644
+--- a/clang-tools-extra/clangd/quality/CompletionModel.cmake
++++ b/clang-tools-extra/clangd/quality/CompletionModel.cmake
+@@ -5,8 +5,8 @@
+ # will define a C++ class called ${cpp_class} - which may be a
+ # namespace-qualified class name.
+ function(gen_decision_forest model filename cpp_class)
+- set(model_compiler ${CMAKE_SOURCE_DIR}/../clang-tools-extra/clangd/quality/CompletionModelCodegen.py)
+-
++ set(model_compiler ${LLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR}/clangd/quality/CompletionModelCodegen.py)
++
+ set(output_dir ${CMAKE_CURRENT_BINARY_DIR})
+ set(header_file ${output_dir}/${filename}.h)
+ set(cpp_file ${output_dir}/${filename}.cpp)
+
+From 7907c46fe6195728fafd843b8c0fb19a3e68e9ad Mon Sep 17 00:00:00 2001
+From: Harald van Dijk <harald at gigawatt.nl>
+Date: Wed, 5 May 2021 19:25:34 +0100
+Subject: [PATCH] Make clangd CompletionModel not depend on directory layout.
+
+The current code accounts for two possible layouts, but there is at
+least a third supported layout: clang-tools-extra may also be checked
+out as clang/tools/extra with the releases, which was not yet handled.
+Rather than treating that as a special case, use the location of
+CompletionModel.cmake to handle all three cases. This should address the
+problems that prompted D96787 and the problems that prompted the
+proposed revert D100625.
+
+Reviewed By: usaxena95
+
+Differential Revision: https://reviews.llvm.org/D101851
+---
+ clang-tools-extra/clangd/quality/CompletionModel.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/clang-tools-extra/clangd/quality/CompletionModel.cmake b/clang-tools-extra/clangd/quality/CompletionModel.cmake
+index 41bc2ed1890b..dc0c0cde4dab 100644
+--- a/clang-tools-extra/clangd/quality/CompletionModel.cmake
++++ b/clang-tools-extra/clangd/quality/CompletionModel.cmake
+@@ -4,8 +4,9 @@
+ # ${CMAKE_CURRENT_BINARY_DIR}. The generated header
+ # will define a C++ class called ${cpp_class} - which may be a
+ # namespace-qualified class name.
++set(CLANGD_COMPLETION_MODEL_COMPILER ${CMAKE_CURRENT_LIST_DIR}/CompletionModelCodegen.py)
+ function(gen_decision_forest model filename cpp_class)
+- set(model_compiler ${LLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR}/clangd/quality/CompletionModelCodegen.py)
++ set(model_compiler ${CLANGD_COMPLETION_MODEL_COMPILER})
+
+ set(output_dir ${CMAKE_CURRENT_BINARY_DIR})
+ set(header_file ${output_dir}/${filename}.h)
Copied: clang/repos/staging-x86_64/enable-SSP-and-PIE-by-default.patch (from rev 416504, clang/trunk/enable-SSP-and-PIE-by-default.patch)
===================================================================
--- staging-x86_64/enable-SSP-and-PIE-by-default.patch (rev 0)
+++ staging-x86_64/enable-SSP-and-PIE-by-default.patch 2021-05-27 03:07:51 UTC (rev 416505)
@@ -0,0 +1,364 @@
+From 6878f5376dec0a3d75674d5a2076d4af911f7c7c Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Wed, 12 May 2021 08:55:14 +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 | 2 +-
+ 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, 54 insertions(+), 37 deletions(-)
+
+diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
+index 9663a7390ada..2f8d01092557 100644
+--- a/clang/lib/Driver/ToolChains/Linux.cpp
++++ b/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -832,8 +832,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::isNoExecStackDefault() const {
+diff --git a/clang/lib/Driver/ToolChains/Linux.h b/clang/lib/Driver/ToolChains/Linux.h
+index 6b16b0e64990..04c4d176ca71 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 {
+@@ -39,6 +40,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 6c2dab260695..c28c5653e348 100644
+--- a/clang/test/Driver/cross-linux.c
++++ b/clang/test/Driver/cross-linux.c
+@@ -42,8 +42,8 @@
+ // CHECK-MULTI32-I386: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.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/4.6.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/4.6.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"
+@@ -60,8 +60,8 @@
+ // CHECK-MULTI32-X86-64: "{{.*}}/Inputs/multilib_32bit_linux_tree/usr/lib/gcc/i386-unknown-linux/4.6.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/4.6.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/4.6.0]]/64"
+ // CHECK-MULTI32-X86-64: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib/../lib64"
+ // CHECK-MULTI32-X86-64: "-L[[gcc_install]]"
+ // CHECK-MULTI32-X86-64: "-L[[gcc_install]]/../../../../i386-unknown-linux/lib"
+@@ -79,8 +79,8 @@
+ // CHECK-MULTI64-I386: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.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/4.6.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/4.6.0]]/32"
+ // CHECK-MULTI64-I386: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib/../lib32"
+ // CHECK-MULTI64-I386: "-L[[gcc_install]]"
+ // CHECK-MULTI64-I386: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib"
+@@ -98,8 +98,8 @@
+ // CHECK-MULTI64-X86-64: "{{.*}}/Inputs/multilib_64bit_linux_tree/usr/lib/gcc/x86_64-unknown-linux/4.6.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/4.6.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/4.6.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 0371bc91c4a3..ea89f5251217 100644
+--- a/clang/test/Driver/env.c
++++ b/clang/test/Driver/env.c
+@@ -20,7 +20,7 @@
+ //
+ // CHECK-LD-32-NOT: warning:
+ // CHECK-LD-32: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
+-// CHECK-LD-32: "{{.*}}/usr/lib/gcc/i386-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
++// CHECK-LD-32: "crtbeginS.o"
+ // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0"
+ // 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 8926d55a0cf4..40f628ccae45 100644
+--- a/clang/test/Driver/fsanitize.c
++++ b/clang/test/Driver/fsanitize.c
+@@ -330,15 +330,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"
+@@ -667,12 +667,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 6c872f4255c3..f5006d1dd9ab 100644
+--- a/clang/test/Driver/gcc-toolchain.cpp
++++ b/clang/test/Driver/gcc-toolchain.cpp
+@@ -26,6 +26,6 @@
+ // 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: "{{[^"]*}}/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5{{/|\\\\}}crtbegin.o"
++// CHECK: "crtbeginS.o"
+ // 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 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 24d3c78643f8..9ea22e6e0f64 100644
+--- a/clang/test/Driver/linux-ld.c
++++ b/clang/test/Driver/linux-ld.c
+@@ -1,3 +1,5 @@
++// 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
Copied: clang/repos/staging-x86_64/opencl-respect-calling-convention-for-builtin.patch (from rev 416504, clang/trunk/opencl-respect-calling-convention-for-builtin.patch)
===================================================================
--- staging-x86_64/opencl-respect-calling-convention-for-builtin.patch (rev 0)
+++ staging-x86_64/opencl-respect-calling-convention-for-builtin.patch 2021-05-27 03:07:51 UTC (rev 416505)
@@ -0,0 +1,107 @@
+From e0fe1c58acfa0bde36afde8354cb31fc1e0b75e2 Mon Sep 17 00:00:00 2001
+From: Luke Drummond <luke.drummond at codeplay.com>
+Date: Wed, 10 Mar 2021 18:14:42 +0000
+Subject: [PATCH] [OpenCL] Respect calling convention for builtin
+
+`__translate_sampler_initializer` has a calling convention of
+`spir_func`, but clang generated calls to it using the default CC.
+
+Instruction Combining was lowering these mismatching calling conventions
+to `store i1* undef` which itself was subsequently lowered to a trap
+instruction by simplifyCFG resulting in runtime `SIGILL`
+
+There are arguably two bugs here: but whether there's any wisdom in
+converting an obviously invalid call into a runtime crash over aborting
+with a sensible error message will require further discussion. So for
+now it's enough to set the right calling convention on the runtime
+helper.
+
+Reviewed By: svenh, bader
+
+Differential Revision: https://reviews.llvm.org/D98411
+
+(cherry picked from commit fcfd3fda71905d7c48f75a531c2265ad3b9876ea)
+---
+ clang/lib/CodeGen/CodeGenModule.cpp | 12 +++++++-----
+ clang/test/CodeGenOpenCL/sampler.cl | 12 ++++++------
+ 2 files changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
+index 31afbc6b4262..9c9bd4e374af 100644
+--- a/clang/lib/CodeGen/CodeGenModule.cpp
++++ b/clang/lib/CodeGen/CodeGenModule.cpp
+@@ -6215,15 +6215,17 @@ llvm::SanitizerStatReport &CodeGenModule::getSanStats() {
+
+ return *SanStats;
+ }
++
+ llvm::Value *
+ CodeGenModule::createOpenCLIntToSamplerConversion(const Expr *E,
+ CodeGenFunction &CGF) {
+ llvm::Constant *C = ConstantEmitter(CGF).emitAbstract(E, E->getType());
+- auto SamplerT = getOpenCLRuntime().getSamplerType(E->getType().getTypePtr());
+- auto FTy = llvm::FunctionType::get(SamplerT, {C->getType()}, false);
+- return CGF.Builder.CreateCall(CreateRuntimeFunction(FTy,
+- "__translate_sampler_initializer"),
+- {C});
++ auto *SamplerT = getOpenCLRuntime().getSamplerType(E->getType().getTypePtr());
++ auto *FTy = llvm::FunctionType::get(SamplerT, {C->getType()}, false);
++ auto *Call = CGF.Builder.CreateCall(
++ CreateRuntimeFunction(FTy, "__translate_sampler_initializer"), {C});
++ Call->setCallingConv(Call->getCalledFunction()->getCallingConv());
++ return Call;
+ }
+
+ CharUnits CodeGenModule::getNaturalPointeeTypeAlignment(
+diff --git a/clang/test/CodeGenOpenCL/sampler.cl b/clang/test/CodeGenOpenCL/sampler.cl
+index e6bda49f51c8..5ad8d0dbbf37 100644
+--- a/clang/test/CodeGenOpenCL/sampler.cl
++++ b/clang/test/CodeGenOpenCL/sampler.cl
+@@ -39,7 +39,7 @@ kernel void foo(sampler_t smp_par) {
+ // Case 2b
+ sampler_t smp = CLK_ADDRESS_CLAMP_TO_EDGE | CLK_NORMALIZED_COORDS_TRUE | CLK_FILTER_NEAREST;
+ // CHECK: [[smp_ptr:%[A-Za-z0-9_\.]+]] = alloca %opencl.sampler_t addrspace(2)*
+- // CHECK: [[SAMP:%[0-9]+]] = call %opencl.sampler_t addrspace(2)* @__translate_sampler_initializer(i32 19)
++ // CHECK: [[SAMP:%[0-9]+]] = call spir_func %opencl.sampler_t addrspace(2)* @__translate_sampler_initializer(i32 19)
+ // CHECK: store %opencl.sampler_t addrspace(2)* [[SAMP]], %opencl.sampler_t addrspace(2)** [[smp_ptr]]
+
+ // Case 1b
+@@ -56,12 +56,12 @@ kernel void foo(sampler_t smp_par) {
+
+ // Case 1a/2a
+ fnc4smp(glb_smp);
+- // CHECK: [[SAMP:%[0-9]+]] = call %opencl.sampler_t addrspace(2)* @__translate_sampler_initializer(i32 35)
++ // CHECK: [[SAMP:%[0-9]+]] = call spir_func %opencl.sampler_t addrspace(2)* @__translate_sampler_initializer(i32 35)
+ // CHECK: call spir_func void [[FUNCNAME]](%opencl.sampler_t addrspace(2)* [[SAMP]])
+
+ // Case 1a/2c
+ fnc4smp(glb_smp_const);
+- // CHECK: [[SAMP:%[0-9]+]] = call %opencl.sampler_t addrspace(2)* @__translate_sampler_initializer(i32 35)
++ // CHECK: [[SAMP:%[0-9]+]] = call spir_func %opencl.sampler_t addrspace(2)* @__translate_sampler_initializer(i32 35)
+ // CHECK: call spir_func void [[FUNCNAME]](%opencl.sampler_t addrspace(2)* [[SAMP]])
+
+ // Case 1c
+@@ -70,12 +70,12 @@ kernel void foo(sampler_t smp_par) {
+ // CHECK: call spir_func void [[FUNCNAME]](%opencl.sampler_t addrspace(2)* [[SAMP]])
+
+ fnc4smp(5);
+- // CHECK: [[SAMP:%[0-9]+]] = call %opencl.sampler_t addrspace(2)* @__translate_sampler_initializer(i32 5)
++ // CHECK: [[SAMP:%[0-9]+]] = call spir_func %opencl.sampler_t addrspace(2)* @__translate_sampler_initializer(i32 5)
+ // CHECK: call spir_func void [[FUNCNAME]](%opencl.sampler_t addrspace(2)* [[SAMP]])
+
+ const sampler_t const_smp = CLK_ADDRESS_CLAMP_TO_EDGE | CLK_NORMALIZED_COORDS_TRUE | CLK_FILTER_LINEAR;
+ fnc4smp(const_smp);
+- // CHECK: [[CONST_SAMP:%[0-9]+]] = call %opencl.sampler_t addrspace(2)* @__translate_sampler_initializer(i32 35)
++ // CHECK: [[CONST_SAMP:%[0-9]+]] = call spir_func %opencl.sampler_t addrspace(2)* @__translate_sampler_initializer(i32 35)
+ // CHECK: store %opencl.sampler_t addrspace(2)* [[CONST_SAMP]], %opencl.sampler_t addrspace(2)** [[CONST_SMP_PTR:%[a-zA-Z0-9]+]]
+ fnc4smp(const_smp);
+ // CHECK: [[SAMP:%[0-9]+]] = load %opencl.sampler_t addrspace(2)*, %opencl.sampler_t addrspace(2)** [[CONST_SMP_PTR]]
+@@ -83,7 +83,7 @@ kernel void foo(sampler_t smp_par) {
+
+ constant sampler_t constant_smp = CLK_ADDRESS_CLAMP_TO_EDGE | CLK_NORMALIZED_COORDS_TRUE | CLK_FILTER_LINEAR;
+ fnc4smp(constant_smp);
+- // CHECK: [[SAMP:%[0-9]+]] = call %opencl.sampler_t addrspace(2)* @__translate_sampler_initializer(i32 35)
++ // CHECK: [[SAMP:%[0-9]+]] = call spir_func %opencl.sampler_t addrspace(2)* @__translate_sampler_initializer(i32 35)
+ // CHECK: call spir_func void [[FUNCNAME]](%opencl.sampler_t addrspace(2)* [[SAMP]])
+
+ // TODO: enable sampler initialization with non-constant integer.
Copied: clang/repos/staging-x86_64/partially-revert-scan-view-remove-Reporter.py.patch (from rev 416504, clang/trunk/partially-revert-scan-view-remove-Reporter.py.patch)
===================================================================
--- staging-x86_64/partially-revert-scan-view-remove-Reporter.py.patch (rev 0)
+++ staging-x86_64/partially-revert-scan-view-remove-Reporter.py.patch 2021-05-27 03:07:51 UTC (rev 416505)
@@ -0,0 +1,225 @@
+From 3263c81589eca689341ab5084723bdb7fe4a1286 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar at redhat.com>
+Date: Thu, 11 Feb 2021 22:28:19 +0000
+Subject: [PATCH] Partially Revert "scan-view: Remove Reporter.py and
+ associated AppleScript files"
+
+This reverts some of commit dbb01536f6f49fa428f170e34466072ef439b3e9.
+
+The Reporter module was still being used by the ScanView.py module and deleting
+it caused scan-view to fail. This commit adds back Reporter.py but removes the
+code the references the AppleScript files which were removed in
+dbb01536f6f49fa428f170e34466072ef439b3e9.
+
+Reviewed By: NoQ
+
+Differential Revision: https://reviews.llvm.org/D96367
+
+(cherry picked from commit e3cd3a3c91524c957e06bb0170343548f02b6842)
+---
+ clang/tools/scan-view/CMakeLists.txt | 1 +
+ clang/tools/scan-view/share/Reporter.py | 183 ++++++++++++++++++++++++
+ 2 files changed, 184 insertions(+)
+ create mode 100644 clang/tools/scan-view/share/Reporter.py
+
+diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt
+index dd3d33439299..eccc6b83195b 100644
+--- a/clang/tools/scan-view/CMakeLists.txt
++++ b/clang/tools/scan-view/CMakeLists.txt
+@@ -5,6 +5,7 @@ set(BinFiles
+
+ set(ShareFiles
+ ScanView.py
++ Reporter.py
+ startfile.py
+ bugcatcher.ico)
+
+diff --git a/clang/tools/scan-view/share/Reporter.py b/clang/tools/scan-view/share/Reporter.py
+new file mode 100644
+index 000000000000..31a14fb0cf74
+--- /dev/null
++++ b/clang/tools/scan-view/share/Reporter.py
+@@ -0,0 +1,183 @@
++#!/usr/bin/env python
++# -*- coding: utf-8 -*-
++
++"""Methods for reporting bugs."""
++
++import subprocess, sys, os
++
++__all__ = ['ReportFailure', 'BugReport', 'getReporters']
++
++#
++
++class ReportFailure(Exception):
++ """Generic exception for failures in bug reporting."""
++ def __init__(self, value):
++ self.value = value
++
++# Collect information about a bug.
++
++class BugReport(object):
++ def __init__(self, title, description, files):
++ self.title = title
++ self.description = description
++ self.files = files
++
++# Reporter interfaces.
++
++import os
++
++import email, mimetypes, smtplib
++from email import encoders
++from email.message import Message
++from email.mime.base import MIMEBase
++from email.mime.multipart import MIMEMultipart
++from email.mime.text import MIMEText
++
++#===------------------------------------------------------------------------===#
++# ReporterParameter
++#===------------------------------------------------------------------------===#
++
++class ReporterParameter(object):
++ def __init__(self, n):
++ self.name = n
++ def getName(self):
++ return self.name
++ def getValue(self,r,bugtype,getConfigOption):
++ return getConfigOption(r.getName(),self.getName())
++ def saveConfigValue(self):
++ return True
++
++class TextParameter (ReporterParameter):
++ def getHTML(self,r,bugtype,getConfigOption):
++ return """\
++<tr>
++<td class="form_clabel">%s:</td>
++<td class="form_value"><input type="text" name="%s_%s" value="%s"></td>
++</tr>"""%(self.getName(),r.getName(),self.getName(),self.getValue(r,bugtype,getConfigOption))
++
++class SelectionParameter (ReporterParameter):
++ def __init__(self, n, values):
++ ReporterParameter.__init__(self,n)
++ self.values = values
++
++ def getHTML(self,r,bugtype,getConfigOption):
++ default = self.getValue(r,bugtype,getConfigOption)
++ return """\
++<tr>
++<td class="form_clabel">%s:</td><td class="form_value"><select name="%s_%s">
++%s
++</select></td>"""%(self.getName(),r.getName(),self.getName(),'\n'.join(["""\
++<option value="%s"%s>%s</option>"""%(o[0],
++ o[0] == default and ' selected="selected"' or '',
++ o[1]) for o in self.values]))
++
++#===------------------------------------------------------------------------===#
++# Reporters
++#===------------------------------------------------------------------------===#
++
++class EmailReporter(object):
++ def getName(self):
++ return 'Email'
++
++ def getParameters(self):
++ return [TextParameter(x) for x in ['To', 'From', 'SMTP Server', 'SMTP Port']]
++
++ # Lifted from python email module examples.
++ def attachFile(self, outer, path):
++ # Guess the content type based on the file's extension. Encoding
++ # will be ignored, although we should check for simple things like
++ # gzip'd or compressed files.
++ ctype, encoding = mimetypes.guess_type(path)
++ if ctype is None or encoding is not None:
++ # No guess could be made, or the file is encoded (compressed), so
++ # use a generic bag-of-bits type.
++ ctype = 'application/octet-stream'
++ maintype, subtype = ctype.split('/', 1)
++ if maintype == 'text':
++ fp = open(path)
++ # Note: we should handle calculating the charset
++ msg = MIMEText(fp.read(), _subtype=subtype)
++ fp.close()
++ else:
++ fp = open(path, 'rb')
++ msg = MIMEBase(maintype, subtype)
++ msg.set_payload(fp.read())
++ fp.close()
++ # Encode the payload using Base64
++ encoders.encode_base64(msg)
++ # Set the filename parameter
++ msg.add_header('Content-Disposition', 'attachment', filename=os.path.basename(path))
++ outer.attach(msg)
++
++ def fileReport(self, report, parameters):
++ mainMsg = """\
++BUG REPORT
++---
++Title: %s
++Description: %s
++"""%(report.title, report.description)
++
++ if not parameters.get('To'):
++ raise ReportFailure('No "To" address specified.')
++ if not parameters.get('From'):
++ raise ReportFailure('No "From" address specified.')
++
++ msg = MIMEMultipart()
++ msg['Subject'] = 'BUG REPORT: %s'%(report.title)
++ # FIXME: Get config parameters
++ msg['To'] = parameters.get('To')
++ msg['From'] = parameters.get('From')
++ msg.preamble = mainMsg
++
++ msg.attach(MIMEText(mainMsg, _subtype='text/plain'))
++ for file in report.files:
++ self.attachFile(msg, file)
++
++ try:
++ s = smtplib.SMTP(host=parameters.get('SMTP Server'),
++ port=parameters.get('SMTP Port'))
++ s.sendmail(msg['From'], msg['To'], msg.as_string())
++ s.close()
++ except:
++ raise ReportFailure('Unable to send message via SMTP.')
++
++ return "Message sent!"
++
++class BugzillaReporter(object):
++ def getName(self):
++ return 'Bugzilla'
++
++ def getParameters(self):
++ return [TextParameter(x) for x in ['URL','Product']]
++
++ def fileReport(self, report, parameters):
++ raise NotImplementedError
++
++
++class RadarClassificationParameter(SelectionParameter):
++ def __init__(self):
++ SelectionParameter.__init__(self,"Classification",
++ [['1', 'Security'], ['2', 'Crash/Hang/Data Loss'],
++ ['3', 'Performance'], ['4', 'UI/Usability'],
++ ['6', 'Serious Bug'], ['7', 'Other']])
++
++ def saveConfigValue(self):
++ return False
++
++ def getValue(self,r,bugtype,getConfigOption):
++ if bugtype.find("leak") != -1:
++ return '3'
++ elif bugtype.find("dereference") != -1:
++ return '2'
++ elif bugtype.find("missing ivar release") != -1:
++ return '3'
++ else:
++ return '7'
++
++###
++
++def getReporters():
++ reporters = []
++ reporters.append(EmailReporter())
++ return reporters
++
More information about the arch-commits
mailing list