about summary refs log tree commit diff
path: root/src/libstd/sys/unix/backtrace/tracing/gcc_s.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-11-09 18:14:48 +0000
committerbors <bors@rust-lang.org>2017-11-09 18:14:48 +0000
commitf1ea23e2cc72cafad1dc25a06c09ec2de8e323eb (patch)
tree4bafb2a94c6755051649f9e6cfca17c0312712ab /src/libstd/sys/unix/backtrace/tracing/gcc_s.rs
parent98e791e7e135ef6526ca97c33fcf8cd0db50320f (diff)
parent5c3fe111d4a6e72f0461320f5166bcd6aaf2f37f (diff)
downloadrust-f1ea23e2cc72cafad1dc25a06c09ec2de8e323eb.tar.gz
rust-f1ea23e2cc72cafad1dc25a06c09ec2de8e323eb.zip
Auto merge of #45725 - alexcrichton:std-less-rand, r=dtolnay
Working towards a libc-less (wasm32) libstd

This is a series of commits I was able to extract from prepare to comiple libstd on a "bare libc-less" target, notably wasm32. The actual wasm32 bits I intend to send in a PR later, this is just some internal refactorings required for libstd to work with a `libc` that's empty and a few other assorted refactorings.

No functional change should be included in this PR for users of libstd, this is intended to just be internal refactorings.
Diffstat (limited to 'src/libstd/sys/unix/backtrace/tracing/gcc_s.rs')
-rw-r--r--src/libstd/sys/unix/backtrace/tracing/gcc_s.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/backtrace/tracing/gcc_s.rs b/src/libstd/sys/unix/backtrace/tracing/gcc_s.rs
index e3ffbe88acd..000c08d2e0d 100644
--- a/src/libstd/sys/unix/backtrace/tracing/gcc_s.rs
+++ b/src/libstd/sys/unix/backtrace/tracing/gcc_s.rs
@@ -96,8 +96,8 @@ extern fn trace_fn(ctx: *mut uw::_Unwind_Context,
 
     if cx.idx < cx.frames.len() {
         cx.frames[cx.idx] = Frame {
-            symbol_addr: symaddr,
-            exact_position: ip,
+            symbol_addr: symaddr as *mut u8,
+            exact_position: ip as *mut u8,
         };
         cx.idx += 1;
     }