diff options
author | sbruno <sbruno@FreeBSD.org> | 2014-09-03 15:32:38 +0000 |
---|---|---|
committer | sbruno <sbruno@FreeBSD.org> | 2014-09-03 15:32:38 +0000 |
commit | 89b1d95c6d16eeda3967d44e6fc8925bbfae9817 (patch) | |
tree | 8b8716dd54685f96aaa84893bfa0ae517fda1e82 /contrib/llvm/lib/Target/ARM | |
parent | ce6400edf1f4a8294f444b8c29d7fa7aae16e7f7 (diff) | |
download | FreeBSD-src-89b1d95c6d16eeda3967d44e6fc8925bbfae9817.zip FreeBSD-src-89b1d95c6d16eeda3967d44e6fc8925bbfae9817.tar.gz |
Do not direct commit to contrib/llvm. Make the change a patch file instead.
Reverts 271025 but still functionally patches it. Original intent is still
the same. Pointed out by rdivacky.
MFV: Only emit movw on ARMv6T2
Building for the FreeBSD default target ARMv6 was emitting movw ASM on certain
test cases (found building qmake4/5 for ARM). Don't do that, moreover, the AS
in base doesn't understand this instruction for this target. One would need
to use --integrated-as to get this to build if desired.
http://llvm.org/viewvc/llvm-project?view=revision&revision=216989
Submitted by: ian
Reviewed by: dim
Obtained from: llvm.org
MFC after: 2 days
Relnotes: yes
Diffstat (limited to 'contrib/llvm/lib/Target/ARM')
-rw-r--r-- | contrib/llvm/lib/Target/ARM/ARMInstrInfo.td | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td b/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td index 7a14b8e..2042c04 100644 --- a/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td +++ b/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td @@ -3248,8 +3248,7 @@ def : ARMPat<(ARMaddc GPR:$src, imm0_65535_neg:$imm), def : ARMPat<(ARMadde GPR:$src, so_imm_not:$imm, CPSR), (SBCri GPR:$src, so_imm_not:$imm)>; def : ARMPat<(ARMadde GPR:$src, imm0_65535_neg:$imm, CPSR), - (SBCrr GPR:$src, (MOVi16 (imm_not_XFORM imm:$imm)))>, - Requires<[IsARM, HasV6T2]>; + (SBCrr GPR:$src, (MOVi16 (imm_not_XFORM imm:$imm)))>; // Note: These are implemented in C++ code, because they have to generate // ADD/SUBrs instructions, which use a complex pattern that a xform function |