| commit | af7e806cec7088d5d8e9898c13aaa1bbdc07a082 | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Wed May 06 18:49:23 2015 -0700 |
| committer | Dmitriy Ivanov <dimitry@google.com> | Thu May 07 12:56:15 2015 -0700 |
| tree | 89cb7c34f3c8e7bb06a826c7bb7bce9b9d869ce5 | |
| parent | b3c01d05387e8576edcb0df1ad80a326d1d3a418 [diff] [blame] |
Properly align init/fini_arrays for crtend.o Also remove them from crtend_so.o Bug: http://b/20532404 Change-Id: I56a0f80c4b3a83cf11d28bbf17791ff4ce10c5d2 (cherry picked from commit e543c7612e97c4c0f11143b8fcd2fff46364f936)
diff --git a/libc/arch-common/bionic/asm_multiarch.h b/libc/arch-common/bionic/asm_multiarch.h index 85e1b57..91cb8af 100644 --- a/libc/arch-common/bionic/asm_multiarch.h +++ b/libc/arch-common/bionic/asm_multiarch.h
@@ -28,9 +28,9 @@ #ifdef __LP64__ # define ASM_PTR_SIZE(x) .quad x -# define ASM_ALIGN(x) +# define ASM_ALIGN_TO_PTR_SIZE .balign 8 #else # define ASM_PTR_SIZE(x) .long x -# define ASM_ALIGN(x) .align x +# define ASM_ALIGN_TO_PTR_SIZE .balign 4 #endif