From 816ea521a18c1c781fc0110ac6098bcaf18a63e5 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Tue, 6 Nov 2018 00:28:53 +0000
Subject: [PATCH] User helper macro to fixup config.h for multilib

---
 clang-config.h |  9 ---------
 clang.spec     | 13 ++++++++-----
 2 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 clang-config.h

diff --git a/clang-config.h b/clang-config.h
deleted file mode 100644
index c369b45..0000000
--- a/clang-config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "config-32.h"
-#elif __WORDSIZE == 64
-#include "config-64.h"
-#else
-#error "Unknown word size"
-#endif
diff --git a/clang.spec b/clang.spec
index 94206db..f8dff76 100644
--- a/clang.spec
+++ b/clang.spec
@@ -58,7 +58,7 @@
 
 Name:		%pkg_name
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	NCSA
@@ -76,8 +76,6 @@ Source1:	http://llvm.org/releases/%{version}/%{clang_tools_srcdir}.tar.xz
 Source2:	%{test_suite_srcdir}.tar.xz
 %endif
 
-Source100:	clang-config.h
-
 Patch0:		0001-lit.cfg-Add-hack-so-lit-can-find-not-and-FileCheck.patch
 Patch1:		0001-GCC-compatibility-Ignore-fstack-clash-protection.patch
 Patch2:		0001-Driver-Prefer-vendor-supplied-gcc-toolchain.patch
@@ -120,6 +118,9 @@ BuildRequires: libatomic
 # We need python3-devel for pathfix.py.
 BuildRequires:	python3-devel
 
+# Needed for %%multilib_fix_c_header
+BuildRequires:  multilib-rpm-config
+
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 # clang requires gcc, clang++ requires libstdc++-devel
@@ -337,8 +338,7 @@ mkdir -p %{buildroot}%{python2_sitelib}/clang/
 install -p -m644 bindings/python/clang/* %{buildroot}%{python2_sitelib}/clang/
 
 # multilib fix
-mv -v %{buildroot}%{_includedir}/clang/Config/config{,-%{__isa_bits}}.h
-install -m 0644 %{SOURCE100} %{buildroot}%{_includedir}/clang/Config/config.h
+%multilib_fix_c_header --file %{_includedir}/clang/Config/config.h
 
 # Move emacs integration files to the correct directory
 mkdir -p %{buildroot}%{_emacs_sitestartdir}
@@ -448,6 +448,9 @@ false
 
 %endif
 %changelog
+* Mon Nov 05 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-3
+- User helper macro to fixup config.h for multilib
+
 * Tue Oct 02 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-2
 - Use correct shebang substitution for python scripts