| commit | f655ce7ef3df277442ccc47f91cb919c1cd9ebd6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 08 16:07:26 2012 -0700 |
| committer | android code review <noreply-gerritcodereview@google.com> | Wed Aug 08 16:07:27 2012 -0700 |
| tree | c2fd47b36321f2807df9cf97cdc98c1e12cba140 | |
| parent | 7812920487070d392984f94c9f80006dad8c198a [diff] | |
| parent | 57e6d9ab48219467bee0ab28a96533f98552581c [diff] |
Merge "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"