| commit | d2040cb2244bbd253951b5ff808efe67246e5154 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 08 16:19:25 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 08 16:19:25 2012 -0700 |
| tree | c2fd47b36321f2807df9cf97cdc98c1e12cba140 | |
| parent | f3ffb8fa6ecd9db2da19eb3144a5da7724a875bc [diff] | |
| parent | f655ce7ef3df277442ccc47f91cb919c1cd9ebd6 [diff] |
am f655ce7e: Merge "Fix x86 build." * commit 'f655ce7ef3df277442ccc47f91cb919c1cd9ebd6': Fix x86 build.
diff --git a/linker/arch/x86/begin.S b/linker/arch/x86/begin.S index 0c0fc3d..baa386f 100644 --- a/linker/arch/x86/begin.S +++ b/linker/arch/x86/begin.S
@@ -44,4 +44,4 @@ popl %esp jmp *%eax -#include "__stack_chk_fail_local.S" +#include "arch-x86/bionic/__stack_chk_fail_local.S"