From 8f41b6b63f7743d4bff36792a491444cdefee521 Mon Sep 17 00:00:00 2001
From: Davide Cavalca <dcavalca@fb.com>
Date: May 09 2021 17:51:39 +0000
Subject: Backport https://reviews.llvm.org/D101972 to fix the test failures


---

diff --git a/SOURCES/D101972-backport.patch b/SOURCES/D101972-backport.patch
new file mode 100644
index 0000000..c74c9cb
--- /dev/null
+++ b/SOURCES/D101972-backport.patch
@@ -0,0 +1,17 @@
+--- a/llvm/lib/Target/CMakeLists.txt
++++ b/llvm/lib/Target/CMakeLists.txt
+@@ -19,14 +19,6 @@
+   Support
+   )
+ 
+-# When building shared objects for each target there are some internal APIs
+-# that are used across shared objects which we can't hide.
+-if (NOT BUILD_SHARED_LIBS AND NOT APPLE)
+-  # Set default visibility to hidden, so we don't export all the Target classes
+-  # in libLLVM.so.
+-  set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+-endif()
+-
+ foreach(t ${LLVM_TARGETS_TO_BUILD})
+   message(STATUS "Targeting ${t}")
+   add_subdirectory(${t})
diff --git a/SPECS/llvm.spec b/SPECS/llvm.spec
index 07b3eae..7a6fdd1 100644
--- a/SPECS/llvm.spec
+++ b/SPECS/llvm.spec
@@ -52,7 +52,7 @@
 
 Name:		%{pkg_name}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
-Release:	6.1%{?dist}
+Release:	6.2%{?dist}
 Summary:	The Low Level Virtual Machine
 
 License:	NCSA
@@ -67,6 +67,9 @@ Source4:	lit.fedora.cfg.py
 %endif
 
 Patch0:     0001-PATCH-llvm-Make-source-interleave-prefix-test-case-c.patch
+# Backport of https://reviews.llvm.org/D101972
+# Do not set CMAKE_CXX_VISIBILITY_PRESET to hidden
+Patch1:     D101972-backport.patch
 
 # RHEL-specific patches.
 Patch101:       0001-Deactivate-markdown-doc.patch
@@ -438,12 +441,7 @@ rm test/tools/llvm-readobj/ELF/dependent-libraries.test
 rm test/tools/dsymutil/X86/swift-interface.test
 
 # FIXME: use %%cmake_build instead of %%__ninja
-LD_LIBRARY_PATH=%{buildroot}/%{pkg_libdir}  %{__ninja} check-all -C %{_vpath_builddir} || \
-%if 0%{?rhel}
- :
-%else
- false
-%endif
+LD_LIBRARY_PATH=%{buildroot}/%{pkg_libdir}  %{__ninja} check-all -C %{_vpath_builddir}
 
 %ldconfig_scriptlets libs
 
@@ -561,6 +559,9 @@ fi
 %endif
 
 %changelog
+* Sun May 09 2021 Davide Cavalca <dcavalca@fb.com> - 12.0.0-6.2
+- Backport https://reviews.llvm.org/D101972 to fix the test failures
+
 * Fri May 07 2021 Davide Cavalca <dcavalca@fb.com> - 12.0.0-6.1
 - Add build fixes for CentOS Stream
 - Temporarily ignore test failures to help investigation