diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2012-01-20 19:18:11 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2012-01-20 19:18:11 +0000 |
| commit | 462386c6b1ea32c41bc8e73d0369ac1251dd0c72 (patch) | |
| tree | 1b0685cf17992cd077accdef28092dab5fc50ff2 /contrib | |
| parent | 475cc570f4fe5683f858d5b774f5a56e087fb9f5 (diff) | |
| download | src-462386c6b1ea32c41bc8e73d0369ac1251dd0c72.tar.gz src-462386c6b1ea32c41bc8e73d0369ac1251dd0c72.zip | |
Pull in r148240 from upstream llvm trunk:
Make sure the non-SSE lowering for fences correctly clobbers EFLAGS.
PR11768.
In particular, this fixes segfaults during the build of devel/icu on
i386. The __sync_synchronize() builtin used for implementing icu's
internal barrier could lead to incorrect behaviour.
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=230393
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/llvm/lib/Target/X86/X86InstrCompiler.td | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm/lib/Target/X86/X86InstrCompiler.td b/contrib/llvm/lib/Target/X86/X86InstrCompiler.td index da28690672a6..612b2fa66f21 100644 --- a/contrib/llvm/lib/Target/X86/X86InstrCompiler.td +++ b/contrib/llvm/lib/Target/X86/X86InstrCompiler.td @@ -533,7 +533,7 @@ def ATOMSWAP6432 : I<0, Pseudo, (outs GR32:$dst1, GR32:$dst2), // Memory barriers // TODO: Get this to fold the constant into the instruction. -let isCodeGenOnly = 1 in +let isCodeGenOnly = 1, Defs = [EFLAGS] in def OR32mrLocked : I<0x09, MRMDestMem, (outs), (ins i32mem:$dst, GR32:$zero), "lock\n\t" "or{l}\t{$zero, $dst|$dst, $zero}", |