diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-12 16:11:06 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-05-12 16:11:06 -0700 |
| commit | dcbef06ce6bb21d62d5a32148a3e64746b47b449 (patch) | |
| tree | 193e7494535d26ac5820c17b0993817e709d55b3 /libc/arch-mips | |
| parent | 4b57305afe2b54a6afb733361f6fd93cb92ccfa8 (diff) | |
| download | bionic-dcbef06ce6bb21d62d5a32148a3e64746b47b449.zip bionic-dcbef06ce6bb21d62d5a32148a3e64746b47b449.tar.gz bionic-dcbef06ce6bb21d62d5a32148a3e64746b47b449.tar.bz2 | |
Remove the useless indirection in mips' __set_tls.
Change-Id: I12e9d6716c42ccbccc9a186441aca0736bb22d05
Diffstat (limited to 'libc/arch-mips')
| -rw-r--r-- | libc/arch-mips/bionic/__set_tls.c | 35 | ||||
| -rw-r--r-- | libc/arch-mips/mips.mk | 1 | ||||
| -rw-r--r-- | libc/arch-mips/syscalls/__set_tls.S (renamed from libc/arch-mips/syscalls/__set_thread_area.S) | 4 |
3 files changed, 2 insertions, 38 deletions
diff --git a/libc/arch-mips/bionic/__set_tls.c b/libc/arch-mips/bionic/__set_tls.c deleted file mode 100644 index 38e3a50..0000000 --- a/libc/arch-mips/bionic/__set_tls.c +++ /dev/null @@ -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); -} diff --git a/libc/arch-mips/mips.mk b/libc/arch-mips/mips.mk index 53fa223..bffd897 100644 --- a/libc/arch-mips/mips.mk +++ b/libc/arch-mips/mips.mk @@ -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 \ diff --git a/libc/arch-mips/syscalls/__set_thread_area.S b/libc/arch-mips/syscalls/__set_tls.S index f83249e..e5b0ca2 100644 --- a/libc/arch-mips/syscalls/__set_thread_area.S +++ b/libc/arch-mips/syscalls/__set_tls.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) |
