Index: libcfa/src/exception.c
===================================================================
--- libcfa/src/exception.c	(revision 88cafe7991e4d4b769f11c34a6c1af0ae4ecffba)
+++ libcfa/src/exception.c	(revision 67ca73e71dbea21372d807389df49e401624ec3b)
@@ -9,7 +9,7 @@
 // Author           : Andrew Beach
 // Created On       : Mon Jun 26 15:13:00 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr May 21 12:18:00 2020
-// Update Count     : 20
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Aug 15 07:17:19 2020
+// Update Count     : 26
 //
 
@@ -21,5 +21,8 @@
 // Implementation of the secret header is hardware dependent.
 #if !( defined( __x86_64 ) || defined( __i386 ) )
-#error Exception Handling: No known architecture detected.
+#elif defined( __ARM_ARCH )
+#warning FIX ME: check if anything needed for ARM
+#else
+#warning Exception Handling: No known architecture detected.
 #endif
 
@@ -297,5 +300,5 @@
 	abort();
 }
-
+#if 0
 // This is our personality routine. For every stack frame annotated with
 // ".cfi_personality 0x3,__gcfa_personality_v0" this function will be called twice when unwinding.
@@ -409,8 +412,12 @@
 				cur_ptr = read_uleb128(cur_ptr, &imatcher);
 
+				_Unwind_Word match_pos =
 #				if defined( __x86_64 )
-				_Unwind_Word match_pos = _Unwind_GetCFA(unwind_context) + 8;
+				    _Unwind_GetCFA(unwind_context) + 8;
 #				elif defined( __i386 )
-				_Unwind_Word match_pos = _Unwind_GetCFA(unwind_context) + 24;
+				    _Unwind_GetCFA(unwind_context) + 24;
+#				elif defined( __ARM_ARCH )
+#				    warning FIX ME: check if anything needed for ARM
+				    42;
 #				endif
 				int (*matcher)(exception_t *) = *(int(**)(exception_t *))match_pos;
@@ -602,2 +609,3 @@
 
 #pragma GCC pop_options
+#endif // 0