am 73ac7d94: am d2040cb2: am f655ce7e: Merge "Fix x86 build."

* commit '73ac7d94b7cf627524be97da7704206b5ffd4fcf':
  Fix x86 build.
This commit is contained in:
Elliott Hughes 2012-08-08 17:47:29 -07:00 committed by Android Git Automerger
commit 1afca3f698

View File

@ -44,4 +44,4 @@ _start:
popl %esp
jmp *%eax
#include "__stack_chk_fail_local.S"
#include "arch-x86/bionic/__stack_chk_fail_local.S"