am 0c2b7a72: am 2746b928: Merge "Revert "Fix clang build breakage ("arithmetic on a pointer to void").""

* commit '0c2b7a72af0c64d3d3cf33311be99a4f25e01a29':
  Revert "Fix clang build breakage ("arithmetic on a pointer to void")."
This commit is contained in:
Elliott Hughes 2015-03-31 03:07:16 +00:00 committed by Android Git Automerger
commit 832253b966

View File

@ -77,7 +77,7 @@ void __init_alternate_signal_stack(pthread_internal_t* thread) {
return;
}
stack_t ss;
ss.ss_sp = reinterpret_cast<uint8_t*>(stack_base) + PAGE_SIZE;
ss.ss_sp = stack_base + PAGE_SIZE;
ss.ss_size = SIGNAL_STACK_SIZE - PAGE_SIZE;
ss.ss_flags = 0;
sigaltstack(&ss, NULL);