aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/config/tc-s390.c2
-rw-r--r--gas/doc/as.texinfo3
-rw-r--r--gas/doc/c-s390.texi2
-rw-r--r--gas/testsuite/ChangeLog6
-rw-r--r--gas/testsuite/gas/s390/s390.exp1
6 files changed, 18 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index e05cf17..552ce4c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-04 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
+
+ * config/tc-s390.c (s390_parse_cpu): Add new option zEC12.
+ * doc/as.texinfo: Document new option zEC12.
+ * doc/c-s390.texi: Likewise.
+
2012-10-03 DJ Delorie <dj@redhat.com>
* config/tc-rl78.c: Change line_separator to '@' so that '|' can
diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index 47ec175..11e3c47 100644
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -381,6 +381,8 @@ s390_parse_cpu (char *arg)
return S390_OPCODE_Z10;
else if (strcmp (arg, "z196") == 0)
return S390_OPCODE_Z196;
+ else if (strcmp (arg, "zEC12") == 0)
+ return S390_OPCODE_ZEC12;
else if (strcmp (arg, "all") == 0)
return S390_OPCODE_MAXCPU - 1;
else
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index 3daec6d..92fe824 100644
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -1411,7 +1411,8 @@ Select the architecture mode, either the Enterprise System
Architecture (esa) or the z/Architecture mode (zarch).
@item -march=@var{processor}
Specify which s390 processor variant is the target, @samp{g6}, @samp{g6},
-@samp{z900}, @samp{z990}, @samp{z9-109}, @samp{z9-ec}, or @samp{z10}.
+@samp{z900}, @samp{z990}, @samp{z9-109}, @samp{z9-ec}, @samp{z10},
+@samp{z196}, or @samp{zEC12}.
@item -mregnames
@itemx -mno-regnames
Allow or disallow symbolic names for registers.
diff --git a/gas/doc/c-s390.texi b/gas/doc/c-s390.texi
index 76dc144..42b9866 100644
--- a/gas/doc/c-s390.texi
+++ b/gas/doc/c-s390.texi
@@ -17,7 +17,7 @@
The s390 version of @code{@value{AS}} supports two architectures modes
and seven chip levels. The architecture modes are the Enterprise System
Architecture (ESA) and the newer z/Architecture mode. The chip levels
-are g5, g6, z900, z990, z9-109, z9-ec, z10 and z196.
+are g5, g6, z900, z990, z9-109, z9-ec, z10, z196, and zEC12.
@menu
* s390 Options:: Command-line Options.
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 7ce4312..bc18a67 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-04 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
+
+ * gas/s390/s390.exp: Run zEC12 tests.
+ * gas/s390/zarch-zEC12.d: New file.
+ * gas/s390/zarch-zEC12.s: New file.
+
2012-09-25 Saravanan Ekanathan <saravanan.ekanathan@amd.com>
* gas/i386/arch-10-bdver1.d: New file to test bdver1 core.
diff --git a/gas/testsuite/gas/s390/s390.exp b/gas/testsuite/gas/s390/s390.exp
index dad828a..5f02afe 100644
--- a/gas/testsuite/gas/s390/s390.exp
+++ b/gas/testsuite/gas/s390/s390.exp
@@ -25,6 +25,7 @@ if [expr [istarget "s390-*-*"] || [istarget "s390x-*-*"]] then {
run_dump_test "zarch-z9-ec" "{as -m64} {as -march=z9-ec}"
run_dump_test "zarch-z10" "{as -m64} {as -march=z10}"
run_dump_test "zarch-z196" "{as -m64} {as -march=z196}"
+ run_dump_test "zarch-zEC12" "{as -m64} {as -march=zEC12}"
run_dump_test "zarch-reloc" "{as -m64}"
run_dump_test "zarch-operands" "{as -m64} {as -march=z9-109}"
run_dump_test "zarch-machine" "{as -m64} {as -march=z900}"