am 10ab1ec3: am 82d974c7: am a81fd294: Merge "Fixed ASM_ALIGN macro"

* commit '10ab1ec3193e44181fac4b366662995972716a28':
  Fixed ASM_ALIGN macro
This commit is contained in:
Elliott Hughes 2013-10-04 11:11:20 -07:00 committed by Android Git Automerger
commit ce1c699945

View File

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