Date: Friday, July 9, 2021 @ 05:59:47 Author: foutrelis Revision: 419322
archrelease: copy trunk to staging-x86_64 Added: llvm/repos/staging-x86_64/ llvm/repos/staging-x86_64/PKGBUILD (from rev 419321, llvm/trunk/PKGBUILD) llvm/repos/staging-x86_64/add-fno-semantic-interposition.patch (from rev 419321, llvm/trunk/add-fno-semantic-interposition.patch) llvm/repos/staging-x86_64/llvm-config.h (from rev 419321, llvm/trunk/llvm-config.h) llvm/repos/staging-x86_64/llvm-link-with-Bsymbolic-functions.patch (from rev 419321, llvm/trunk/llvm-link-with-Bsymbolic-functions.patch) llvm/repos/staging-x86_64/no-strict-aliasing-DwarfCompileUnit.patch (from rev 419321, llvm/trunk/no-strict-aliasing-DwarfCompileUnit.patch) -------------------------------------------+ PKGBUILD | 137 ++++++++++++++++++++++++++++ add-fno-semantic-interposition.patch | 22 ++++ llvm-config.h | 9 + llvm-link-with-Bsymbolic-functions.patch | 66 +++++++++++++ no-strict-aliasing-DwarfCompileUnit.patch | 13 ++ 5 files changed, 247 insertions(+) Copied: llvm/repos/staging-x86_64/PKGBUILD (from rev 419321, llvm/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2021-07-09 05:59:47 UTC (rev 419322) @@ -0,0 +1,137 @@ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: Jan "heftig" Steffens <jan.steff...@gmail.com> + +pkgname=('llvm' 'llvm-libs' 'llvm-ocaml') +pkgver=12.0.1 +pkgrel=1 +_ocaml_ver=4.11.1 +arch=('x86_64') +url="https://llvm.org/" +license=('custom:Apache 2.0 with LLVM Exception') +makedepends=('cmake' 'ninja' 'libffi' 'libedit' 'ncurses' 'libxml2' + "ocaml>=$_ocaml_ver" 'ocaml-ctypes' 'ocaml-findlib' + 'python-setuptools' 'python-psutil' 'python-sphinx' + 'python-recommonmark') +options=('staticlibs') +_source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver +source=($_source_base/$pkgname-$pkgver.src.tar.xz{,.sig} + llvm-link-with-Bsymbolic-functions.patch + add-fno-semantic-interposition.patch + no-strict-aliasing-DwarfCompileUnit.patch + llvm-config.h) +sha256sums=('7d9a8405f557cefc5a21bf5672af73903b64749d9bc3a50322239f56f34ffddf' + 'SKIP' + '560ce1e206c19f4b86f4c583b743db0ad47a610418999350710aafd60ae50fcd' + 'fc8c64267a5d179e9fc24fb2bc6150edef2598c83f5b2d138d14e05ce9f4e345' + 'd1eff24508e35aae6c26a943dbaa3ef5acb60a145b008fd1ef9ac6f6c4faa662' + '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48') +validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <h...@chromium.org> +validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstel...@redhat.com> + +prepare() { + cd "$srcdir/llvm-$pkgver.src" + mkdir build + + # https://bugs.archlinux.org/task/70697 + patch -Np2 -i ../llvm-link-with-Bsymbolic-functions.patch + # https://reviews.llvm.org/D102453 + patch -Np2 -i ../add-fno-semantic-interposition.patch + + # Work around intermittent 'clang -O -g' crashes + # https://bugs.llvm.org/show_bug.cgi?id=50611#c3 + patch -Np2 -i ../no-strict-aliasing-DwarfCompileUnit.patch +} + +build() { + cd "$srcdir/llvm-$pkgver.src/build" + + cmake .. -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLLVM_HOST_TRIPLE=$CHOST \ + -DLLVM_BUILD_LLVM_DYLIB=ON \ + -DLLVM_LINK_LLVM_DYLIB=ON \ + -DLLVM_INSTALL_UTILS=ON \ + -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_ENABLE_FFI=ON \ + -DLLVM_BUILD_TESTS=ON \ + -DLLVM_BUILD_DOCS=ON \ + -DLLVM_ENABLE_SPHINX=ON \ + -DLLVM_ENABLE_DOXYGEN=OFF \ + -DSPHINX_WARNINGS_AS_ERRORS=OFF \ + -DLLVM_BINUTILS_INCDIR=/usr/include + ninja all ocaml_doc +} + +check() { + cd "$srcdir/llvm-$pkgver.src/build" + ninja check +} + +package_llvm() { + pkgdesc="Collection of modular and reusable compiler and toolchain technologies" + depends=('llvm-libs' 'perl') + + cd "$srcdir/llvm-$pkgver.src/build" + + DESTDIR="$pkgdir" ninja install + + # Include lit for running lit-based tests in other projects + pushd ../utils/lit + python3 setup.py install --root="$pkgdir" -O1 + popd + + # Remove documentation sources + rm -r "$pkgdir"/usr/share/doc/$pkgname/html/{_sources,.buildinfo} + + # The runtime libraries go into llvm-libs + mv -f "$pkgdir"/usr/lib/lib{LLVM,LTO,Remarks}*.so* "$srcdir" + mv -f "$pkgdir"/usr/lib/LLVMgold.so "$srcdir" + + # OCaml bindings go to a separate package + rm -rf "$srcdir"/ocaml.{lib,doc} + mv "$pkgdir/usr/lib/ocaml" "$srcdir/ocaml.lib" + mv "$pkgdir/usr/share/doc/$pkgname/ocaml-html" "$srcdir/ocaml.doc" + + if [[ $CARCH == x86_64 ]]; then + # Needed for multilib (https://bugs.archlinux.org/task/29951) + # Header stub is taken from Fedora + mv "$pkgdir/usr/include/llvm/Config/llvm-config"{,-64}.h + cp "$srcdir/llvm-config.h" "$pkgdir/usr/include/llvm/Config/llvm-config.h" + fi + + install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_llvm-libs() { + pkgdesc="LLVM runtime libraries" + depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses' 'libxml2') + + install -d "$pkgdir/usr/lib" + cp -P \ + "$srcdir"/lib{LLVM,LTO,Remarks}*.so* \ + "$srcdir"/LLVMgold.so \ + "$pkgdir/usr/lib/" + + # Symlink LLVMgold.so from /usr/lib/bfd-plugins + # https://bugs.archlinux.org/task/28479 + install -d "$pkgdir/usr/lib/bfd-plugins" + ln -s ../LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so" + + install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_llvm-ocaml() { + pkgdesc="OCaml bindings for LLVM" + depends=('llvm' "ocaml=$_ocaml_ver" 'ocaml-ctypes') + + install -d "$pkgdir"/{usr/lib,usr/share/doc/$pkgname} + cp -a "$srcdir/ocaml.lib" "$pkgdir/usr/lib/ocaml" + cp -a "$srcdir/ocaml.doc" "$pkgdir/usr/share/doc/$pkgname/html" + + install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: Copied: llvm/repos/staging-x86_64/add-fno-semantic-interposition.patch (from rev 419321, llvm/trunk/add-fno-semantic-interposition.patch) =================================================================== --- staging-x86_64/add-fno-semantic-interposition.patch (rev 0) +++ staging-x86_64/add-fno-semantic-interposition.patch 2021-07-09 05:59:47 UTC (rev 419322) @@ -0,0 +1,22 @@ +diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake +--- a/llvm/cmake/modules/HandleLLVMOptions.cmake ++++ b/llvm/cmake/modules/HandleLLVMOptions.cmake +@@ -305,6 +305,17 @@ + # On Windows all code is PIC. MinGW warns if -fPIC is used. + else() + add_flag_or_print_warning("-fPIC" FPIC) ++ # Enable interprocedural optimizations for non-inline functions which would ++ # otherwise be disabled due to GCC -fPIC's default. ++ # ++ # Note: Clang allows IPO for -fPIC so this optimization is less effective. ++ # Older Clang may support -fno-semantic-interposition but it used local ++ # aliases to optimize global variables, which is incompatible with copy ++ # relocations due to -fno-pic. ++ if (CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND ++ CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 13)) ++ add_flag_if_supported("-fno-semantic-interposition" FNO_SEMANTIC_INTERPOSITION) ++ endif() + endif() + # GCC for MIPS can miscompile LLVM due to PR37701. + if(CMAKE_COMPILER_IS_GNUCXX AND LLVM_NATIVE_ARCH STREQUAL "Mips" AND + Copied: llvm/repos/staging-x86_64/llvm-config.h (from rev 419321, llvm/trunk/llvm-config.h) =================================================================== --- staging-x86_64/llvm-config.h (rev 0) +++ staging-x86_64/llvm-config.h 2021-07-09 05:59:47 UTC (rev 419322) @@ -0,0 +1,9 @@ +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +#include "llvm-config-32.h" +#elif __WORDSIZE == 64 +#include "llvm-config-64.h" +#else +#error "Unknown word size" +#endif Copied: llvm/repos/staging-x86_64/llvm-link-with-Bsymbolic-functions.patch (from rev 419321, llvm/trunk/llvm-link-with-Bsymbolic-functions.patch) =================================================================== --- staging-x86_64/llvm-link-with-Bsymbolic-functions.patch (rev 0) +++ staging-x86_64/llvm-link-with-Bsymbolic-functions.patch 2021-07-09 05:59:47 UTC (rev 419322) @@ -0,0 +1,66 @@ +From 4f05f4c8e66bc76b1d94f5283494404382e3bacd Mon Sep 17 00:00:00 2001 +From: Fangrui Song <i...@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 +--- + llvm/tools/llvm-shlib/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/llvm/tools/llvm-shlib/CMakeLists.txt b/llvm/tools/llvm-shlib/CMakeLists.txt +index b0ee19049e6f..03e1383ec8b4 100644 +--- a/llvm/tools/llvm-shlib/CMakeLists.txt ++++ b/llvm/tools/llvm-shlib/CMakeLists.txt +@@ -50,6 +50,11 @@ if(LLVM_BUILD_LLVM_DYLIB) + # Solaris ld does not accept global: *; so there is no way to version *all* global symbols + set(LIB_NAMES -Wl,--version-script,${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map ${LIB_NAMES}) + endif() ++ # Optimize function calls for default visibility definitions to avoid PLT and ++ # reduce dynamic relocations. ++ # Note: for -fno-pic default, the address of a function may be different from ++ # inside and outside libLLVM.so. ++ target_link_options(LLVM PRIVATE LINKER:-Bsymbolic-functions) + elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") + set(LIB_NAMES -Wl,-all_load ${LIB_NAMES}) + endif() Copied: llvm/repos/staging-x86_64/no-strict-aliasing-DwarfCompileUnit.patch (from rev 419321, llvm/trunk/no-strict-aliasing-DwarfCompileUnit.patch) =================================================================== --- staging-x86_64/no-strict-aliasing-DwarfCompileUnit.patch (rev 0) +++ staging-x86_64/no-strict-aliasing-DwarfCompileUnit.patch 2021-07-09 05:59:47 UTC (rev 419322) @@ -0,0 +1,13 @@ +diff --git a/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt b/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt +index eb924282a75e..85929b54d6ce 100644 +--- a/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt ++++ b/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt +@@ -44,3 +44,8 @@ add_llvm_component_library(LLVMAsmPrinter + Support + Target + ) ++ ++# https://bugs.llvm.org/show_bug.cgi?id=50611#c3 ++if (CMAKE_COMPILER_IS_GNUCXX) ++ set_source_files_properties(DwarfCompileUnit.cpp PROPERTIES COMPILE_FLAGS -fno-strict-aliasing) ++endif()