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

Properly align init/fini_arrays for crtend.o

Browse Source 
Also remove them from crtend_so.o

Bug: http://b/20532404
Change-Id: I56a0f80c4b3a83cf11d28bbf17791ff4ce10c5d2
(cherry picked from commit e543c7612e)
This commit is contained in:
Dmitriy Ivanov 2015-05-06 18:49:23 -07:00
parent b3c01d0538
commit af7e806cec
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/arch-common/bionic/asm_multiarch.h
View File

@ -28,9 +28,9 @@
#ifdef __LP64__ #ifdef __LP64__
# define ASM_PTR_SIZE(x) .quad x # define ASM_PTR_SIZE(x) .quad x
# define ASM_ALIGN(x) # define ASM_ALIGN_TO_PTR_SIZE .balign 8
#else #else
# define ASM_PTR_SIZE(x) .long x # define ASM_PTR_SIZE(x) .long x
# define ASM_ALIGN(x) .align x # define ASM_ALIGN_TO_PTR_SIZE .balign 4
#endif #endif

7
libc/arch-common/bionic/crtend.S
View File

@ -29,12 +29,15 @@
#include "asm_multiarch.h" #include "asm_multiarch.h"
.section .preinit_array, "aw" .section .preinit_array, "aw"
ASM_ALIGN_TO_PTR_SIZE
ASM_PTR_SIZE(0) ASM_PTR_SIZE(0)
.section .init_array, "aw" .section .init_array, "aw"
ASM_ALIGN_TO_PTR_SIZE
ASM_PTR_SIZE(0) ASM_PTR_SIZE(0)
.section .fini_array, "aw" .section .fini_array, "aw"
ASM_ALIGN_TO_PTR_SIZE
ASM_PTR_SIZE(0) ASM_PTR_SIZE(0)
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)
@ -42,7 +45,9 @@
#endif #endif
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
.section .eh_frame,"a",@progbits .section .eh_frame,"a",@progbits
ASM_ALIGN(4) #if defined(__i386__)
.balign 4
#endif
.type __FRAME_END__, @object .type __FRAME_END__, @object
.size __FRAME_END__, 4 .size __FRAME_END__, 4
__FRAME_END__: __FRAME_END__:

14
libc/arch-common/bionic/crtend_so.S
View File

@ -26,22 +26,14 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include "asm_multiarch.h"
#ifndef __arm__
.section .init_array, "aw"
ASM_PTR_SIZE(0)
.section .fini_array, "aw"
ASM_PTR_SIZE(0)
#endif
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits .section .note.GNU-stack,"",%progbits
#endif #endif
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
.section .eh_frame,"a",@progbits .section .eh_frame,"a",@progbits
ASM_ALIGN(4) #if defined(__i386__)
.balign 4
#endif
.type __FRAME_END__, @object .type __FRAME_END__, @object
.size __FRAME_END__, 4 .size __FRAME_END__, 4
__FRAME_END__: __FRAME_END__: