Merge "Remove #if cruft."
This commit is contained in:
commit
8dd531cef9
2 changed files with 6 additions and 8 deletions
|
@ -46,11 +46,10 @@ __bionic_asm_custom_note_gnu_section()
|
|||
ASM_ALIGN_TO_PTR_SIZE
|
||||
ASM_PTR_SIZE(0)
|
||||
|
||||
#if defined(__linux__) && defined(__ELF__)
|
||||
.section .note.GNU-stack,"",%progbits
|
||||
#endif
|
||||
.section .note.GNU-stack, "", %progbits
|
||||
|
||||
#if !defined(__arm__)
|
||||
.section .eh_frame,"a",@progbits
|
||||
.section .eh_frame, "a", @progbits
|
||||
.balign 4
|
||||
.type __FRAME_END__, @object
|
||||
.size __FRAME_END__, 4
|
||||
|
|
|
@ -32,11 +32,10 @@
|
|||
__bionic_asm_custom_note_gnu_section()
|
||||
#endif
|
||||
|
||||
#if defined(__linux__) && defined(__ELF__)
|
||||
.section .note.GNU-stack,"",%progbits
|
||||
#endif
|
||||
.section .note.GNU-stack, "", %progbits
|
||||
|
||||
#if !defined(__arm__)
|
||||
.section .eh_frame,"a",@progbits
|
||||
.section .eh_frame, "a", @progbits
|
||||
.balign 4
|
||||
.type __FRAME_END__, @object
|
||||
.size __FRAME_END__, 4
|
||||
|
|
Loading…
Reference in a new issue