From: Andreas Krebbel Date: Tue, 1 Aug 2017 08:56:59 +0000 (+0200) Subject: S/390: Support z14 as CPU name. X-Git-Tag: binutils-2_29_1~102 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ecc97ca309e56d0c2abb9ae1e8e2d1522b392363;p=thirdparty%2Fbinutils-gdb.git S/390: Support z14 as CPU name. With IBM z14 officially announced I can add z14 as CPU name. No regressions with that patch on s390x. gas/ChangeLog: 2017-08-01 Andreas Krebbel Backport from mainline 2017-07-21 Andreas Krebbel * config/tc-s390.c (s390_parse_cpu): Add z14 as alternate CPU name. * doc/as.texinfo: Add z14 to CPU string list. * doc/c-s390.texi: Likewise. opcodes/ChangeLog: 2017-08-01 Andreas Krebbel Backport from mainline 2017-07-21 Andreas Krebbel * s390-mkopc.c (main): Enable z14 as CPU string in the opcode table. --- diff --git a/gas/ChangeLog b/gas/ChangeLog index ee0d00c34da..948f23662ca 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,13 @@ +2017-08-01 Andreas Krebbel + + Backport from mainline + 2017-07-21 Andreas Krebbel + + * config/tc-s390.c (s390_parse_cpu): Add z14 as alternate CPU + name. + * doc/as.texinfo: Add z14 to CPU string list. + * doc/c-s390.texi: Likewise. + 2017-07-24 Tristan Gingold * configure: Regenerate. diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c index 3ec5a2775c1..84b2e270e96 100644 --- a/gas/config/tc-s390.c +++ b/gas/config/tc-s390.c @@ -290,7 +290,7 @@ s390_parse_cpu (const char * arg, S390_INSTR_FLAG_HTM }, { STRING_COMMA_LEN ("z13"), STRING_COMMA_LEN ("arch11"), S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX }, - { STRING_COMMA_LEN ("arch12"), STRING_COMMA_LEN (""), + { STRING_COMMA_LEN ("z14"), STRING_COMMA_LEN ("arch12"), S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX } }; static struct diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo index e0637c71491..b82204dfdf7 100644 --- a/gas/doc/as.texinfo +++ b/gas/doc/as.texinfo @@ -1740,7 +1740,7 @@ Specify which s390 processor variant is the target, @samp{g5} (or @samp{arch3}), @samp{g6}, @samp{z900} (or @samp{arch5}), @samp{z990} (or @samp{arch6}), @samp{z9-109}, @samp{z9-ec} (or @samp{arch7}), @samp{z10} (or @samp{arch8}), @samp{z196} (or @samp{arch9}), @samp{zEC12} (or @samp{arch10}), -@samp{z13} (or @samp{arch11}), or @samp{arch12}. +@samp{z13} (or @samp{arch11}), or @samp{z14} (or @samp{arch12}). @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 2f417cb94c2..a50d7266b2b 100644 --- a/gas/doc/c-s390.texi +++ b/gas/doc/c-s390.texi @@ -18,7 +18,7 @@ and eleven chip levels. The architecture modes are the Enterprise System Architecture (ESA) and the newer z/Architecture mode. The chip levels are g5 (or arch3), g6, z900 (or arch5), z990 (or arch6), z9-109, z9-ec (or arch7), z10 (or arch8), z196 (or arch9), zEC12 (or arch10), z13 -(or arch11), and arch12. +(or arch11), and z14 (or arch12). @menu * s390 Options:: Command-line Options. diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index e535ba487a3..df549d749dd 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,11 @@ +2017-08-01 Andreas Krebbel + + Backport from mainline + 2017-07-21 Andreas Krebbel + + * s390-mkopc.c (main): Enable z14 as CPU string in the opcode + table. + 2017-07-24 Tristan Gingold * configure: Regenerate. diff --git a/opcodes/s390-mkopc.c b/opcodes/s390-mkopc.c index 0d4c9df777a..20c15399a7f 100644 --- a/opcodes/s390-mkopc.c +++ b/opcodes/s390-mkopc.c @@ -374,7 +374,8 @@ main (void) else if (strcmp (cpu_string, "z13") == 0 || strcmp (cpu_string, "arch11") == 0) min_cpu = S390_OPCODE_Z13; - else if (strcmp (cpu_string, "arch12") == 0) + else if (strcmp (cpu_string, "z14") == 0 + || strcmp (cpu_string, "arch12") == 0) min_cpu = S390_OPCODE_ARCH12; else { fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string);