commit 9494caa7e857c9e9d323dd58212d833f75b3362c
author Ryan Prichard <rprichard@google.com> Thu Oct 01 01:08:38 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 01 01:08:38 2020 +0000
tree 94cec3e95b0f5a0950baec96fdc5b7cd0a290db0
parent cde6ca1fc372c5404ed30e840686b75946a3bb85
parent bcef897b6dd45eef0ef7342be7c8d376e16093a0

Merge "Enable arm64 .eh_frame terminator, align it to 4"

libc/arch-common/bionic/crtend.S

diff --git a/libc/arch-common/bionic/crtend.S b/libc/arch-common/bionic/crtend.S
index 0166428..9676db8 100644
--- a/libc/arch-common/bionic/crtend.S
+++ b/libc/arch-common/bionic/crtend.S
@@ -49,11 +49,9 @@
 #if defined(__linux__) && defined(__ELF__)
 	.section .note.GNU-stack,"",%progbits
 #endif
-#if defined(__i386__) || defined(__x86_64__)
+#if !defined(__arm__)
 	.section	.eh_frame,"a",@progbits
-#if defined(__i386__)
 	.balign 4
-#endif
 	.type	__FRAME_END__, @object
 	.size	__FRAME_END__, 4
 __FRAME_END__:

libc/arch-common/bionic/crtend_so.S

diff --git a/libc/arch-common/bionic/crtend_so.S b/libc/arch-common/bionic/crtend_so.S
index 426d098..5875acb 100644
--- a/libc/arch-common/bionic/crtend_so.S
+++ b/libc/arch-common/bionic/crtend_so.S
@@ -35,11 +35,9 @@
 #if defined(__linux__) && defined(__ELF__)
 	.section .note.GNU-stack,"",%progbits
 #endif
-#if defined(__i386__) || defined(__x86_64__)
+#if !defined(__arm__)
 	.section	.eh_frame,"a",@progbits
-#if defined(__i386__)
 	.balign 4
-#endif
 	.type	__FRAME_END__, @object
 	.size	__FRAME_END__, 4
 __FRAME_END__: