[arch-commits] Commit in lib32-clang/repos (4 files)
Evangelos Foutras
foutrelis at gemini.archlinux.org
Wed Jun 22 01:38:33 UTC 2022
Date: Wednesday, June 22, 2022 @ 01:38:33
Author: foutrelis
Revision: 1238904
archrelease: copy trunk to multilib-staging-x86_64
Added:
lib32-clang/repos/multilib-staging-x86_64/
lib32-clang/repos/multilib-staging-x86_64/PKGBUILD
(from rev 1238903, lib32-clang/trunk/PKGBUILD)
lib32-clang/repos/multilib-staging-x86_64/enable-fstack-protector-strong-by-default.patch
(from rev 1238903, lib32-clang/trunk/enable-fstack-protector-strong-by-default.patch)
lib32-clang/repos/multilib-staging-x86_64/keys/
-------------------------------------------------+
PKGBUILD | 94 ++++++++++++++++++++++
enable-fstack-protector-strong-by-default.patch | 72 ++++++++++++++++
2 files changed, 166 insertions(+)
Copied: lib32-clang/repos/multilib-staging-x86_64/PKGBUILD (from rev 1238903, lib32-clang/trunk/PKGBUILD)
===================================================================
--- multilib-staging-x86_64/PKGBUILD (rev 0)
+++ multilib-staging-x86_64/PKGBUILD 2022-06-22 01:38:33 UTC (rev 1238904)
@@ -0,0 +1,94 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+
+pkgname=lib32-clang
+pkgver=14.0.5
+pkgrel=1
+pkgdesc="C language family frontend for LLVM (32-bit)"
+arch=('x86_64')
+url="https://clang.llvm.org/"
+license=('custom:Apache 2.0 with LLVM Exception')
+depends=('lib32-llvm-libs' 'gcc-multilib')
+makedepends=('lib32-llvm' 'cmake' 'ninja' 'python')
+_source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver
+source=($_source_base/clang-$pkgver.src.tar.xz{,.sig}
+ $_source_base/llvm-$pkgver.src.tar.xz{,.sig}
+ enable-fstack-protector-strong-by-default.patch)
+sha256sums=('a8e2e3ce217f4c2682c3fe2d2691f826cf1f0ab0a1dff4b5b8f6264baa1f2a79'
+ 'SKIP'
+ '234c8ed02ed1338aa4f0ffa955e45eb13abe7ba0032569d6bc17ae9334257b02'
+ 'SKIP'
+ '7a9ce949579a3b02d4b91b6835c4fb45adc5f743007572fb0e28e6433e48f3a5')
+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 clang-$pkgver.src
+ mkdir build
+ patch -Np2 -i ../enable-fstack-protector-strong-by-default.patch
+}
+
+build() {
+ cd "$srcdir/clang-$pkgver.src/build"
+
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ local cmake_args=(
+ -G Ninja
+ -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_SKIP_RPATH=ON
+ -DCLANG_DEFAULT_PIE_ON_LINUX=ON
+ -DCLANG_LINK_CLANG_DYLIB=ON
+ -DCMAKE_CXX_FLAGS:STRING=-m32
+ -DCMAKE_C_FLAGS:STRING=-m32
+ -DLLVM_BUILD_TESTS=OFF
+ -DLLVM_CONFIG="/usr/bin/llvm-config32"
+ -DLLVM_ENABLE_RTTI=ON
+ -DLLVM_INCLUDE_DOCS=OFF
+ -DLLVM_LIBDIR_SUFFIX=32
+ -DLLVM_LINK_LLVM_DYLIB=ON
+ -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
+}
+
+package() {
+ cd clang-$pkgver.src/build
+
+ DESTDIR="$pkgdir" ninja install-distribution
+ rm -rf "$pkgdir"/usr/{bin,include,libexec,share}
+
+ install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: lib32-clang/repos/multilib-staging-x86_64/enable-fstack-protector-strong-by-default.patch (from rev 1238903, lib32-clang/trunk/enable-fstack-protector-strong-by-default.patch)
===================================================================
--- multilib-staging-x86_64/enable-fstack-protector-strong-by-default.patch (rev 0)
+++ multilib-staging-x86_64/enable-fstack-protector-strong-by-default.patch 2022-06-22 01:38:33 UTC (rev 1238904)
@@ -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
More information about the arch-commits
mailing list