am 7a5732bd: Merge "Add some missing __noreturn attributes."

* commit '7a5732bd83c64489b9bd953f49fb6ad3b420126c':
  Add some missing __noreturn attributes.
This commit is contained in:
Elliott Hughes 2014-05-30 23:01:01 +00:00 committed by Android Git Automerger
commit d3f2a204b7
2 changed files with 3 additions and 6 deletions

View File

@ -32,7 +32,7 @@
#include <stdarg.h>
extern "C" pid_t __bionic_clone(uint32_t flags, void* child_stack, int* parent_tid, void* tls, int* child_tid, int (*fn)(void*), void* arg);
extern "C" void __exit(int status);
extern "C" __noreturn void __exit(int status);
// Called from the __bionic_clone assembler to call the thread function then exit.
extern "C" __LIBC_HIDDEN__ void __bionic_clone_entry(int (*fn)(void*), void* arg) {

View File

@ -34,8 +34,8 @@
#include "pthread_internal.h"
extern "C" void _exit_with_stack_teardown(void*, size_t);
extern "C" void __exit(int);
extern "C" __noreturn void _exit_with_stack_teardown(void*, size_t);
extern "C" __noreturn void __exit(int);
extern "C" int __set_tid_address(int*);
/* CAVEAT: our implementation of pthread_cleanup_push/pop doesn't support C++ exceptions
@ -127,7 +127,4 @@ void pthread_exit(void* return_value) {
_exit_with_stack_teardown(stack_base, stack_size);
}
// NOTREACHED, but we told the compiler this function is noreturn, and it doesn't believe us.
abort();
}