Support x86-64 floating point registers.
ART uses some x86-64 floating point registers as callee save.
Therefore they are in the CFI and libunwind needs to understand them.
(cherry picked from commit d79f9bbebb13ba9f3a2676c8b8f7cd9e1a4c28d7)
Bug: 21924613
Change-Id: I57f32e5b3b795fa7d2a23e9aeb8aa72d5787a15a
diff --git a/include/config.h b/include/config.h
index 41916ae..bcef953 100644
--- a/include/config.h
+++ b/include/config.h
@@ -8,7 +8,8 @@
#define CONFIG_DEBUG_FRAME 1
/* Support for Microsoft ABI extensions */
-/* #undef CONFIG_MSABI_SUPPORT */
+/* This is required to understand floating point registers on x86-64 */
+#define CONFIG_MSABI_SUPPORT 1
/* Define to 1 if you want every memory access validated */
#define CONSERVATIVE_CHECKS 1
diff --git a/include/dwarf.h b/include/dwarf.h
index c66a206..3665e00 100644
--- a/include/dwarf.h
+++ b/include/dwarf.h
@@ -32,14 +32,14 @@
struct elf_dyn_info;
/* ANDROID support update. */
struct elf_image;
-/* End of ANDROID update. */
-
-#include "dwarf-config.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include "dwarf-config.h"
+/* End of ANDROID update. */
+
#ifndef UNW_REMOTE_ONLY
#if defined(HAVE_LINK_H)
#include <link.h>
