Elliott Hughes 938473a7f0 resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp ...

Change-Id: I3994c3c69e187e08d69642e097de14b5040c5b3b

2014-09-08 16:21:24 -07:00

..

__bionic_clone.S

Ensure __set_errno is still visible on LP32.

2014-09-08 15:36:21 -07:00

__rt_sigreturn.S

Unify our assembler macros.

2014-02-20 13:51:26 -08:00

__set_tls.c

Hide __set_tls.

2014-05-20 20:32:28 -07:00

_exit_with_stack_teardown.S

Hide _exit_with_stack_teardown.

2014-05-16 16:17:44 -07:00

_setjmp.S

Remove misleading arm/arm64 PIC_SYM.

2014-08-07 11:52:38 -07:00

crtbegin.c

Revert "Fix arm64 build"

2014-09-04 21:53:14 +00:00

setjmp.S

Remove misleading arm/arm64 PIC_SYM.

2014-08-07 11:52:38 -07:00

sigsetjmp.S

Remove misleading arm/arm64 PIC_SYM.

2014-08-07 11:52:38 -07:00

syscall.S

Ensure __set_errno is still visible on LP32.

2014-09-08 15:36:21 -07:00

vfork.S

Ensure __set_errno is still visible on LP32.

2014-09-08 15:36:21 -07:00