Remove the useless indirection in mips' __set_tls.
Change-Id: I12e9d6716c42ccbccc9a186441aca0736bb22d05
This commit is contained in:
Elliott Hughes
parent
4b57305afe
commit
dcbef06ce6
7 changed files with 9 additions and 78 deletions
|
|
@ -61,7 +61,6 @@ int kill(pid_t, int) all
|
|||
int tkill(pid_t tid, int sig) all
|
||||
int tgkill(pid_t tgid, pid_t tid, int sig) all
|
||||
int __ptrace:ptrace(int request, int pid, void* addr, void* data) all
|
||||
int __set_thread_area:set_thread_area(void* user_desc) mips,mips64,x86
|
||||
|
||||
# <sys/resource.h>
|
||||
int getrusage(int, struct rusage*) all
|
||||
|
|
@ -331,3 +330,7 @@ int cacheflush:__ARM_NR_cacheflush(long start, long end, long flags) arm
|
|||
|
||||
# MIPS-specific
|
||||
int _flush_cache:cacheflush(char* addr, const int nbytes, const int op) mips,mips64
|
||||
int __set_tls:set_thread_area(void*) mips,mips64
|
||||
|
||||
# x86-specific
|
||||
int __set_thread_area:set_thread_area(void*) x86
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2008 The Android Open Source Project
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
#include <pthread.h>
|
||||
|
||||
extern int __set_thread_area(void *u_info);
|
||||
|
||||
int __set_tls(void *ptr)
|
||||
{
|
||||
return __set_thread_area(ptr);
|
||||
}
|
||||
|
|
@ -61,7 +61,6 @@ libc_bionic_src_files_mips += \
|
|||
arch-mips/bionic/memcmp16.S \
|
||||
arch-mips/bionic/_setjmp.S \
|
||||
arch-mips/bionic/setjmp.S \
|
||||
arch-mips/bionic/__set_tls.c \
|
||||
arch-mips/bionic/sigsetjmp.S \
|
||||
arch-mips/bionic/syscall.S \
|
||||
arch-mips/bionic/vfork.S \
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <private/bionic_asm.h>
|
||||
|
||||
ENTRY(__set_thread_area)
|
||||
ENTRY(__set_tls)
|
||||
.set noreorder
|
||||
.cpload t9
|
||||
li v0, __NR_set_thread_area
|
||||
|
|
@ -16,4 +16,4 @@ ENTRY(__set_thread_area)
|
|||
j t9
|
||||
nop
|
||||
.set reorder
|
||||
END(__set_thread_area)
|
||||
END(__set_tls)
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2008 The Android Open Source Project
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
#include <pthread.h>
|
||||
|
||||
extern int __set_thread_area(void *u_info);
|
||||
|
||||
int __set_tls(void *ptr)
|
||||
{
|
||||
return __set_thread_area(ptr);
|
||||
}
|
||||
|
|
@ -47,7 +47,6 @@ libc_bionic_src_files_mips64 := \
|
|||
arch-mips64/bionic/memcmp16.S \
|
||||
arch-mips64/bionic/_setjmp.S \
|
||||
arch-mips64/bionic/setjmp.S \
|
||||
arch-mips64/bionic/__set_tls.c \
|
||||
arch-mips64/bionic/sigsetjmp.S \
|
||||
arch-mips64/bionic/syscall.S \
|
||||
arch-mips64/bionic/vfork.S \
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <private/bionic_asm.h>
|
||||
|
||||
ENTRY(__set_thread_area)
|
||||
ENTRY(__set_tls)
|
||||
.set push
|
||||
.set noreorder
|
||||
li v0, __NR_set_thread_area
|
||||
|
|
@ -22,5 +22,5 @@ ENTRY(__set_thread_area)
|
|||
j t9
|
||||
move ra, t0
|
||||
.set pop
|
||||
END(__set_thread_area)
|
||||
.hidden __set_thread_area
|
||||
END(__set_tls)
|
||||
.hidden __set_tls
|
||||
Loading…
Reference in a new issue