This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb/binutils-2_31-branch] Resolve merge conflicts.
- From: Nick Clifton <nickc at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 12 Jul 2018 10:28:04 -0000
- Subject: [binutils-gdb/binutils-2_31-branch] Resolve merge conflicts.
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=2d73c24636e5697b5a60c5555005d31c25d88574
commit 2d73c24636e5697b5a60c5555005d31c25d88574
Merge: ec468ac 3b5e60a
Author: Nick Clifton <nickc@redhat.com>
Date: Thu Jul 12 11:27:30 2018 +0100
Resolve merge conflicts.
Diff:
gas/ChangeLog | 7 ++
gas/testsuite/gas/aarch64/illegal-by-element.d | 3 +
gas/testsuite/gas/aarch64/illegal-by-element.l | 133 +++++++++++++++++++++++++
gas/testsuite/gas/aarch64/illegal-by-element.s | 62 ++++++++++++
opcodes/ChangeLog | 8 ++
opcodes/aarch64-tbl.h | 52 +++++-----
6 files changed, 239 insertions(+), 26 deletions(-)
diff --cc gas/ChangeLog
index 1618871,5c561ca..a540e98
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@@ -1,13 -1,10 +1,20 @@@
+2018-07-12 Sudakshina Das <sudi.das@arm.com>
+
+ * config/tc-arm.c (insns): Add new ssbb and pssbb instructions.
+ * testsuite/gas/arm/csdb.s: Add new tests for ssbb and pssbb.
+ * testsuite/gas/arm/csdb.d: Likewise
+ * testsuite/gas/arm/thumb2_it_bad.s: Likewise.
+ * testsuite/gas/arm/thumb2_it_bad.l: Likewise.
+ * testsuite/gas/arm/barrier.d: Update with ssbb.
+ * testsuite/gas/arm/barrier-thumb.d: Likewise.
+
+ 2018-07-12 Tamar Christina <tamar.christina@arm.com>
+
+ PR binutils/23192
+ * testsuite/gas/aarch64/illegal-by-element.s: New.
+ * testsuite/gas/aarch64/illegal-by-element.d: New.
+ * testsuite/gas/aarch64/illegal-by-element.l: New.
+
2018-07-06 Tamar Christina <tamar.christina@arm.com>
PR binutils/23369
diff --cc opcodes/ChangeLog
index 7dd4e3a,6636bdf..75003f5
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@@ -1,8 -1,10 +1,16 @@@
+2018-07-11 Sudakshina Das <sudi.das@arm.com>
+
+ * arm-dis.c (arm_opcodes): Add ssbb and pssbb and move
+ csdb together with them.
+ (thumb32_opcodes): Likewise.
++
+ 2018-07-12 Tamar Christina <tamar.christina@arm.com>
+
+ PR binutils/23192
+ * aarch64-tbl.h (sqdmlal, sqdmlal2, smlsl, smlsl2, sqdmlsl, sqdmlsl2,
+ mul, smull, smull2, sqdmull, sqdmull2, sqdmulh, sqrdmulh, mla, umlal,
+ umlal2, mls, umlsl, umlsl2, umull, umull2, sqdmlal, sqdmlsl, sqdmull,
+ sqdmulh, sqrdmulh): Use Em16.
2018-07-06 Tamar Christina <tamar.christina@arm.com>