Author: Richard Plangger <planri...@gmail.com>
Branch:
Changeset: r90942:83f4ee0e2106
Date: 2017-04-03 20:32 -0400
http://bitbucket.org/pypy/pypy/changeset/83f4ee0e2106/
Log: merge heads
diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.c
b/rpython/rlib/rvmprof/src/shared/symboltable.c
--- a/rpython/rlib/rvmprof/src/shared/symboltable.c
+++ b/rpython/rlib/rvmprof/src/shared/symboltable.c
@@ -215,7 +215,7 @@
name[name_len-1] = 0;
}
lookup_vmprof_debug_info(name, info.dli_fbase, srcfile, srcfile_len,
lineno);
-#elif defined(RVMPROF_BACKTRACE)
+#elif defined(RVMPROF_BACKTRACE) || defined(VMPROF_LINUX)
if (bstate == NULL) {
bstate = backtrace_create_state (NULL, 1, backtrace_error_cb, NULL);
}
diff --git a/rpython/rlib/rvmprof/src/shared/unwind/vmprof_unwind.h
b/rpython/rlib/rvmprof/src/shared/unwind/vmprof_unwind.h
--- a/rpython/rlib/rvmprof/src/shared/unwind/vmprof_unwind.h
+++ b/rpython/rlib/rvmprof/src/shared/unwind/vmprof_unwind.h
@@ -20,9 +20,9 @@
#endif
-#ifdef VMP_SUPPORTS_NATIVE_PROFILING
#define UNW_TDEP_CURSOR_LEN 127
+#ifdef VMP_SUPPORTS_NATIVE_PROFILING
typedef struct unw_cursor
{
unw_word_t opaque[UNW_TDEP_CURSOR_LEN];
diff --git a/rpython/rlib/rvmprof/src/shared/vmprof.h
b/rpython/rlib/rvmprof/src/shared/vmprof.h
--- a/rpython/rlib/rvmprof/src/shared/vmprof.h
+++ b/rpython/rlib/rvmprof/src/shared/vmprof.h
@@ -47,7 +47,6 @@
#endif
#endif
-
#ifdef RPYTHON_VMPROF
// only for pypy
#include "rvmprof.h"
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
