From acf6db1afc359cb47a85680be57ab7173def8ea1 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Oct 16 2021 04:04:52 +0000
Subject: Adjust dwz limits


The higher limits make it possible to optimize the debuginfo of
libLLVM.so.  On x86_64, this change reduces the final optimized debuginfo
size from 3.35GB to 2.92GB.

---

diff --git a/llvm.spec b/llvm.spec
index 3ff1552..49ecc96 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -50,9 +50,26 @@
 
 %global build_install_prefix %{buildroot}%{install_prefix}
 
-# Lower memory usage of dwz on s390x
-%global _dwz_low_mem_die_limit_s390x 1
-%global _dwz_max_die_limit_s390x 1000000
+# The arch specific limits supersede the general limits, so if there is an
+# arch specific limit defined in a global macro file, then the only way to
+# change the value is to use the arch specific variable.  To be safe, we
+# just set the arch specific value for everything.
+
+%global _dwz_max_die_limit 1100000000
+%global _dwz_max_die_limit_aarch64 %{_dwz_max_die_limit}
+%global _dwz_max_die_limit_armv7hl %{_dwz_max_die_limit}
+%global _dwz_max_die_limit_i686 %{_dwz_max_die_limit}
+%global _dwz_max_die_limit_ppc64le %{_dwz_max_die_limit}
+%global _dwz_max_die_limit_x86_64 %{_dwz_max_die_limit}
+%global _dwz_max_die_limit_s390x %{_dwz_max_die_limit}
+
+%global _dwz_low_mem_die_limit 1100000000
+%global _dwz_low_mem_die_limit_aarch64 %{_dwz_low_mem_die_limit}
+%global _dwz_low_mem_die_limit_armv7hl %{_dwz_low_mem_die_limit}
+%global _dwz_low_mem_die_limit_i686 %{_dwz_low_mem_die_limit}
+%global _dwz_low_mem_die_limit_ppc64le %{_dwz_low_mem_die_limit}
+%global _dwz_low_mem_die_limit_x86_64 %{_dwz_low_mem_die_limit}
+%global _dwz_low_mem_die_limit_s390x %{_dwz_low_mem_die_limit}
 
 %ifarch %{arm}
 # koji overrides the _gnu variable to be gnu, which is not correct for clang, so
@@ -64,7 +81,7 @@
 
 Name:		%{pkg_name}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	The Low Level Virtual Machine
 
 License:	NCSA
@@ -545,6 +562,9 @@ fi
 %endif
 
 %changelog
+* Sat Oct 16 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0-5
+- Adjust dwz limits
+
 * Fri Oct 08 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0-4
 - Fix default triple on arm