tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make __libc_init_main_thread and android_set_abort_message weak

Browse source 
Bug: http://b/67672033
Bug: http://b/67934730
Test: make && flash and boot angler.
Test: run bionic-unit-tests
Change-Id: Ibf47f00dd7fae19014f56c857eb9712711363029
This commit is contained in:
dimitry 2017-10-18 15:15:54 +02:00
parent ab9dc08bdd
commit b6d2b87d2d
3 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libc/bionic/__libc_init_main_thread.cpp
View file

@ -31,6 +31,7 @@
#include "private/KernelArgumentBlock.h" #include "private/KernelArgumentBlock.h"
#include "private/bionic_arc4random.h" #include "private/bionic_arc4random.h"
#include "private/bionic_auxv.h" #include "private/bionic_auxv.h"
#include "private/bionic_defs.h"
#include "private/bionic_globals.h" #include "private/bionic_globals.h"
#include "private/bionic_ssp.h" #include "private/bionic_ssp.h"
#include "pthread_internal.h" #include "pthread_internal.h"
@ -58,6 +59,7 @@ void __libc_init_global_stack_chk_guard(KernelArgumentBlock& args) {
// -fno-stack-protector because it's responsible for setting up the main // -fno-stack-protector because it's responsible for setting up the main
// thread's TLS (which stack protector relies on). // thread's TLS (which stack protector relies on).
__BIONIC_WEAK_FOR_NATIVE_BRIDGE
void __libc_init_main_thread(KernelArgumentBlock& args) { void __libc_init_main_thread(KernelArgumentBlock& args) {
__libc_auxv = args.auxv; __libc_auxv = args.auxv;
#if defined(__i386__) #if defined(__i386__)

2
libc/bionic/android_set_abort_message.cpp
View file

@ -32,6 +32,7 @@
#include <string.h> #include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include "private/bionic_defs.h"
#include "private/ScopedPthreadMutexLocker.h" #include "private/ScopedPthreadMutexLocker.h"
static pthread_mutex_t g_abort_msg_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t g_abort_msg_lock = PTHREAD_MUTEX_INITIALIZER;
@ -43,6 +44,7 @@ struct abort_msg_t {
abort_msg_t** __abort_message_ptr; // Accessible to __libc_init_common. abort_msg_t** __abort_message_ptr; // Accessible to __libc_init_common.
__BIONIC_WEAK_FOR_NATIVE_BRIDGE
void android_set_abort_message(const char* msg) { void android_set_abort_message(const char* msg) {
ScopedPthreadMutexLocker locker(&g_abort_msg_lock); ScopedPthreadMutexLocker locker(&g_abort_msg_lock);

38
libc/private/bionic_defs.h Normal file
View file

@ -0,0 +1,38 @@
/*
* Copyright (C) 2017 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.
*/
#ifndef __BIONIC_PRIVATE_BIONIC_DEFS_H_
#define __BIONIC_PRIVATE_BIONIC_DEFS_H_
/*
* This label is used to mark libc/libdl symbols that may need to be replaced
* by native bridge implementation.
*/
#define __BIONIC_WEAK_FOR_NATIVE_BRIDGE __attribute__((__weak__, __noinline__))
#endif /* __BIONIC_PRIVATE_BIONIC_DEFS_H_ */