Merge "Add ARM EABI function __aeabi_read_tp"
This commit is contained in:
Ryan Prichard
Gerrit Code Review
commit
c14d46f086
6 changed files with 117 additions and 0 deletions
|
|
@ -760,6 +760,7 @@ cc_library_static {
|
|||
"arch-arm/generic/bionic/strcpy.S",
|
||||
"arch-arm/generic/bionic/strlen.c",
|
||||
|
||||
"arch-arm/bionic/__aeabi_read_tp.S",
|
||||
"arch-arm/bionic/atomics_arm.c",
|
||||
"arch-arm/bionic/__bionic_clone.S",
|
||||
"arch-arm/bionic/_exit_with_stack_teardown.S",
|
||||
|
|
|
|||
28
libc/NOTICE
28
libc/NOTICE
|
|
@ -1068,6 +1068,34 @@ SUCH DAMAGE.
|
|||
|
||||
-------------------------------------------------------------------
|
||||
|
||||
Copyright (C) 2019 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.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
||||
Copyright (c) 1980, 1983, 1988, 1993
|
||||
The Regents of the University of California. All rights reserved.
|
||||
|
||||
|
|
|
|||
48
libc/arch-arm/bionic/__aeabi_read_tp.S
Normal file
48
libc/arch-arm/bionic/__aeabi_read_tp.S
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
/*
|
||||
* Copyright (C) 2018 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 <private/bionic_asm.h>
|
||||
|
||||
// For arm32 and -mtp=soft, the compiler uses this function to read the thread
|
||||
// pointer for ELF TLS accesses. With -mtp=cp15, the compiler inlines the call
|
||||
// instead. GCC defaults to -mtp=auto, which inlines this function with
|
||||
// -march=armv7-a. Clang does not yet implement -mtp=auto, and instead defaults
|
||||
// to -mtp=soft.
|
||||
// - https://bugs.llvm.org/show_bug.cgi?id=38394.
|
||||
// - https://reviews.llvm.org/D34878?id=114573.
|
||||
//
|
||||
// This function must preserve every register except r0, ip, lr, and cpsr.
|
||||
//
|
||||
// See "Run-time ABI for the ARM Architecture"
|
||||
// http://infocenter.arm.com/help/topic/com.arm.doc.ihi0043d/IHI0043D_rtabi.pdf
|
||||
//
|
||||
ENTRY(__aeabi_read_tp)
|
||||
// __get_tls()
|
||||
mrc p15, 0, r0, c13, c0, 3
|
||||
bx lr
|
||||
END(__aeabi_read_tp)
|
||||
|
|
@ -1446,6 +1446,7 @@ LIBC_P { # introduced=P
|
|||
|
||||
LIBC_Q { # introduced=Q
|
||||
global:
|
||||
__aeabi_read_tp; # arm
|
||||
__res_randomid;
|
||||
android_fdsan_close_with_tag;
|
||||
android_fdsan_create_owner_tag;
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ cc_test_library {
|
|||
name: "libBionicStandardTests",
|
||||
defaults: ["bionic_tests_defaults"],
|
||||
srcs: [
|
||||
"__aeabi_read_tp_test.cpp",
|
||||
"alloca_test.cpp",
|
||||
"android_get_device_api_level.cpp",
|
||||
"arpa_inet_test.cpp",
|
||||
|
|
|
|||
38
tests/__aeabi_read_tp_test.cpp
Normal file
38
tests/__aeabi_read_tp_test.cpp
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
/*
|
||||
* Copyright (C) 2019 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 <gtest/gtest.h>
|
||||
|
||||
#include "private/__get_tls.h"
|
||||
|
||||
#if defined(__arm__)
|
||||
extern "C" void* __aeabi_read_tp();
|
||||
TEST(aeabi, read_tp) {
|
||||
ASSERT_EQ(__aeabi_read_tp(), static_cast<void*>(__get_tls()));
|
||||
}
|
||||
#endif
|
||||
Loading…
Reference in a new issue