Adjust sparc64 bits after libunwind 6.0.0 update.

ok visa@

diff --git a/lib/libunwind/include/__libunwind_config.h b/lib/libunwind/include/__libunwind_config.h
index 95632e0..e0b650f 100644 (file)
--- a/lib/libunwind/include/__libunwind_config.h
+++ b/lib/libunwind/include/__libunwind_config.h
@@ -23,6 +23,7 @@
 #define _LIBUNWIND_HIGHEST_DWARF_REGISTER_ARM       287
 #define _LIBUNWIND_HIGHEST_DWARF_REGISTER_OR1K      31
 #define _LIBUNWIND_HIGHEST_DWARF_REGISTER_MIPS      65
+#define _LIBUNWIND_HIGHEST_DWARF_REGISTER_SPARC64   32
 
 #if defined(_LIBUNWIND_IS_NATIVE_ONLY)
 # if defined(__i386__)
@@ -87,7 +88,7 @@
 #  define _LIBUNWIND_TARGET_SPARC64 1
 #  define _LIBUNWIND_CONTEXT_SIZE 33
 #  define _LIBUNWIND_CURSOR_SIZE 45
-#  define _LIBUNWIND_HIGHEST_DWARF_REGISTER 32
+#  define _LIBUNWIND_HIGHEST_DWARF_REGISTER _LIBUNWIND_HIGHEST_DWARF_REGISTER_SPARC64
 # else
 #  error "Unsupported architecture."
 # endif
@@ -101,6 +102,7 @@
 # define _LIBUNWIND_TARGET_OR1K 1
 # define _LIBUNWIND_TARGET_MIPS_O32 1
 # define _LIBUNWIND_TARGET_MIPS_N64 1
+# define _LIBUNWIND_TARGET_SPARC64 1
 # define _LIBUNWIND_CONTEXT_SIZE 136
 # define _LIBUNWIND_CURSOR_SIZE 148
 # define _LIBUNWIND_HIGHEST_DWARF_REGISTER 287

diff --git a/lib/libunwind/src/DwarfParser.hpp b/lib/libunwind/src/DwarfParser.hpp
index 1911f16..699e4fb 100644 (file)
--- a/lib/libunwind/src/DwarfParser.hpp
+++ b/lib/libunwind/src/DwarfParser.hpp
@@ -657,7 +657,7 @@ bool CFI_Parser<A>::parseInstructions(A &addressSpace, pint_t instructions,
          results->savedRegisters[reg].location = kRegisterInCFA;
        results->savedRegisters[reg].value = (reg - 16) * sizeof(pint_t);
       }
-      _LIBUNWIND_LOG0("DW_CGA_GNU_window_save");
+      _LIBUNWIND_TRACE_DWARF("DW_CFA_GNU_window_save");
       break;
     case DW_CFA_GNU_args_size:
       length = addressSpace.getULEB128(p, instructionsEnd);