Merge "Disable tzdata in $ANDROID_DATA." into lmp-mr1-dev
diff --git a/libc/arch-arm/arm.mk b/libc/arch-arm/arm.mk
index 70cc8eb..b1edfcc 100644
--- a/libc/arch-arm/arm.mk
+++ b/libc/arch-arm/arm.mk
@@ -55,6 +55,7 @@
arch-arm/bionic/_exit_with_stack_teardown.S \
arch-arm/bionic/libgcc_compat.c \
arch-arm/bionic/memcmp.S \
+ arch-arm/bionic/__restore.S \
arch-arm/bionic/_setjmp.S \
arch-arm/bionic/setjmp.S \
arch-arm/bionic/sigsetjmp.S \
diff --git a/libc/arch-arm/bionic/__restore.S b/libc/arch-arm/bionic/__restore.S
new file mode 100644
index 0000000..9898125
--- /dev/null
+++ b/libc/arch-arm/bionic/__restore.S
@@ -0,0 +1,61 @@
+/*
+ * 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>
+
+// gdb is smart enough to unwind through signal frames with just the regular
+// CFI information but libgcc and libunwind both need extra help. We do this
+// by using .fnstart/.fnend and inserting a nop before both __restore and
+// __restore_rt (but covered by the .fnstart/.fnend) so that although they're
+// not inside the functions from objdump's point of view, an unwinder that
+// blindly looks at the previous instruction (but is then smart enough to check
+// the DWARF information to find out where it landed) gets the right answer.
+
+// We need to place .fnstart ourselves (but we may as well keep the free .fnend).
+#undef __bionic_asm_custom_entry
+#define __bionic_asm_custom_entry(f)
+
+ .fnstart
+ .save {r0-r15}
+ .pad #32
+ nop
+ENTRY_PRIVATE(__restore)
+ // This function must have exactly this instruction sequence.
+ mov r7, #__NR_sigreturn
+ swi #0
+END(__restore)
+
+ .fnstart
+ .save {r0-r15}
+ .pad #160
+ nop
+ENTRY_PRIVATE(__restore_rt)
+ // This function must have exactly this instruction sequence.
+ mov r7, #__NR_rt_sigreturn
+ swi #0
+END(__restore_rt)
diff --git a/libc/arch-arm64/arm64.mk b/libc/arch-arm64/arm64.mk
index 6c4f6a6..eb65cfd 100644
--- a/libc/arch-arm64/arm64.mk
+++ b/libc/arch-arm64/arm64.mk
@@ -29,7 +29,6 @@
libc_bionic_src_files_arm64 := \
arch-arm64/bionic/__bionic_clone.S \
arch-arm64/bionic/_exit_with_stack_teardown.S \
- arch-arm64/bionic/__rt_sigreturn.S \
arch-arm64/bionic/_setjmp.S \
arch-arm64/bionic/setjmp.S \
arch-arm64/bionic/__set_tls.c \
diff --git a/libc/arch-arm64/bionic/__rt_sigreturn.S b/libc/arch-arm64/bionic/__rt_sigreturn.S
deleted file mode 100644
index 8fb6f0c..0000000
--- a/libc/arch-arm64/bionic/__rt_sigreturn.S
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2013 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>
-
-ENTRY_PRIVATE(__rt_sigreturn)
- mov x8, __NR_rt_sigreturn
- svc #0
-END(__rt_sigreturn)
diff --git a/libc/arch-x86/bionic/__restore.S b/libc/arch-x86/bionic/__restore.S
new file mode 100644
index 0000000..cb18fd0
--- /dev/null
+++ b/libc/arch-x86/bionic/__restore.S
@@ -0,0 +1,135 @@
+/*
+ * 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>
+
+// DWARF constants.
+#define DW_CFA_def_cfa_expression 0x0f
+#define DW_CFA_expression 0x10
+#define DW_EH_PE_pcrel 0x10
+#define DW_EH_PE_sdata4 0x0b
+#define DW_OP_breg4 0x74
+#define DW_OP_deref 0x06
+
+// Offsets into struct sigcontext.
+#define OFFSET_EDI 16
+#define OFFSET_ESI 20
+#define OFFSET_EBP 24
+#define OFFSET_ESP 28
+#define OFFSET_EBX 32
+#define OFFSET_EDX 36
+#define OFFSET_ECX 40
+#define OFFSET_EAX 44
+#define OFFSET_EIP 56
+
+// Non-standard DWARF constants for the x86 registers.
+#define DW_x86_REG_EAX 0
+#define DW_x86_REG_ECX 1
+#define DW_x86_REG_EDX 2
+#define DW_x86_REG_EBX 3
+#define DW_x86_REG_EBP 5
+#define DW_x86_REG_ESI 6
+#define DW_x86_REG_EDI 7
+#define DW_x86_REG_EIP 8
+
+#define cfi_signal_frame_start(f) \
+.section .eh_frame,"a",@progbits; \
+.L ## f ## _START_EH_FRAME: \
+ .long 2f - 1f; /* CIE length. */ \
+1:.long 0; /* CIE ID. */ \
+ .byte 1; /* Version. */ \
+ .string "zRS"; /* Augmentation string. */ \
+ .uleb128 1; /* Code alignment factor. */ \
+ .sleb128 -4; /* Data alignment factor. */ \
+ .uleb128 DW_x86_REG_EIP; /* Return address register. */ \
+ .uleb128 1; /* 1 byte of augmentation data. */ \
+ .byte (DW_EH_PE_pcrel|DW_EH_PE_sdata4); /* FDE encoding. */ \
+ .align 8; \
+2: \
+ .long .L ## f ## _END_FDE - .L ## f ## _START_FDE; /* FDE length. */ \
+.L ## f ## _START_FDE: \
+ .long .L ## f ## _START_FDE - .L ## f ## _START_EH_FRAME; /* CIE location. */ \
+ .long (.L ## f ## _START - 1) - .; /* pcrel start address (see FDE encoding above). */ \
+ .long .L ## f ## _END - (.L ## f ## _START - 1); /* Function this FDE applies to. */ \
+ .uleb128 0; /* FDE augmentation length. */ \
+
+#define cfi_signal_frame_end(f) \
+.L ## f ## _END_FDE: \
+
+#define cfi_def_cfa(offset) \
+ .byte DW_CFA_def_cfa_expression; \
+ .uleb128 2f-1f; \
+1:.byte DW_OP_breg4; \
+ .sleb128 offset; \
+ .byte DW_OP_deref; \
+2: \
+
+#define cfi_offset(reg_number,offset) \
+ .byte DW_CFA_expression; \
+ .uleb128 reg_number; \
+ .uleb128 2f-1f; \
+1:.byte DW_OP_breg4; \
+ .sleb128 offset; \
+2: \
+
+ENTRY_PRIVATE(__restore)
+.L__restore_START:
+ popl %eax
+ movl $__NR_sigreturn, %eax
+ int $0x80
+.L__restore_END:
+END(__restore)
+cfi_signal_frame_start(__restore)
+ cfi_def_cfa(OFFSET_ESP + 4)
+ cfi_offset(DW_x86_REG_EDI, OFFSET_EDI + 4)
+ cfi_offset(DW_x86_REG_ESI, OFFSET_ESI + 4)
+ cfi_offset(DW_x86_REG_EBP, OFFSET_EBP + 4)
+ cfi_offset(DW_x86_REG_EBX, OFFSET_EBX + 4)
+ cfi_offset(DW_x86_REG_EDX, OFFSET_EDX + 4)
+ cfi_offset(DW_x86_REG_ECX, OFFSET_ECX + 4)
+ cfi_offset(DW_x86_REG_EAX, OFFSET_EAX + 4)
+ cfi_offset(DW_x86_REG_EIP, OFFSET_EIP + 4)
+cfi_signal_frame_end(__restore)
+
+ENTRY_PRIVATE(__restore_rt)
+.L__restore_rt_START:
+ movl $__NR_rt_sigreturn, %eax
+ int $0x80
+.L__restore_rt_END:
+END(__restore_rt)
+cfi_signal_frame_start(__restore_rt)
+ cfi_def_cfa(OFFSET_ESP + 160)
+ cfi_offset(DW_x86_REG_EDI, OFFSET_EDI + 160)
+ cfi_offset(DW_x86_REG_ESI, OFFSET_ESI + 160)
+ cfi_offset(DW_x86_REG_EBP, OFFSET_EBP + 160)
+ cfi_offset(DW_x86_REG_EBX, OFFSET_EBX + 160)
+ cfi_offset(DW_x86_REG_EDX, OFFSET_EDX + 160)
+ cfi_offset(DW_x86_REG_ECX, OFFSET_ECX + 160)
+ cfi_offset(DW_x86_REG_EAX, OFFSET_EAX + 160)
+ cfi_offset(DW_x86_REG_EIP, OFFSET_EIP + 160)
+cfi_signal_frame_end(__restore_rt)
diff --git a/libc/arch-x86/x86.mk b/libc/arch-x86/x86.mk
index 2a0609d..d90b1ce 100644
--- a/libc/arch-x86/x86.mk
+++ b/libc/arch-x86/x86.mk
@@ -26,6 +26,7 @@
arch-x86/bionic/__bionic_clone.S \
arch-x86/bionic/_exit_with_stack_teardown.S \
arch-x86/bionic/libgcc_compat.c \
+ arch-x86/bionic/__restore.S \
arch-x86/bionic/_setjmp.S \
arch-x86/bionic/setjmp.S \
arch-x86/bionic/__set_tls.c \
diff --git a/libc/arch-x86_64/bionic/__restore_rt.S b/libc/arch-x86_64/bionic/__restore_rt.S
new file mode 100644
index 0000000..785b3b3
--- /dev/null
+++ b/libc/arch-x86_64/bionic/__restore_rt.S
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2013 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>
+
+// DWARF constants.
+#define DW_CFA_def_cfa_expression 0x0f
+#define DW_CFA_expression 0x10
+#define DW_EH_PE_pcrel 0x10
+#define DW_EH_PE_sdata4 0x0b
+#define DW_OP_breg4 0x74
+#define DW_OP_breg7 0x77
+#define DW_OP_deref 0x06
+
+// Offsets into struct ucontext_t of uc_mcontext.gregs[x].
+#define OFFSET_R8 40
+#define OFFSET_R9 48
+#define OFFSET_R10 56
+#define OFFSET_R11 64
+#define OFFSET_R12 72
+#define OFFSET_R13 80
+#define OFFSET_R14 88
+#define OFFSET_R15 96
+#define OFFSET_RDI 104
+#define OFFSET_RSI 112
+#define OFFSET_RBP 120
+#define OFFSET_RSP 160
+#define OFFSET_RBX 128
+#define OFFSET_RDX 136
+#define OFFSET_RAX 144
+#define OFFSET_RCX 152
+#define OFFSET_RIP 168
+
+// Non-standard DWARF constants for the x86-64 registers.
+#define DW_x86_64_RAX 0
+#define DW_x86_64_RDX 1
+#define DW_x86_64_RCX 2
+#define DW_x86_64_RBX 3
+#define DW_x86_64_RSI 4
+#define DW_x86_64_RDI 5
+#define DW_x86_64_RBP 6
+#define DW_x86_64_RSP 7
+#define DW_x86_64_R8 8
+#define DW_x86_64_R9 9
+#define DW_x86_64_R10 10
+#define DW_x86_64_R11 11
+#define DW_x86_64_R12 12
+#define DW_x86_64_R13 13
+#define DW_x86_64_R14 14
+#define DW_x86_64_R15 15
+#define DW_x86_64_RIP 16
+
+#define cfi_signal_frame_start(f) \
+.section .eh_frame,"a",@progbits; \
+.L ## f ## _START_EH_FRAME: \
+ .long 2f - 1f; /* CIE length. */ \
+1:.long 0; /* CIE ID. */ \
+ .byte 1; /* Version. */ \
+ .string "zRS"; /* Augmentation string. */ \
+ .uleb128 1; /* Code alignment factor. */ \
+ .sleb128 -8; /* Data alignment factor. */ \
+ .uleb128 DW_x86_64_RIP; /* Return address register. */ \
+ .uleb128 1; /* 1 byte of augmentation data. */ \
+ .byte (DW_EH_PE_pcrel | DW_EH_PE_sdata4); /* FDE encoding. */ \
+ .align 8; \
+2: \
+ .long .L ## f ## _END_FDE - .L ## f ## _START_FDE; /* FDE length. */ \
+.L ## f ## _START_FDE: \
+ .long .L ## f ## _START_FDE - .L ## f ## _START_EH_FRAME; /* CIE location. */ \
+ .long (.L ## f ## _START - 1) - .; /* pcrel start address (see FDE encoding above). */ \
+ .long .L ## f ## _END - (.L ## f ## _START - 1); /* Function this FDE applies to. */ \
+ .uleb128 0; /* FDE augmentation length. */ \
+
+#define cfi_signal_frame_end(f) \
+.L ## f ## _END_FDE: \
+
+#define cfi_def_cfa(offset) \
+ .byte DW_CFA_def_cfa_expression; \
+ .uleb128 2f-1f; \
+1:.byte DW_OP_breg7; \
+ .sleb128 offset; \
+ .byte DW_OP_deref; \
+2: \
+
+#define cfi_offset(reg_number,offset) \
+ .byte DW_CFA_expression; \
+ .uleb128 reg_number; \
+ .uleb128 2f-1f; \
+1:.byte DW_OP_breg7; \
+ .sleb128 offset; \
+2: \
+
+ENTRY_PRIVATE(__restore_rt)
+.L__restore_rt_START:
+ mov $__NR_rt_sigreturn, %rax
+ syscall
+.L__restore_rt_END:
+END(__restore_rt)
+cfi_signal_frame_start(__restore_rt)
+ cfi_def_cfa(OFFSET_RSP)
+ cfi_offset(DW_x86_64_R8, OFFSET_R8)
+ cfi_offset(DW_x86_64_R9, OFFSET_R9)
+ cfi_offset(DW_x86_64_R10, OFFSET_R10)
+ cfi_offset(DW_x86_64_R11, OFFSET_R11)
+ cfi_offset(DW_x86_64_R12, OFFSET_R12)
+ cfi_offset(DW_x86_64_R13, OFFSET_R13)
+ cfi_offset(DW_x86_64_R14, OFFSET_R14)
+ cfi_offset(DW_x86_64_R15, OFFSET_R15)
+ cfi_offset(DW_x86_64_RDI, OFFSET_RDI)
+ cfi_offset(DW_x86_64_RSI, OFFSET_RSI)
+ cfi_offset(DW_x86_64_RBP, OFFSET_RBP)
+ cfi_offset(DW_x86_64_RSP, OFFSET_RSP)
+ cfi_offset(DW_x86_64_RBX, OFFSET_RBX)
+ cfi_offset(DW_x86_64_RDX, OFFSET_RDX)
+ cfi_offset(DW_x86_64_RAX, OFFSET_RAX)
+ cfi_offset(DW_x86_64_RCX, OFFSET_RCX)
+ cfi_offset(DW_x86_64_RIP, OFFSET_RIP)
+cfi_signal_frame_end(__restore_rt)
diff --git a/libc/arch-x86_64/bionic/__rt_sigreturn.S b/libc/arch-x86_64/bionic/__rt_sigreturn.S
deleted file mode 100644
index eddceb1..0000000
--- a/libc/arch-x86_64/bionic/__rt_sigreturn.S
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2013 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>
-
-ENTRY_PRIVATE(__rt_sigreturn)
- movl $__NR_rt_sigreturn, %eax
- syscall
-END(__rt_sigreturn)
diff --git a/libc/arch-x86_64/x86_64.mk b/libc/arch-x86_64/x86_64.mk
index b001b5e..5f12a49 100644
--- a/libc/arch-x86_64/x86_64.mk
+++ b/libc/arch-x86_64/x86_64.mk
@@ -30,7 +30,7 @@
libc_bionic_src_files_x86_64 := \
arch-x86_64/bionic/__bionic_clone.S \
arch-x86_64/bionic/_exit_with_stack_teardown.S \
- arch-x86_64/bionic/__rt_sigreturn.S \
+ arch-x86_64/bionic/__restore_rt.S \
arch-x86_64/bionic/_setjmp.S \
arch-x86_64/bionic/setjmp.S \
arch-x86_64/bionic/__set_tls.c \
diff --git a/libc/bionic/dl_iterate_phdr_static.cpp b/libc/bionic/dl_iterate_phdr_static.cpp
index 155a7a0..2196ac8 100644
--- a/libc/bionic/dl_iterate_phdr_static.cpp
+++ b/libc/bionic/dl_iterate_phdr_static.cpp
@@ -62,6 +62,11 @@
// Try the VDSO if that didn't work.
ElfW(Ehdr)* ehdr_vdso = reinterpret_cast<ElfW(Ehdr)*>(getauxval(AT_SYSINFO_EHDR));
+ if (ehdr_vdso == nullptr) {
+ // There is no VDSO, so there's nowhere left to look.
+ return rc;
+ }
+
struct dl_phdr_info vdso_info;
vdso_info.dlpi_addr = 0;
vdso_info.dlpi_name = NULL;
diff --git a/libc/bionic/sigaction.cpp b/libc/bionic/sigaction.cpp
index 225a823..9038bd5 100644
--- a/libc/bionic/sigaction.cpp
+++ b/libc/bionic/sigaction.cpp
@@ -28,28 +28,33 @@
#include <signal.h>
-#if __LP64__
-extern "C" void __rt_sigreturn(void);
+extern "C" void __restore_rt(void);
+extern "C" void __restore(void);
+
+#if defined(__LP64__)
+
extern "C" int __rt_sigaction(int, const struct __kernel_sigaction*, struct __kernel_sigaction*, size_t);
-#else
-extern "C" int __sigaction(int, const struct sigaction*, struct sigaction*);
-#endif
int sigaction(int signal, const struct sigaction* bionic_new_action, struct sigaction* bionic_old_action) {
-#if __LP64__
__kernel_sigaction kernel_new_action;
if (bionic_new_action != NULL) {
kernel_new_action.sa_flags = bionic_new_action->sa_flags;
kernel_new_action.sa_handler = bionic_new_action->sa_handler;
kernel_new_action.sa_mask = bionic_new_action->sa_mask;
-#ifdef SA_RESTORER
+#if defined(SA_RESTORER)
kernel_new_action.sa_restorer = bionic_new_action->sa_restorer;
-
+#if defined(__aarch64__)
+ // arm64 has sa_restorer, but unwinding works best if you just let the
+ // kernel supply the default restorer from [vdso]. gdb doesn't care, but
+ // libgcc needs the nop that the kernel includes before the actual code.
+ // (We could add that ourselves, but why bother?)
+#else
if (!(kernel_new_action.sa_flags & SA_RESTORER)) {
kernel_new_action.sa_flags |= SA_RESTORER;
- kernel_new_action.sa_restorer = &__rt_sigreturn;
+ kernel_new_action.sa_restorer = &__restore_rt;
}
#endif
+#endif
}
__kernel_sigaction kernel_old_action;
@@ -62,7 +67,7 @@
bionic_old_action->sa_flags = kernel_old_action.sa_flags;
bionic_old_action->sa_handler = kernel_old_action.sa_handler;
bionic_old_action->sa_mask = kernel_old_action.sa_mask;
-#ifdef SA_RESTORER
+#if defined(SA_RESTORER)
bionic_old_action->sa_restorer = kernel_old_action.sa_restorer;
if (bionic_old_action->sa_restorer == &__rt_sigreturn) {
@@ -72,9 +77,30 @@
}
return result;
-#else
- // The 32-bit ABI is broken. struct sigaction includes a too-small sigset_t.
- // TODO: if we also had correct struct sigaction definitions available, we could copy in and out.
- return __sigaction(signal, bionic_new_action, bionic_old_action);
-#endif
}
+
+#else
+
+extern "C" int __sigaction(int, const struct sigaction*, struct sigaction*);
+
+int sigaction(int signal, const struct sigaction* bionic_new_action, struct sigaction* bionic_old_action) {
+ // The 32-bit ABI is broken. struct sigaction includes a too-small sigset_t,
+ // so we have to use sigaction(2) rather than rt_sigaction(2).
+ struct sigaction kernel_new_action;
+ if (bionic_new_action != NULL) {
+ kernel_new_action.sa_flags = bionic_new_action->sa_flags;
+ kernel_new_action.sa_handler = bionic_new_action->sa_handler;
+ kernel_new_action.sa_mask = bionic_new_action->sa_mask;
+#if defined(SA_RESTORER)
+ kernel_new_action.sa_restorer = bionic_new_action->sa_restorer;
+
+ if (!(kernel_new_action.sa_flags & SA_RESTORER)) {
+ kernel_new_action.sa_flags |= SA_RESTORER;
+ kernel_new_action.sa_restorer = (kernel_new_action.sa_flags & SA_SIGINFO) ? &__restore_rt : &__restore;
+ }
+#endif
+ }
+ return __sigaction(signal, (bionic_new_action != NULL) ? &kernel_new_action : NULL, bionic_old_action);
+}
+
+#endif
diff --git a/tests/Android.mk b/tests/Android.mk
index dd43049..407f21b 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -134,9 +134,6 @@
libBionicStandardTests_ldlibs_host := \
-lrt \
-libBionicStandardTests_whole_static_libraries := \
- libBionicUnwindTest \
-
module := libBionicStandardTests
module_tag := optional
build_type := target
@@ -146,25 +143,6 @@
include $(LOCAL_PATH)/Android.build.mk
# -----------------------------------------------------------------------------
-# Special stack unwinding test library compiled with special flags.
-# -----------------------------------------------------------------------------
-libBionicUnwindTest_cflags := \
- $(test_cflags) \
- -fexceptions \
- -fnon-call-exceptions \
-
-libBionicUnwindTest_src_files := \
- stack_unwinding_test_impl.c \
-
-module := libBionicUnwindTest
-module_tag := optional
-build_type := target
-build_target := STATIC_TEST_LIBRARY
-include $(LOCAL_PATH)/Android.build.mk
-build_type := host
-include $(LOCAL_PATH)/Android.build.mk
-
-# -----------------------------------------------------------------------------
# Fortify tests.
# -----------------------------------------------------------------------------
$(foreach compiler,gcc clang, \
@@ -249,6 +227,11 @@
dlfcn_test.cpp \
bionic-unit-tests_cflags := $(test_cflags)
+
+bionic-unit-tests_conlyflags := \
+ -fexceptions \
+ -fnon-call-exceptions \
+
bionic-unit-tests_cppflags := $(test_cppflags)
bionic-unit-tests_ldflags := \
diff --git a/tests/ScopedSignalHandler.h b/tests/ScopedSignalHandler.h
index 89a14a6..3ec23b0 100644
--- a/tests/ScopedSignalHandler.h
+++ b/tests/ScopedSignalHandler.h
@@ -21,9 +21,10 @@
class ScopedSignalHandler {
public:
- ScopedSignalHandler(int signal_number, void (*handler)(int)) : signal_number_(signal_number) {
+ ScopedSignalHandler(int signal_number, void (*handler)(int), int sa_flags = 0)
+ : signal_number_(signal_number) {
sigemptyset(&action_.sa_mask);
- action_.sa_flags = 0;
+ action_.sa_flags = sa_flags;
action_.sa_handler = handler;
sigaction(signal_number_, &action_, &old_action_);
}
diff --git a/tests/stack_unwinding_test.cpp b/tests/stack_unwinding_test.cpp
index 1024f28..3fc45c5 100644
--- a/tests/stack_unwinding_test.cpp
+++ b/tests/stack_unwinding_test.cpp
@@ -20,18 +20,86 @@
#include <gtest/gtest.h>
-extern "C" {
- void do_test();
+#include <dlfcn.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <unwind.h>
+
+#include "ScopedSignalHandler.h"
+
+#define noinline __attribute__((__noinline__))
+#define __unused __attribute__((__unused__))
+
+static _Unwind_Reason_Code FrameCounter(_Unwind_Context* ctx __unused, void* arg) {
+ int* count_ptr = reinterpret_cast<int*>(arg);
+
+#if SHOW_FRAME_LOCATIONS
+ void* ip = reinterpret_cast<void*>(_Unwind_GetIP(ctx));
+
+ const char* symbol = "<unknown>";
+ int offset = 0;
+
+ Dl_info info;
+ memset(&info, 0, sizeof(info));
+ if (dladdr(ip, &info) != 0) {
+ symbol = info.dli_sname;
+ if (info.dli_saddr != nullptr) {
+ offset = static_cast<int>(reinterpret_cast<char*>(ip) - reinterpret_cast<char*>(info.dli_saddr));
+ }
+ }
+
+ fprintf(stderr, " #%02d %p %s%+d (%s)\n", *count_ptr, ip, symbol, offset, info.dli_fname ? info.dli_fname : "??");
+ fflush(stderr);
+#endif
+
+ ++*count_ptr;
+ return _URC_NO_REASON;
}
-// We have to say "DeathTest" here so gtest knows to run this test (which exits)
-// in its own process.
-TEST(stack_unwinding_DeathTest, unwinding_through_signal_frame) {
-// Only our x86 unwinding is good enough. Switch to libunwind?
-#if defined(__BIONIC__) && defined(__i386__)
- ::testing::FLAGS_gtest_death_test_style = "threadsafe";
- ASSERT_EXIT(do_test(), ::testing::ExitedWithCode(42), "");
-#else // __i386__
- GTEST_LOG_(INFO) << "This test does nothing.\n";
-#endif // __i386__
+static int noinline unwind_one_frame_deeper() {
+ int count = 0;
+ _Unwind_Backtrace(FrameCounter, &count);
+ return count;
+}
+
+TEST(stack_unwinding, easy) {
+ int count = 0;
+ _Unwind_Backtrace(FrameCounter, &count);
+ int deeper_count = unwind_one_frame_deeper();
+ ASSERT_EQ(count + 1, deeper_count);
+}
+
+static int killer_count = 0;
+static int handler_count = 0;
+static int handler_one_deeper_count = 0;
+
+static void noinline UnwindSignalHandler(int) {
+ _Unwind_Backtrace(FrameCounter, &handler_count);
+ ASSERT_GT(handler_count, killer_count);
+
+ handler_one_deeper_count = unwind_one_frame_deeper();
+ ASSERT_EQ(handler_count + 1, handler_one_deeper_count);
+}
+
+TEST(stack_unwinding, unwind_through_signal_frame) {
+ killer_count = handler_count = handler_one_deeper_count = 0;
+ ScopedSignalHandler ssh(SIGUSR1, UnwindSignalHandler);
+
+ _Unwind_Backtrace(FrameCounter, &killer_count);
+
+ ASSERT_EQ(0, kill(getpid(), SIGUSR1));
+}
+
+// On LP32, the SA_SIGINFO flag gets you __restore_rt instead of __restore.
+TEST(stack_unwinding, unwind_through_signal_frame_SA_SIGINFO) {
+ killer_count = handler_count = handler_one_deeper_count = 0;
+ ScopedSignalHandler ssh(SIGUSR1, UnwindSignalHandler, SA_SIGINFO);
+
+ _Unwind_Backtrace(FrameCounter, &killer_count);
+
+ ASSERT_EQ(0, kill(getpid(), SIGUSR1));
}
diff --git a/tests/stack_unwinding_test_impl.c b/tests/stack_unwinding_test_impl.c
deleted file mode 100644
index 7518a2c..0000000
--- a/tests/stack_unwinding_test_impl.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Contributed by: Intel Corporation
- */
-
-#include <stdio.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unwind.h>
-
-#define noinline __attribute__((__noinline__))
-#define unused __attribute__((__unused__))
-
-static noinline _Unwind_Reason_Code stop_fn(int a unused,
- _Unwind_Action action,
- _Unwind_Exception_Class b unused, struct _Unwind_Exception* c unused,
- struct _Unwind_Context* d unused, void* e unused) {
- if ((action & _UA_END_OF_STACK) != 0) {
- // We reached the end of the stack without executing foo_cleanup. Test failed.
- abort();
- }
- return _URC_NO_REASON;
-}
-
-static void noinline foo_cleanup(char* param unused) {
- exit(42);
-}
-
-static void noinline do_crash() {
- char* ptr = NULL;
- *ptr = 0; // Deliberately cause a SIGSEGV.
-}
-
-static void noinline foo() {
- char c1 __attribute__((cleanup(foo_cleanup))) unused;
- do_crash();
-}
-
-// It's SEGSEGV handler. We start forced stack unwinding here.
-// If libgcc don't find dso for signal frame stack unwinding will be finished.
-// libgcc pass to stop_fn _UA_END_OF_STACK flag.
-// Test pass condition: stack unwinding through signal frame and foo1_handler execution.
-static void noinline sigsegv_handler(int param unused) {
- struct _Unwind_Exception* exception = (struct _Unwind_Exception*) malloc(sizeof(*exception));
- memset(&exception->exception_class, 0, sizeof(exception->exception_class));
- exception->exception_cleanup = 0;
- _Unwind_ForcedUnwind(exception, stop_fn, 0);
-}
-
-void do_test() {
- signal(SIGSEGV, &sigsegv_handler);
- foo();
-}