am 0aa1fb1c: am 7471a370: Merge "Hide __set_tls."

* commit '0aa1fb1c1672a3bbe63155e05e445826c64aafb7':
  Hide __set_tls.
This commit is contained in:
Elliott Hughes 2014-05-21 15:28:18 +00:00 committed by Android Git Automerger
commit f55dc41303
3 changed files with 5 additions and 3 deletions

View File

@ -26,6 +26,8 @@
* SUCH DAMAGE.
*/
void __set_tls(void* tls) {
#include <sys/cdefs.h>
__LIBC_HIDDEN__ void __set_tls(void* tls) {
asm("msr tpidr_el0, %0" : : "r" (tls));
}

View File

@ -57,7 +57,7 @@ __LIBC_HIDDEN__ void __init_user_desc(struct user_desc* result, bool allocate, v
result->useable = 1;
}
int __set_tls(void* ptr) {
__LIBC_HIDDEN__ int __set_tls(void* ptr) {
struct user_desc tls_descriptor;
__init_user_desc(&tls_descriptor, true, ptr);

View File

@ -31,6 +31,6 @@
extern int __arch_prctl(int, unsigned long);
int __set_tls(void* ptr) {
__LIBC_HIDDEN__ int __set_tls(void* ptr) {
return __arch_prctl(ARCH_SET_FS, (uintptr_t) ptr);
}