From a0ad7b4d3a9726845704a1b92017ab7d82549151 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Wed, 17 Feb 2021 20:33:49 +0000
Subject: [PATCH] 12.0.0-rc1 Release

---
 .gitignore                                    |  2 ++
 ...e-refstring.h-from-system-includedir.patch | 25 +++++++++++++++++++
 ...ibcxxabi-Remove-monorepo-requirement.patch | 19 ++++++++++----
 libcxxabi.spec                                | 10 +++++---
 sources                                       |  4 +--
 5 files changed, 50 insertions(+), 10 deletions(-)
 create mode 100644 0001-Include-refstring.h-from-system-includedir.patch

diff --git a/.gitignore b/.gitignore
index 8a2c64a..4261c5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,5 @@
 /libcxxabi-11.1.0rc1.src.tar.xz.sig
 /libcxxabi-11.1.0rc2.src.tar.xz
 /libcxxabi-11.1.0rc2.src.tar.xz.sig
+/libcxxabi-12.0.0rc1.src.tar.xz
+/libcxxabi-12.0.0rc1.src.tar.xz.sig
diff --git a/0001-Include-refstring.h-from-system-includedir.patch b/0001-Include-refstring.h-from-system-includedir.patch
new file mode 100644
index 0000000..616d5c6
--- /dev/null
+++ b/0001-Include-refstring.h-from-system-includedir.patch
@@ -0,0 +1,25 @@
+From d216fcd05862fd7e4bb9395e2c96a0f24e63a548 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Wed, 17 Feb 2021 12:50:08 -0800
+Subject: [PATCH] Include refstring.h from system includedir
+
+---
+ libcxxabi/src/stdlib_stdexcept.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcxxabi/src/stdlib_stdexcept.cpp b/libcxxabi/src/stdlib_stdexcept.cpp
+index 4a464e48893d..c3d14b224186 100644
+--- a/libcxxabi/src/stdlib_stdexcept.cpp
++++ b/libcxxabi/src/stdlib_stdexcept.cpp
+@@ -6,7 +6,7 @@
+ //
+ //===----------------------------------------------------------------------===//
+ 
+-#include "../../libcxx/src/include/refstring.h"
++#include <libcxx-internal/refstring.h>
+ #include "stdexcept"
+ #include "new"
+ #include <cstdlib>
+-- 
+2.27.0
+
diff --git a/0001-libcxxabi-Remove-monorepo-requirement.patch b/0001-libcxxabi-Remove-monorepo-requirement.patch
index 2cbf263..0bd8f7b 100644
--- a/0001-libcxxabi-Remove-monorepo-requirement.patch
+++ b/0001-libcxxabi-Remove-monorepo-requirement.patch
@@ -1,14 +1,14 @@
-From ba3084240c5dc08557734be0ed81bfa52be81bce Mon Sep 17 00:00:00 2001
+From d19bf09163a54984160eda55a43b93703f8d46b5 Mon Sep 17 00:00:00 2001
 From: Tom Stellard <tstellar@redhat.com>
 Date: Tue, 11 Aug 2020 08:27:41 -0700
 Subject: [PATCH] libcxxabi: Remove monorepo requirement
 
 ---
- libcxxabi/CMakeLists.txt | 4 ----
- 1 file changed, 4 deletions(-)
+ libcxxabi/CMakeLists.txt | 6 ------
+ 1 file changed, 6 deletions(-)
 
 diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt
-index 6cb139b311c..f124c09fcac 100644
+index 426c855288fc..8ad0475dc65e 100644
 --- a/libcxxabi/CMakeLists.txt
 +++ b/libcxxabi/CMakeLists.txt
 @@ -1,9 +1,5 @@
@@ -21,6 +21,15 @@ index 6cb139b311c..f124c09fcac 100644
  #===============================================================================
  # Setup Project
  #===============================================================================
+@@ -42,8 +38,6 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_B
+   set(LIBCXXABI_STANDALONE_BUILD 1)
+   set(LLVM_LIT_OUTPUT_DIR "${LIBCXXABI_BINARY_DIR}/bin")
+ 
+-  # Find the LLVM sources and simulate LLVM CMake options.
+-  include(HandleOutOfTreeLLVM)
+ endif()
+ 
+ if (LIBCXXABI_STANDALONE_BUILD)
 -- 
-2.18.1
+2.27.0
 
diff --git a/libcxxabi.spec b/libcxxabi.spec
index 5bc851d..3c2dfdf 100644
--- a/libcxxabi.spec
+++ b/libcxxabi.spec
@@ -1,11 +1,11 @@
 %global toolchain clang
-%global rc_ver 2
-%global baserelease 4
+%global rc_ver 1
+%global baserelease 1
 %global libcxxabi_srcdir libcxxabi-%{version}%{?rc_ver:rc%{rc_ver}}.src
 
 
 Name:		libcxxabi
-Version:	11.1.0
+Version:	12.0.0
 Release:	%{?rc_ver:0.}%{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist}
 Summary:	Low level support for a standard C++ library
 License:	MIT or NCSA
@@ -15,6 +15,7 @@ Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{versio
 Source2:	tstellar-gpg-key.asc
 
 Patch0:		0001-libcxxabi-Remove-monorepo-requirement.patch
+Patch1:		0001-Include-refstring.h-from-system-includedir.patch
 
 BuildRequires:	clang llvm-devel cmake llvm-static ninja-build
 BuildRequires:	libcxx-devel >= %{version}
@@ -100,6 +101,9 @@ cp -a include/* %{buildroot}%{_includedir}
 %{_libdir}/libc++abi.a
 
 %changelog
+* Wed Feb 17 2021 Tom Stellard <tstellar@redhat.com> - 12.0.0-0.1.rc1
+- 12.0.0-rc1 Release
+
 * Wed Feb 03 2021 Timm Bäder <tbaeder@redhat.com> - 11.1.0-0.4.rc2
 - Fix passing the llvm config
 
diff --git a/sources b/sources
index c864ae5..d4c6522 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libcxxabi-11.1.0rc2.src.tar.xz) = 01ba866703d57f5bfda047f0e36cf9085614e435db46eeaa66c6e40cd5e258b2a6cfc7b62966d3ade68dc58f9b973539175820664d7b7407aa15d36d20c2eb9f
-SHA512 (libcxxabi-11.1.0rc2.src.tar.xz.sig) = ace0698b32bc6dfa2b974ea876cead87fa232189d8c6c9a9eac4bb2b137d7929e921fe38444082ddf5835d5b217bd8ac65cd2b84d9aa0655f68037a49245edce
+SHA512 (libcxxabi-12.0.0rc1.src.tar.xz) = 4aadc028dd763512c413f4424f646d945cab6eeb4e034a7b7e0816bee1cd6c27d54b44277594116d3200ab4f7df9656af1c92e5cb7e2fb49626d1ed1a0a57bca
+SHA512 (libcxxabi-12.0.0rc1.src.tar.xz.sig) = 3f59c6e26d4d19285353543bbc9e8ee3ef4d5ab004a36d21affc73786791263285a5febfc9c557182e2556285e7ef606ccf2b4cb801ca5d651c654d63ce04862