- Remove SVN merge marker.
From-SVN: r199167
This commit is contained in:
parent
4cbc4bd7ad
commit
b0f6005b1e
@ -52,7 +52,6 @@
|
||||
* config/sh/sh.md (fmasf4): Remove empty constraints strings.
|
||||
(*fmasf4, *fmasf4_media): New insns.
|
||||
|
||||
>>>>>>> .r199151
|
||||
2013-05-19 Richard Sandiford <rdsandiford@googlemail.com>
|
||||
|
||||
* config/mips/mips.h (BASE_INSN_LENGTH, NOP_INSN_LENGTH): New macros.
|
||||
|
Loading…
Reference in New Issue
Block a user