diff options
| author | dim <dim@FreeBSD.org> | 2015-02-19 22:20:19 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-02-19 22:20:19 +0000 |
| commit | 1e024675bcd5e4ace8bffb2dd6afd3fa8b8ad7f3 (patch) | |
| tree | 84663adb8262b7962030778aaba745cd98e8b356 /contrib/llvm/patches/patch-05-enable-armv6-clrex.diff | |
| parent | 184b3c7999c408b8e298b506ccfdff9d81c9ffd5 (diff) | |
| parent | 49b6407b6cc89756540e2097c1cf8b9bb4a422e1 (diff) | |
| download | FreeBSD-src-1e024675bcd5e4ace8bffb2dd6afd3fa8b8ad7f3.zip FreeBSD-src-1e024675bcd5e4ace8bffb2dd6afd3fa8b8ad7f3.tar.gz | |
Merge llvm 3.6.0rc4 from ^/vendor/llvm/dist, merge clang 3.6.0rc4 from
^/vendor/clang/dist, resolve conflicts, and update patches.
Diffstat (limited to 'contrib/llvm/patches/patch-05-enable-armv6-clrex.diff')
| -rw-r--r-- | contrib/llvm/patches/patch-05-enable-armv6-clrex.diff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/llvm/patches/patch-05-enable-armv6-clrex.diff b/contrib/llvm/patches/patch-05-enable-armv6-clrex.diff index 7f4957c..574e3bd 100644 --- a/contrib/llvm/patches/patch-05-enable-armv6-clrex.diff +++ b/contrib/llvm/patches/patch-05-enable-armv6-clrex.diff @@ -7,8 +7,8 @@ Introduced here: http://svnweb.freebsd.org/changeset/base/275362 Index: lib/Target/ARM/ARMInstrInfo.td =================================================================== ---- lib/Target/ARM/ARMInstrInfo.td (revision 5) -+++ lib/Target/ARM/ARMInstrInfo.td (revision 6) +--- lib/Target/ARM/ARMInstrInfo.td ++++ lib/Target/ARM/ARMInstrInfo.td @@ -4640,7 +4640,7 @@ def STLEXD : AIstlex<0b01, (outs GPR:$Rd), def CLREX : AXI<(outs), (ins), MiscFrm, NoItinerary, "clrex", |
