diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6be609acf3f..32aa39c02a4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2020-02-07  Jakub Jelinek  <jakub@redhat.com>
 
+	PR target/93615
+	* gcc.dg/pr93615.c: New test.
+
 	PR target/93611
 	* gcc.target/i386/pr93611.c: New test.
 
diff --git a/gcc/testsuite/gcc.dg/pr93615.c b/gcc/testsuite/gcc.dg/pr93615.c
new file mode 100644
index 00000000000..2e98f5200c5
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr93615.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-std=c11" } */
+/* { dg-require-effective-target exceptions } */
+
+#include <unwind.h>
+
+int
+main ()
+{
+  return 0;
+}
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 9ec9edf7066..b6e5ffc640d 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,11 @@
+2020-02-07  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/93615
+	* config/arm/unwind-arm.h (gnu_Unwind_Find_got): Rename to ...
+	(_Unwind_gnu_Find_got): ... this.  Use __asm instead of asm.  Remove
+	trailing :s in asm.  Formatting fixes.
+	(_Unwind_decode_typeinfo_ptr): Adjust caller.
+
 2020-01-31  Sandra Loosemore  <sandra@codesourcery.com>
 
 	nios2: Support for GOT-relative DW_EH_PE_datarel encoding.
diff --git a/libgcc/config/arm/unwind-arm.h b/libgcc/config/arm/unwind-arm.h
index 1c8285582ea..e77b769d782 100644
--- a/libgcc/config/arm/unwind-arm.h
+++ b/libgcc/config/arm/unwind-arm.h
@@ -43,19 +43,15 @@ extern "C" {
 #endif
 _Unwind_Ptr __attribute__((weak)) __gnu_Unwind_Find_got (_Unwind_Ptr);
 
-static inline _Unwind_Ptr gnu_Unwind_Find_got (_Unwind_Ptr ptr)
+static inline _Unwind_Ptr _Unwind_gnu_Find_got (_Unwind_Ptr ptr)
 {
     _Unwind_Ptr res;
 
     if (__gnu_Unwind_Find_got)
-	res =  __gnu_Unwind_Find_got (ptr);
+	res = __gnu_Unwind_Find_got (ptr);
     else
-      {
-	asm volatile ("mov %[result], r" XSTR(FDPIC_REGNUM)
-		      : [result]"=r" (res)
-		      :
-		      :);
-      }
+	__asm volatile ("mov %[result], r" XSTR(FDPIC_REGNUM)
+			: [result] "=r" (res));
 
     return res;
 }
@@ -75,7 +71,7 @@ static inline _Unwind_Ptr gnu_Unwind_Find_got (_Unwind_Ptr ptr)
 #if __FDPIC__
       /* For FDPIC, we store the offset of the GOT entry.  */
       /* So, first get GOT from dynamic linker and then use indirect access.  */
-      tmp += gnu_Unwind_Find_got (ptr);
+      tmp += _Unwind_gnu_Find_got (ptr);
       tmp = *(_Unwind_Word *) tmp;
 #elif (defined(linux) && !defined(__uClinux__)) || defined(__NetBSD__) \
     || defined(__FreeBSD__) || defined(__fuchsia__)