aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Krebbel <Andreas.Krebbel@de.ibm.com>2015-01-22 11:26:16 +0000
committerAndreas Krebbel <Andreas.Krebbel@de.ibm.com>2015-01-22 11:26:16 +0000
commitff77c033d861b80c6532c601446ed4239eeea502 (patch)
tree3110a15df834efa3599a6469d15bf180de08e010
parent6ce84541def522fd42dad0bc707212ae0dbb957d (diff)
2015-01-22 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* config/s390/s390.md (atomic code attribute): Fix typo "ior" -> "or". git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@219992 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/s390/s390.md2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc20f5164e6..f8b23bfc3e2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-22 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
+
+ * config/s390/s390.md (atomic code attribute): Fix typo "ior" ->
+ "or".
+
2015-01-21 Wei Mi <wmi@google.com>
Backported from trunk.
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index b17c1fac875..10d7a5a6d74 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -460,7 +460,7 @@
;; This iterator and attribute allow to combine most atomic operations.
(define_code_iterator ATOMIC [and ior xor plus minus mult])
(define_code_iterator ATOMIC_Z196 [and ior xor plus])
-(define_code_attr atomic [(and "and") (ior "ior") (xor "xor")
+(define_code_attr atomic [(and "and") (ior "or") (xor "xor")
(plus "add") (minus "sub") (mult "nand")])
(define_code_attr noxa [(and "n") (ior "o") (xor "x") (plus "a")])