commit 0e7f8a9e52bac84c69aa2260d2a6356584ff3674
author Elliott Hughes <enh@google.com> Wed Aug 20 13:11:58 2014 -0700
committer Elliott Hughes <enh@google.com> Wed Aug 20 13:11:58 2014 -0700
tree 90bd00cd1ce68652f544cec32d3db9cfa276572d
parent 7134fc30892bff763e7c24ac722151e0777b5409

Simplify _ALIGN_TEXT.

Bug: 16872067
Change-Id: I2b622f252c21ce1b344c040f828ab3f4bf9b6c0a

libc/arch-x86/include/machine/asm.h

diff --git a/libc/arch-x86/include/machine/asm.h b/libc/arch-x86/include/machine/asm.h
index 672493d..943f9dd 100644
--- a/libc/arch-x86/include/machine/asm.h
+++ b/libc/arch-x86/include/machine/asm.h
@@ -49,15 +49,6 @@
 #define PIC_GOT(x)	x@GOT(%ebx)
 #define PIC_GOTOFF(x)	x@GOTOFF(%ebx)
 
-/* let kernels and others override entrypoint alignment */
-#if !defined(_ALIGN_TEXT) && !defined(_KERNEL)
-# ifdef _STANDALONE
-#  define _ALIGN_TEXT .align 1
-# elif defined __ELF__
-#  define _ALIGN_TEXT .align 16
-# else
-#  define _ALIGN_TEXT .align 4
-# endif
-#endif
+#define __bionic_asm_align 16
 
 #endif /* !_I386_ASM_H_ */