OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c483a73
)
ART: Fix mac build
author
Andreas Gampe
<agampe@google.com>
Thu, 14 Aug 2014 02:54:09 +0000
(19:54 -0700)
committer
Andreas Gampe
<agampe@google.com>
Thu, 14 Aug 2014 16:03:21 +0000
(09:03 -0700)
is_main_thread is unused in the case of a mac.
Bug:
15435566
(cherry picked from commit
7b1bf42dbc765524d54d45a70cb7eb1cccf0c617
)
Change-Id: I9848d0156a4903ce73d20b5ce282b61ceb3039ff
runtime/thread.cc
patch
|
blob
|
history
diff --git
a/runtime/thread.cc
b/runtime/thread.cc
index
4ce8c96
..
b2fbf74
100644
(file)
--- a/
runtime/thread.cc
+++ b/
runtime/thread.cc
@@
-505,9
+505,7
@@
void Thread::InitStackHwm() {
}
// TODO: move this into the Linux GetThreadStack implementation.
-#if defined(__APPLE__)
- bool is_main_thread = false;
-#else
+#if !defined(__APPLE__)
// If we're the main thread, check whether we were run with an unlimited stack. In that case,
// glibc will have reported a 2GB stack for our 32-bit process, and our stack overflow detection
// will be broken because we'll die long before we get close to 2GB.