projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
native_client
/
src
/
untrusted
/
irt
/
irt_private_tls.c
diff --git
a/src/native_client/src/untrusted/irt/irt_private_tls.c
b/src/native_client/src/untrusted/irt/irt_private_tls.c
index
6948e24
..
a899d89
100644
(file)
--- a/
src/native_client/src/untrusted/irt/irt_private_tls.c
+++ b/
src/native_client/src/untrusted/irt/irt_private_tls.c
@@
-37,7
+37,10
@@
void *nacl_tls_get(void) {
* lot faster.
*/
void *result;
* lot faster.
*/
void *result;
- __asm__("mov %%gs:4, %0" : "=r"(result));
+ /*
+ * tls_edit is now responsible for changing the gs offset to 4
+ */
+ __asm__("mov %%gs:0, %0" : "=r"(result));
return result;
#else
return NACL_SYSCALL(second_tls_get)();
return result;
#else
return NACL_SYSCALL(second_tls_get)();