diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2014-12-07 21:47:19 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2014-12-07 21:47:19 +0000 |
| commit | 6ed7db33bcd6baf1fa21cffdf475ef28decbfcfb (patch) | |
| tree | 6498ca2ad7724c92cdd5e764812763351291da96 /contrib/binutils | |
| parent | 8948956770f75d93e9663d5472c4a6c663cdb861 (diff) | |
Notes
Diffstat (limited to 'contrib/binutils')
| -rw-r--r-- | contrib/binutils/gas/config/tc-arm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/binutils/gas/config/tc-arm.c b/contrib/binutils/gas/config/tc-arm.c index 184c8a900262..a045cc754e40 100644 --- a/contrib/binutils/gas/config/tc-arm.c +++ b/contrib/binutils/gas/config/tc-arm.c @@ -6789,7 +6789,11 @@ do_co_reg (void) { inst.instruction |= inst.operands[0].reg << 8; inst.instruction |= inst.operands[1].imm << 21; - inst.instruction |= inst.operands[2].reg << 12; + /* If this is a vector we are using the APSR_nzcv syntax, encode as r15 */ + if (inst.operands[2].isvec != 0) + inst.instruction |= 15 << 12; + else + inst.instruction |= inst.operands[2].reg << 12; inst.instruction |= inst.operands[3].reg << 16; inst.instruction |= inst.operands[4].reg; inst.instruction |= inst.operands[5].imm << 5; |