generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved conflicts for merge of 912fe0a6 to lmp-mr1-dev-plus-aosp

Browse Source 
Change-Id: Ie1cc84f34ccaf27eae4f3c292d67d44a9f0276bc
This commit is contained in:
Elliott Hughes
2014-10-29 12:38:36 -07:00
parent 3834e0fd68 912fe0a6df
commit e3c9f21eaf
2 changed files with 1 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libc/arch-x86/bionic/__restore_rt.S
View File

@@ -1,36 +0,0 @@
/*
* Copyright (C) 2014 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>
// This function must have exactly this instruction sequence for gdb and libunwind.
// This function must have exactly this name for gdb.
ENTRY(__restore_rt)
movl $__NR_rt_sigreturn, %eax
int $0x80
END(__restore_rt)

2
tests/Android.mk
View File

@@ -91,6 +91,7 @@ libBionicStandardTests_src_files := \
semaphore_test.cpp \ semaphore_test.cpp \
signal_test.cpp \ signal_test.cpp \
stack_protector_test.cpp \ stack_protector_test.cpp \
stack_unwinding_test.cpp \
stdatomic_test.cpp \ stdatomic_test.cpp \
stdint_test.cpp \ stdint_test.cpp \
stdio_test.cpp \ stdio_test.cpp \
@@ -234,7 +235,6 @@ bionic-unit-tests_src_files := \
atexit_test.cpp \ atexit_test.cpp \
dlext_test.cpp \ dlext_test.cpp \
dlfcn_test.cpp \ dlfcn_test.cpp \
stack_unwinding_test.cpp \
bionic-unit-tests_cflags := $(test_cflags) bionic-unit-tests_cflags := $(test_cflags)