Fix gcc11 compilation issues.

3 files changed, 44 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b622f225f08..83ccf97aa4b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = llvm35
 	pkgver = 3.5.2
-	pkgrel = 7
+	pkgrel = 8
 	url = http://llvm.org/
 	arch = x86_64
 	license = custom:University of Illinois/NCSA Open Source License
@@ -12,6 +12,7 @@ pkgbase = llvm35
 	source = llvm-3.5.0-force-link-pass.o.patch
 	source = gcc5.patch
 	source = gcc10.patch
+	source = gcc11.patch
 	source = llvm-Config-config.h
 	source = llvm-Config-llvm-config.h
 	sha256sums = 44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575
@@ -19,13 +20,14 @@ pkgbase = llvm35
 	sha256sums = 5702053503d49448598eda1b8dc8c263f0df9ad7486833273e3987b5dec25a19
 	sha256sums = c964eecdfb0cbf4d2a59a553d7bdb3f16e70d8910e6aa7e9c768828ecbdfcea2
 	sha256sums = 75bfba16c3bf6fd4fc3d4807969f64a68e5259ca6d15b560333cdac9baf09df2
+	sha256sums = 51cad8d6affb224fe2a9f75814650554983f0714921ae375064d83adc644aba3
 	sha256sums = 312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3
 	sha256sums = 597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48
 	makedepends_x86_64 = gcc-multilib
 
 pkgname = llvm35
 	pkgdesc = Low Level Virtual Machine
-	depends = llvm35-libs=3.5.2-7
+	depends = llvm35-libs=3.5.2-8
 	depends = perl
 	conflicts = llvm
 
@@ -40,8 +42,7 @@ pkgname = llvm35-libs
 pkgname = clang35
 	pkgdesc = C language family frontend for LLVM
 	url = http://clang.llvm.org/
-	depends = llvm35-libs=3.5.2-7
+	depends = llvm35-libs=3.5.2-8
 	depends = gcc
 	optdepends = llvm-libs: for compiling with -flto
 	conflicts = clang
-
diff --git a/PKGBUILD b/PKGBUILD
index c1c0419e84dc..e7c577c52d62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,7 +29,7 @@
 pkgbase=llvm35
 pkgname=('llvm35' 'llvm35-libs' 'clang35')
 pkgver=3.5.2
-pkgrel=7
+pkgrel=8
 arch=('x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -43,6 +43,7 @@ source=(https://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz
         llvm-3.5.0-force-link-pass.o.patch
         gcc5.patch
         gcc10.patch
+        gcc11.patch
         llvm-Config-config.h
         llvm-Config-llvm-config.h)
 sha256sums=('44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575'
@@ -51,6 +52,7 @@ sha256sums=('44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575'
             '5702053503d49448598eda1b8dc8c263f0df9ad7486833273e3987b5dec25a19'
             'c964eecdfb0cbf4d2a59a553d7bdb3f16e70d8910e6aa7e9c768828ecbdfcea2'
             '75bfba16c3bf6fd4fc3d4807969f64a68e5259ca6d15b560333cdac9baf09df2'
+            '51cad8d6affb224fe2a9f75814650554983f0714921ae375064d83adc644aba3'
             '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
 
@@ -82,6 +84,9 @@ prepare() {
 
   # -fvisibility-inlines-hidden breaks the build with GCC 10
   patch -Np0 -i ../gcc10.patch
+
+  # various compile errors with gcc 11
+  patch -Np0 -i ../gcc11.patch
 }
 
 build() {
diff --git a/gcc11.patch b/gcc11.patch
new file mode 100644
index 000000000000..63936e510506
--- /dev/null
+++ b/gcc11.patch
@@ -0,0 +1,33 @@
+--- lib/Object/Error.cpp.orig	2014-06-13 17:36:17.000000000 +0200
++++ lib/Object/Error.cpp	2021-10-13 06:55:08.333326192 +0200
+@@ -25,7 +25,7 @@
+ };
+ }
+ 
+-const char *_object_error_category::name() const {
++const char *_object_error_category::name() const LLVM_NOEXCEPT {
+   return "llvm.object";
+ }
+ 
+--- tools/llvm-readobj/Error.cpp.orig	2014-06-13 17:36:17.000000000 +0200
++++ tools/llvm-readobj/Error.cpp	2021-10-13 07:00:45.222140749 +0200
+@@ -24,7 +24,7 @@
+ };
+ } // namespace
+ 
+-const char *_readobj_error_category::name() const {
++const char *_readobj_error_category::name() const LLVM_NOEXCEPT {
+   return "llvm.readobj";
+ }
+ 
+--- tools/obj2yaml/Error.cpp.orig	2014-06-13 17:36:17.000000000 +0200
++++ tools/obj2yaml/Error.cpp	2021-10-13 07:15:20.861056162 +0200
+@@ -20,7 +20,7 @@
+ };
+ } // namespace
+ 
+-const char *_obj2yaml_error_category::name() const { return "obj2yaml"; }
++const char *_obj2yaml_error_category::name() const LLVM_NOEXCEPT { return "obj2yaml"; }
+ 
+ std::string _obj2yaml_error_category::message(int ev) const {
+   switch (static_cast<obj2yaml_error>(ev)) {