Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
84786afd
Commit
84786afd
authored
Oct 31, 2019
by
Federico G. Schwindt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make unwind work under macos
parent
cbd7675a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
cache_panic.c
bin/varnishd/cache/cache_panic.c
+1
-1
configure.ac
configure.ac
+8
-1
No files found.
bin/varnishd/cache/cache_panic.c
View file @
84786afd
...
@@ -647,7 +647,7 @@ pan_backtrace(struct vsb *vsb)
...
@@ -647,7 +647,7 @@ pan_backtrace(struct vsb *vsb)
unw_get_reg
(
&
cursor
,
UNW_REG_SP
,
&
sp
);
unw_get_reg
(
&
cursor
,
UNW_REG_SP
,
&
sp
);
unw_get_proc_name
(
&
cursor
,
fname
,
sizeof
(
fname
),
&
offp
);
unw_get_proc_name
(
&
cursor
,
fname
,
sizeof
(
fname
),
&
offp
);
VSB_printf
(
vsb
,
"ip=0x%lx, sp=0x%lx <%s+0x%lx>
\n
"
,
(
long
)
ip
,
VSB_printf
(
vsb
,
"ip=0x%lx, sp=0x%lx <%s+0x%lx>
\n
"
,
(
long
)
ip
,
(
long
)
sp
,
fname
[
0
]
?
fname
:
"<unknown>"
,
offp
);
(
long
)
sp
,
fname
[
0
]
?
fname
:
"<unknown>"
,
(
long
)
offp
);
}
}
VSB_indent
(
vsb
,
-
2
);
VSB_indent
(
vsb
,
-
2
);
...
...
configure.ac
View file @
84786afd
...
@@ -349,7 +349,14 @@ AC_ARG_WITH([unwind],
...
@@ -349,7 +349,14 @@ AC_ARG_WITH([unwind],
[use libunwind to print stacktraces (use libexecinfo otherwise). Recommended on alpine linux. Defaults to no.])])
[use libunwind to print stacktraces (use libexecinfo otherwise). Recommended on alpine linux. Defaults to no.])])
if test "$with_unwind" = yes; then
if test "$with_unwind" = yes; then
case $target in
*-*-darwin*)
# Always present but .pc is not installed
;;
*)
PKG_CHECK_MODULES([LIBUNWIND], [libunwind])
PKG_CHECK_MODULES([LIBUNWIND], [libunwind])
;;
esac
AC_DEFINE([WITH_UNWIND], [1],
AC_DEFINE([WITH_UNWIND], [1],
[Define to 1 to use libunwind instead of libexecinfo])
[Define to 1 to use libunwind instead of libexecinfo])
else
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment