From 2d6c6f7db4429bd10546ee18f6afa645b025c977 Mon Sep 17 00:00:00 2001
From: David Chisnall <theraven@FreeBSD.org>
Date: Sat, 30 Mar 2019 20:05:38 +0000
Subject: [PATCH] Revert C++ exception structure changes.

The C++ runtime library passes pointers to the middle of the structure,
so we need to ignore the fields that were previously missing.
---
 objcxx_eh.cc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/objcxx_eh.cc b/objcxx_eh.cc
index 11c0d513..275e48c4 100644
--- a/objcxx_eh.cc
+++ b/objcxx_eh.cc
@@ -76,9 +76,6 @@ static BOOL isKindOfClass(Class thrown, Class type)
  */
 struct __cxa_exception
 {
-#if __LP64__
-	uintptr_t referenceCount;
-#endif
 	std::type_info *exceptionType;
 	void (*exceptionDestructor) (void *);
 	unexpected_handler unexpectedHandler;
@@ -94,9 +91,6 @@ struct __cxa_exception
 	const char *languageSpecificData;
 	void *catchTemp;
 	void *adjustedPtr;
-#if !__LP64__
-	uintptr_t referenceCount;
-#endif
 	_Unwind_Exception unwindHeader;
 };