[arch-commits] Commit in llvm10/trunk (2 files)

[Evangelos Foutras]

    Date: Tuesday, June 15, 2021 @ 17:18:42
  Author: foutrelis
Revision: 418326

upgpkg: llvm10 10.0.1-6: guard against miscompiled source file

Added:
  llvm10/trunk/no-strict-aliasing-DwarfCompileUnit.patch
Modified:
  llvm10/trunk/PKGBUILD

-------------------------------------------+
 PKGBUILD                                  |   11 ++++++++---
 no-strict-aliasing-DwarfCompileUnit.patch |   13 +++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-15 16:45:26 UTC (rev 418325)
+++ PKGBUILD	2021-06-15 17:18:42 UTC (rev 418326)
@@ -3,7 +3,7 @@
 
 pkgname=('llvm10' 'llvm10-libs')
 pkgver=10.0.1
-pkgrel=5
+pkgrel=6
 arch=('x86_64')
 url="https://llvm.org/"
 license=('custom:Apache 2.0 with LLVM Exception')
@@ -12,10 +12,12 @@
 options=('staticlibs')
 _source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver
 source=($_source_base/llvm-$pkgver.src.tar.xz{,.sig}
-        utils-benchmark-fix-missing-include.patch)
+        utils-benchmark-fix-missing-include.patch
+        no-strict-aliasing-DwarfCompileUnit.patch)
 sha256sums=('c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3'
             'SKIP'
-            '5f666675fd45848e4c4b0f94068f7648dd9ff88df4a7b19d2a9f2b83ee358a7e')
+            '5f666675fd45848e4c4b0f94068f7648dd9ff88df4a7b19d2a9f2b83ee358a7e'
+            'd1eff24508e35aae6c26a943dbaa3ef5acb60a145b008fd1ef9ac6f6c4faa662')
 validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
 validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar at redhat.com>
 
@@ -40,6 +42,9 @@
   cd "$srcdir/llvm-$pkgver.src"
   mkdir build
   patch -Np2 -i ../utils-benchmark-fix-missing-include.patch
+
+  # https://bugs.llvm.org/show_bug.cgi?id=50611#c3
+  patch -Np2 -i ../no-strict-aliasing-DwarfCompileUnit.patch
 }
 
 build() {

Added: no-strict-aliasing-DwarfCompileUnit.patch
===================================================================
--- no-strict-aliasing-DwarfCompileUnit.patch	                        (rev 0)
+++ no-strict-aliasing-DwarfCompileUnit.patch	2021-06-15 17:18:42 UTC (rev 418326)
@@ -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()