diff --git a/SOURCES/_gdb.spec.Patch.include b/SOURCES/_gdb.spec.Patch.include
index bf653a0..12d65a5 100644
--- a/SOURCES/_gdb.spec.Patch.include
+++ b/SOURCES/_gdb.spec.Patch.include
@@ -647,3 +647,26 @@ Patch158: gdb-rhbz1187581-power8-regs-not-in-8.2-14of15.patch
# Pedro Franco de Carvalho, RH BZ 1187581
Patch159: gdb-rhbz1187581-power8-regs-not-in-8.2-15of15.patch
+# "Fix" segfault that happens on parse_macro_definition because
+# debugedit corrupts the .debug_macro section.
+# Sergio Durigan Junior, RH BZ 1708192.
+Patch160: gdb-rhbz1708192-parse_macro_definition-crash.patch
+
+# Prevent buffer overflow with sections with invalid sizes.
+# Keith Seitz, RH BZ 1740299.
+Patch161: gdb-rhbz1742099-reject-sections-with-invalid-sizes.patch
+
+# Fix 'GDB needs s390x arch13 binutils patches'
+# RHBZ 1768593, Andreas Krebbel
+# This patch contains only the opcodes change.
+Patch162: gdb-rhbz1768593-s390x-arch13-01.patch
+
+# Fix 'GDB needs s390x arch13 binutils patches'
+# RHBZ 1768593, Andreas Krebbel
+# This patch contains only the opcodes and include changes.
+Patch163: gdb-rhbz1768593-s390x-arch13-02.patch
+
+# Fix 'GDB needs s390x arch13 binutils patches'
+# RHBZ 1768593, Andreas Krebbel
+Patch164: gdb-rhbz1768593-s390x-arch13-03.patch
+
diff --git a/SOURCES/_gdb.spec.patch.include b/SOURCES/_gdb.spec.patch.include
index 8ac090c..03c1fad 100644
--- a/SOURCES/_gdb.spec.patch.include
+++ b/SOURCES/_gdb.spec.patch.include
@@ -157,3 +157,8 @@
%patch157 -p1
%patch158 -p1
%patch159 -p1
+%patch160 -p1
+%patch161 -p1
+%patch162 -p1
+%patch163 -p1
+%patch164 -p1
diff --git a/SOURCES/gdb-rhbz1708192-parse_macro_definition-crash.patch b/SOURCES/gdb-rhbz1708192-parse_macro_definition-crash.patch
new file mode 100644
index 0000000..d2f2b4f
--- /dev/null
+++ b/SOURCES/gdb-rhbz1708192-parse_macro_definition-crash.patch
@@ -0,0 +1,69 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Sergio Durigan Junior <sergiodj@redhat.com>
+Date: Fri, 10 May 2019 16:57:26 -0400
+Subject: gdb-rhbz1708192-parse_macro_definition-crash.patch
+
+;; "Fix" segfault that happens on parse_macro_definition because
+;; debugedit corrupts the .debug_macro section.
+;; Sergio Durigan Junior, RH BZ 1708192.
+
+Don't crash if dwarf_decode_macro_bytes's 'body' is NULL
+
+Hi,
+
+Ref.: https://bugzilla.redhat.com/show_bug.cgi?id=1708192
+ https://bugzilla.redhat.com/show_bug.cgi?id=1708786
+
+During the Fedora RPM build process, gdb-add-index is invoked to
+extract the DWARF index from the binary, and GDB will segfault because
+dwarf2read.c:parse_definition_macro's 'body' variable is NULL.
+
+The underlying problem is that Fedora's rpm-build's "debugedit"
+program will silently corrupt .debug_macro strings when a binary is
+compiled with -g3. This is being taken care of by Mark Wielaard,
+here:
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=1708786
+
+However, I still feel it's important to make GDB more resilient
+against invalid DWARF input, so I'm proposing this rather simple patch
+to catch the situation when "body == NULL" (i.e., it's probably been
+corrupted) and issue a complaint. This is not a real fix to the
+problem, of course, but at least GDB is able to finish without
+segfaulting.
+
+OK for master?
+
+gdb/ChangeLog:
+2019-05-15 Sergio Durigan Junior <sergiodj@redhat.com>
+
+ Ref.: https://bugzilla.redhat.com/show_bug.cgi?id=1708192
+ * dwarf2read.c (dwarf_decode_macro_bytes): Check whether 'body' is
+ NULL, and complain if that's the case.
+
+diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
+--- a/gdb/dwarf2read.c
++++ b/gdb/dwarf2read.c
+@@ -24355,7 +24355,21 @@ dwarf_decode_macro_bytes (struct dwarf2_per_objfile *dwarf2_per_objfile,
+ is_define ? _("definition") : _("undefinition"),
+ line == 0 ? _("zero") : _("non-zero"), line, body);
+
+- if (is_define)
++ if (body == NULL)
++ {
++ /* Fedora's rpm-build's "debugedit" binary
++ corrupted .debug_macro sections.
++
++ For more info, see
++ https://bugzilla.redhat.com/show_bug.cgi?id=1708786 */
++ complaint (_("debug info gives %s invalid macro %s "
++ "without body (corrupted?) at line %d "
++ "on file %s"),
++ at_commandline ? _("command-line") : _("in-file"),
++ is_define ? _("definition") : _("undefinition"),
++ line, current_file->filename);
++ }
++ else if (is_define)
+ parse_macro_definition (current_file, line, body);
+ else
+ {
diff --git a/SOURCES/gdb-rhbz1742099-reject-sections-with-invalid-sizes.patch b/SOURCES/gdb-rhbz1742099-reject-sections-with-invalid-sizes.patch
new file mode 100644
index 0000000..00d7b8c
--- /dev/null
+++ b/SOURCES/gdb-rhbz1742099-reject-sections-with-invalid-sizes.patch
@@ -0,0 +1,128 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Keith Seitz <keiths@redhat.com>
+Date: Thu, 17 Oct 2019 09:44:15 -0700
+Subject: gdb-rhbz1742099-reject-sections-with-invalid-sizes.patch
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+;; Prevent buffer overflow with sections with invalid sizes.
+;; Keith Seitz, RH BZ 1740299.
+
+DWARF reader: Reject sections with invalid sizes
+
+This is another fuzzer bug, gdb/23567. This time, the fuzzer has
+specifically altered the size of .debug_str:
+
+$ eu-readelf -S objdump
+Section Headers:
+[Nr] Name Type Addr Off Size ES Flags Lk Inf Al
+[31] .debug_str PROGBITS 0000000000000000 0057116d ffffffffffffffff 1 MS 0 0 1
+
+When this file is loaded into GDB, the DWARF reader crashes attempting
+to access the string table (or it may just store a bunch of nonsense):
+
+[gdb-8.3-6-fc30]
+$ gdb -nx -q objdump
+BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size
+Reading symbols from /path/to/objdump...
+Segmentation fault (core dumped)
+
+Nick has already committed a BFD patch to issue the warning seen above.
+
+[gdb master 6acc1a0b]
+$ gdb -BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size
+Reading symbols from /path/to/objdump...
+(gdb) inf func
+All defined functions:
+
+File ./../include/dwarf2.def:
+186: const
+
+ 8 *>(.:
+ ;'@�B);
+747: const
+
+ 8 *�(.:
+ ;'@�B);
+701: const
+
+ 8 *�D �
+ (.:
+ ;'@�B);
+71: const
+
+ 8 *(.:
+ ;'@�B);
+/* and more gibberish */
+
+Consider read_indirect_string_at_offset_from:
+
+static const char *
+read_indirect_string_at_offset_from (struct objfile *objfile,
+ bfd *abfd, LONGEST str_offset,
+ struct dwarf2_section_info *sect,
+ const char *form_name,
+ const char *sect_name)
+{
+ dwarf2_read_section (objfile, sect);
+ if (sect->buffer == NULL)
+ error (_("%s used without %s section [in module %s]"),
+ form_name, sect_name, bfd_get_filename (abfd));
+ if (str_offset >= sect->size)
+ error (_("%s pointing outside of %s section [in module %s]"),
+ form_name, sect_name, bfd_get_filename (abfd));
+ gdb_assert (HOST_CHAR_BIT == 8);
+ if (sect->buffer[str_offset] == '\0')
+ return NULL;
+ return (const char *) (sect->buffer + str_offset);
+}
+
+With sect_size being ginormous, the code attempts to access
+sect->buffer[GINORMOUS], and depending on the layout of memory,
+GDB either stores a bunch of gibberish strings or crashes.
+
+This is an attempt to mitigate this by implementing a similar approach
+used by BFD. In our case, we simply reject the section with the invalid
+length:
+
+$ ./gdb -nx -q objdump
+BFD: warning: /path/to/objdump has a corrupt section with a size (ffffffffffffffff) larger than the file size
+Reading symbols from /path/to/objdump...
+
+warning: Discarding section .debug_str which has a section size (ffffffffffffffff) larger than the file size [in module /path/to/objdump]
+DW_FORM_strp used without .debug_str section [in module /path/to/objdump]
+(No debugging symbols found in /path/to/objdump)
+(gdb)
+
+Unfortunately, I have not found a way to regression test this, since it
+requires poking ELF section headers.
+
+gdb/ChangeLog:
+2019-10-16 Keith Seitz <keiths@redhat.com>
+
+ PR gdb/23567
+ * dwarf2read.c (dwarf2_per_objfile::locate_sections): Discard
+ sections whose size is greater than the file size.
+
+Change-Id: I896ac3b4eb2207c54e8e05c16beab3051d9b4b2f
+
+diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
+--- a/gdb/dwarf2read.c
++++ b/gdb/dwarf2read.c
+@@ -2335,6 +2335,15 @@ dwarf2_per_objfile::locate_sections (bfd *abfd, asection *sectp,
+ if ((aflag & SEC_HAS_CONTENTS) == 0)
+ {
+ }
++ else if (elf_section_data (sectp)->this_hdr.sh_size
++ > bfd_get_file_size (abfd))
++ {
++ bfd_size_type size = elf_section_data (sectp)->this_hdr.sh_size;
++ warning (_("Discarding section %s which has a section size (%s"
++ ") larger than the file size [in module %s]"),
++ bfd_section_name (abfd, sectp), phex_nz (size, sizeof (size)),
++ bfd_get_filename (abfd));
++ }
+ else if (section_is_p (sectp->name, &names.info))
+ {
+ this->info.s.section = sectp;
diff --git a/SOURCES/gdb-rhbz1768593-s390x-arch13-01.patch b/SOURCES/gdb-rhbz1768593-s390x-arch13-01.patch
new file mode 100644
index 0000000..fcb8707
--- /dev/null
+++ b/SOURCES/gdb-rhbz1768593-s390x-arch13-01.patch
@@ -0,0 +1,49 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Sergio Durigan Junior <sergiodj@redhat.com>
+Date: Tue, 7 Jan 2020 21:02:19 -0500
+Subject: gdb-rhbz1768593-s390x-arch13-01.patch
+
+;; Fix 'GDB needs s390x arch13 binutils patches'
+;; RHBZ 1768593, Andreas Krebbel
+;; This patch contains only the opcodes change.
+
+S/390: Support vector alignment hints
+
+This patch adds the vector alignment hints to the vector load and
+store instructions as documented in the IBM z14 Principles of
+Operations manual:
+
+http://publibfi.boulder.ibm.com/epubs/pdf/dz9zr011.pdf
+
+opcodes/ChangeLog:
+
+2018-10-23 Andreas Krebbel <krebbel@linux.ibm.com>
+
+ * s390-opc.txt: Add vector load/store instructions with additional
+ alignment parameter.
+
+gas/ChangeLog:
+
+2018-10-23 Andreas Krebbel <krebbel@linux.ibm.com>
+
+ * config/tc-s390.c (md_gather_operands): Fix for optional operands
+ following memory addresses.
+ * testsuite/gas/s390/zarch-arch12.d: Add regexp checks for new
+ instruction variants.
+ * testsuite/gas/s390/zarch-arch12.s: Emit new instruction
+ variants.
+
+diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
+--- a/opcodes/s390-opc.txt
++++ b/opcodes/s390-opc.txt
+@@ -1880,3 +1880,10 @@ b929 kma RRF_R0RR "cipher message with galois counter mode" arch12 zarch
+ b93c prno RRE_RR "perform pseudorandom number operation" arch12 zarch
+ b9a1 tpei RRE_RR "test pending external interruption" arch12 zarch
+ b9ac irbm RRE_RR "insert reference bits multiple" arch12 zarch
++
++# Aligned vector store hints
++
++e70000000006 vl VRX_VRRDU "vector memory load" arch12 zarch optparm
++e70000000036 vlm VRS_VVRDU "vector load multiple" arch12 zarch optparm
++e7000000000e vst VRX_VRRDU "vector store" arch12 zarch optparm
++e7000000003e vstm VRS_VVRDU "vector store multiple" arch12 zarch optparm
diff --git a/SOURCES/gdb-rhbz1768593-s390x-arch13-02.patch b/SOURCES/gdb-rhbz1768593-s390x-arch13-02.patch
new file mode 100644
index 0000000..8db5282
--- /dev/null
+++ b/SOURCES/gdb-rhbz1768593-s390x-arch13-02.patch
@@ -0,0 +1,217 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Sergio Durigan Junior <sergiodj@redhat.com>
+Date: Tue, 7 Jan 2020 21:07:53 -0500
+Subject: gdb-rhbz1768593-s390x-arch13-02.patch
+
+;; Fix 'GDB needs s390x arch13 binutils patches'
+;; RHBZ 1768593, Andreas Krebbel
+;; This patch contains only the opcodes and include changes.
+
+S/390: Implement instruction set extensions
+
+opcodes/ChangeLog:
+
+2019-01-31 Andreas Krebbel <krebbel@linux.ibm.com>
+
+ Backport from mainline
+ 2019-01-31 Andreas Krebbel <krebbel@linux.ibm.com>
+
+ * s390-mkopc.c (main): Accept arch13 as cpu string.
+ * s390-opc.c: Add new instruction formats and instruction opcode
+ masks.
+ * s390-opc.txt: Add new arch13 instructions.
+
+include/ChangeLog:
+
+2019-01-31 Andreas Krebbel <krebbel@linux.ibm.com>
+
+ Backport from mainline
+ 2019-01-31 Andreas Krebbel <krebbel@linux.ibm.com>
+
+ * opcode/s390.h (enum s390_opcode_cpu_val): Add
+ S390_OPCODE_ARCH13.
+
+gas/ChangeLog:
+
+2019-01-31 Andreas Krebbel <krebbel@linux.ibm.com>
+
+ Backport from mainline
+ 2019-01-31 Andreas Krebbel <krebbel@linux.ibm.com>
+
+ * config/tc-s390.c (s390_parse_cpu): New entry for arch13.
+ * doc/c-s390.texi: Document arch13 march option.
+ * testsuite/gas/s390/s390.exp: Run the arch13 related tests.
+ * testsuite/gas/s390/zarch-arch13.d: New test.
+ * testsuite/gas/s390/zarch-arch13.s: New test.
+ * testsuite/gas/s390/zarch-z13.d: Expect the renamed mnemonics
+ also for z13.
+
+diff --git a/include/opcode/s390.h b/include/opcode/s390.h
+--- a/include/opcode/s390.h
++++ b/include/opcode/s390.h
+@@ -43,6 +43,7 @@ enum s390_opcode_cpu_val
+ S390_OPCODE_ZEC12,
+ S390_OPCODE_Z13,
+ S390_OPCODE_ARCH12,
++ S390_OPCODE_ARCH13,
+ S390_OPCODE_MAXCPU
+ };
+
+diff --git a/opcodes/s390-mkopc.c b/opcodes/s390-mkopc.c
+--- a/opcodes/s390-mkopc.c
++++ b/opcodes/s390-mkopc.c
+@@ -377,6 +377,8 @@ main (void)
+ else if (strcmp (cpu_string, "z14") == 0
+ || strcmp (cpu_string, "arch12") == 0)
+ min_cpu = S390_OPCODE_ARCH12;
++ else if (strcmp (cpu_string, "arch13") == 0)
++ min_cpu = S390_OPCODE_ARCH13;
+ else {
+ fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string);
+ exit (1);
+diff --git a/opcodes/s390-opc.c b/opcodes/s390-opc.c
+--- a/opcodes/s390-opc.c
++++ b/opcodes/s390-opc.c
+@@ -359,6 +359,7 @@ const struct s390_operand s390_operands[] =
+ #define INSTR_RRF_RURR2 4, { R_24,R_16,R_28,U4_20,0,0 } /* e.g. lptea */
+ #define INSTR_RRF_R0RR 4, { R_24,R_16,R_28,0,0,0 } /* e.g. idte */
+ #define INSTR_RRF_R0RR2 4, { R_24,R_28,R_16,0,0,0 } /* e.g. ark */
++#define INSTR_RRF_R0RR3 4, { R_24,R_28,R_16,0,0,0 } /* e.g. selrz */
+ #define INSTR_RRF_U0FF 4, { F_24,U4_16,F_28,0,0,0 } /* e.g. fidbr */
+ #define INSTR_RRF_U0FEFE 4, { FE_24,U4_16,FE_28,0,0,0 } /* e.g. fixbr */
+ #define INSTR_RRF_U0RF 4, { R_24,U4_16,F_28,0,0,0 } /* e.g. cfebr */
+@@ -513,6 +514,7 @@ const struct s390_operand s390_operands[] =
+ #define INSTR_VRR_VV0U0U 6, { V_8,V_12,U4_32,U4_24,0,0 } /* e.g. vistr */
+ #define INSTR_VRR_0VV0U 6, { V_12,V_16,U4_24,0,0,0 } /* e.g. vcp */
+ #define INSTR_VRR_RV0U 6, { R_8,V_12,U4_24,0,0,0 } /* e.g. vcvb */
++#define INSTR_VRR_RV0UU 6, { R_8,V_12,U4_24,U4_28,0,0 } /* e.g. vcvb */
+ #define INSTR_VSI_URDV 6, { V_32,D_20,B_16,U8_8,0,0 } /* e.g. vlrl */
+
+ #define MASK_E { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }
+@@ -578,6 +580,7 @@ const struct s390_operand s390_operands[] =
+ #define MASK_RRF_RURR2 { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }
+ #define MASK_RRF_R0RR { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }
+ #define MASK_RRF_R0RR2 { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }
++#define MASK_RRF_R0RR3 { 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00 }
+ #define MASK_RRF_U0FF { 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00 }
+ #define MASK_RRF_U0FEFE { 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00 }
+ #define MASK_RRF_U0RF { 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00 }
+@@ -732,6 +735,7 @@ const struct s390_operand s390_operands[] =
+ #define MASK_VRR_VV0U0U { 0xff, 0x00, 0xff, 0x0f, 0x00, 0xff }
+ #define MASK_VRR_0VV0U { 0xff, 0xf0, 0x0f, 0x0f, 0xf0, 0xff }
+ #define MASK_VRR_RV0U { 0xff, 0x00, 0xff, 0x0f, 0xf0, 0xff }
++#define MASK_VRR_RV0UU { 0xff, 0x00, 0xff, 0x00, 0xf0, 0xff }
+ #define MASK_VSI_URDV { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff }
+
+
+diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
+--- a/opcodes/s390-opc.txt
++++ b/opcodes/s390-opc.txt
+@@ -1887,3 +1887,107 @@ e70000000006 vl VRX_VRRDU "vector memory load" arch12 zarch optparm
+ e70000000036 vlm VRS_VVRDU "vector load multiple" arch12 zarch optparm
+ e7000000000e vst VRX_VRRDU "vector store" arch12 zarch optparm
+ e7000000003e vstm VRS_VVRDU "vector store multiple" arch12 zarch optparm
++
++# arch13 instructions
++
++b9f5 ncrk RRF_R0RR2 " " arch13 zarch
++b9e5 ncgrk RRF_R0RR2 " " arch13 zarch
++e50a mvcrl SSE_RDRD " " arch13 zarch
++b974 nnrk RRF_R0RR2 " " arch13 zarch
++b964 nngrk RRF_R0RR2 " " arch13 zarch
++b976 nork RRF_R0RR2 " " arch13 zarch
++b966 nogrk RRF_R0RR2 " " arch13 zarch
++b977 nxrk RRF_R0RR2 " " arch13 zarch
++b967 nxgrk RRF_R0RR2 " " arch13 zarch
++b975 ocrk RRF_R0RR2 " " arch13 zarch
++b965 ocgrk RRF_R0RR2 " " arch13 zarch
++b9e1 popcnt RRF_U0RR " " arch13 zarch optparm
++b9f0 selr RRF_RURR " " arch13 zarch
++b9f00000 selr*20 RRF_R0RR3 " " arch13 zarch
++b9e3 selgr RRF_RURR " " arch13 zarch
++b9e30000 selgr*20 RRF_R0RR3 " " arch13 zarch
++b9c0 selhhhr RRF_RURR " " arch13 zarch
++b9c00000 selhhhr*20 RRF_R0RR3 " " arch13 zarch
++
++e60000000006 vlbr VRX_VRRDU " " arch13 zarch
++e60000001006 vlbrh VRX_VRRD " " arch13 zarch
++e60000002006 vlbrf VRX_VRRD " " arch13 zarch
++e60000003006 vlbrg VRX_VRRD " " arch13 zarch
++e60000004006 vlbrq VRX_VRRD " " arch13 zarch
++
++e60000000007 vler VRX_VRRDU " " arch13 zarch
++e60000001007 vlerh VRX_VRRD " " arch13 zarch
++e60000002007 vlerf VRX_VRRD " " arch13 zarch
++e60000003007 vlerg VRX_VRRD " " arch13 zarch
++
++e60000000004 vllebrz VRX_VRRDU " " arch13 zarch
++e60000001004 vllebrzh VRX_VRRD " " arch13 zarch
++e60000002004 vllebrzf VRX_VRRD " " arch13 zarch
++e60000003004 ldrv VRX_VRRD " " arch13 zarch
++e60000003004 vllebrzg VRX_VRRD " " arch13 zarch
++e60000006004 lerv VRX_VRRD " " arch13 zarch
++e60000006004 vllebrze VRX_VRRD " " arch13 zarch
++
++e60000000001 vlebrh VRX_VRRDU " " arch13 zarch
++e60000000003 vlebrf VRX_VRRDU " " arch13 zarch
++e60000000002 vlebrg VRX_VRRDU " " arch13 zarch
++
++e60000000005 vlbrrep VRX_VRRDU " " arch13 zarch
++e60000001005 vlbrreph VRX_VRRD " " arch13 zarch
++e60000002005 vlbrrepf VRX_VRRD " " arch13 zarch
++e60000003005 vlbrrepg VRX_VRRD " " arch13 zarch
++
++e6000000000e vstbr VRX_VRRDU " " arch13 zarch
++e6000000100e vstbrh VRX_VRRD " " arch13 zarch
++e6000000200e vstbrf VRX_VRRD " " arch13 zarch
++e6000000300e vstbrg VRX_VRRD " " arch13 zarch
++e6000000400e vstbrq VRX_VRRD " " arch13 zarch
++
++e6000000000f vster VRX_VRRDU " " arch13 zarch
++e6000000100f vsterh VRX_VRRD " " arch13 zarch
++e6000000200f vsterf VRX_VRRD " " arch13 zarch
++e6000000300f vsterg VRX_VRRD " " arch13 zarch
++
++e60000000009 vstebrh VRX_VRRDU " " arch13 zarch
++e6000000000b vstebrf VRX_VRRDU " " arch13 zarch
++e6000000000b sterv VRX_VRRD " " arch13 zarch
++e6000000000a vstebrg VRX_VRRDU " " arch13 zarch
++e6000000000a stdrv VRX_VRRD " " arch13 zarch
++
++e70000000086 vsld VRI_VVV0U " " arch13 zarch
++e70000000087 vsrd VRI_VVV0U " " arch13 zarch
++
++e7000000008b vstrs VRR_VVVUU0V " " arch13 zarch optparm
++
++e7000000008b vstrsb VRR_VVVU0VB " " arch13 zarch optparm
++e7000100008b vstrsh VRR_VVVU0VB " " arch13 zarch optparm
++e7000200008b vstrsf VRR_VVVU0VB " " arch13 zarch optparm
++
++e7000020008b vstrszb VRR_VVVU0VB2 " " arch13 zarch optparm
++e7000120008b vstrszh VRR_VVVU0VB2 " " arch13 zarch optparm
++e7000220008b vstrszf VRR_VVVU0VB2 " " arch13 zarch optparm
++
++e700000000c3 vcfps VRR_VV0UUU " " arch13 zarch
++e700000020c3 vcefb VRR_VV0UU " " arch13 zarch
++e700000820c3 wcefb VRR_VV0UU8 " " arch13 zarch
++
++e700000000c1 vcfpl VRR_VV0UUU " " arch13 zarch
++e700000020c1 vcelfb VRR_VV0UU " " arch13 zarch
++e700000820c1 wcelfb VRR_VV0UU8 " " arch13 zarch
++
++e700000000c2 vcsfp VRR_VV0UUU " " arch13 zarch
++e700000020c2 vcfeb VRR_VV0UU " " arch13 zarch
++e700000820c2 wcfeb VRR_VV0UU8 " " arch13 zarch
++
++e700000000c0 vclfp VRR_VV0UUU " " arch13 zarch
++e700000020c0 vclfeb VRR_VV0UU " " arch13 zarch
++e700000820c0 wclfeb VRR_VV0UU8 " " arch13 zarch
++
++b939 dfltcc RRF_R0RR2 " " arch13 zarch
++
++b938 sortl RRE_RR " " arch13 zarch
++
++e60000000050 vcvb VRR_RV0UU " " arch13 zarch optparm
++e60000000052 vcvbg VRR_RV0UU " " arch13 zarch optparm
++
++b93a kdsa RRE_RR " " arch13 zarch
diff --git a/SOURCES/gdb-rhbz1768593-s390x-arch13-03.patch b/SOURCES/gdb-rhbz1768593-s390x-arch13-03.patch
new file mode 100644
index 0000000..60861a6
--- /dev/null
+++ b/SOURCES/gdb-rhbz1768593-s390x-arch13-03.patch
@@ -0,0 +1,241 @@
+From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
+From: Sergio Durigan Junior <sergiodj@redhat.com>
+Date: Tue, 7 Jan 2020 21:08:22 -0500
+Subject: gdb-rhbz1768593-s390x-arch13-03.patch
+
+;; Fix 'GDB needs s390x arch13 binutils patches'
+;; RHBZ 1768593, Andreas Krebbel
+
+S/390: arch13: Add instruction descriptions
+
+opcodes/ChangeLog:
+
+2019-03-12 Andreas Krebbel <krebbel@linux.ibm.com>
+
+ * s390-opc.txt: Add instruction descriptions.
+
+diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
+--- a/opcodes/s390-opc.txt
++++ b/opcodes/s390-opc.txt
+@@ -1888,106 +1888,120 @@ e70000000036 vlm VRS_VVRDU "vector load multiple" arch12 zarch optparm
+ e7000000000e vst VRX_VRRDU "vector store" arch12 zarch optparm
+ e7000000003e vstm VRS_VVRDU "vector store multiple" arch12 zarch optparm
+
++
+ # arch13 instructions
+
+-b9f5 ncrk RRF_R0RR2 " " arch13 zarch
+-b9e5 ncgrk RRF_R0RR2 " " arch13 zarch
+-e50a mvcrl SSE_RDRD " " arch13 zarch
+-b974 nnrk RRF_R0RR2 " " arch13 zarch
+-b964 nngrk RRF_R0RR2 " " arch13 zarch
+-b976 nork RRF_R0RR2 " " arch13 zarch
+-b966 nogrk RRF_R0RR2 " " arch13 zarch
+-b977 nxrk RRF_R0RR2 " " arch13 zarch
+-b967 nxgrk RRF_R0RR2 " " arch13 zarch
+-b975 ocrk RRF_R0RR2 " " arch13 zarch
+-b965 ocgrk RRF_R0RR2 " " arch13 zarch
+-b9e1 popcnt RRF_U0RR " " arch13 zarch optparm
+-b9f0 selr RRF_RURR " " arch13 zarch
+-b9f00000 selr*20 RRF_R0RR3 " " arch13 zarch
+-b9e3 selgr RRF_RURR " " arch13 zarch
+-b9e30000 selgr*20 RRF_R0RR3 " " arch13 zarch
+-b9c0 selhhhr RRF_RURR " " arch13 zarch
+-b9c00000 selhhhr*20 RRF_R0RR3 " " arch13 zarch
+-
+-e60000000006 vlbr VRX_VRRDU " " arch13 zarch
+-e60000001006 vlbrh VRX_VRRD " " arch13 zarch
+-e60000002006 vlbrf VRX_VRRD " " arch13 zarch
+-e60000003006 vlbrg VRX_VRRD " " arch13 zarch
+-e60000004006 vlbrq VRX_VRRD " " arch13 zarch
+-
+-e60000000007 vler VRX_VRRDU " " arch13 zarch
+-e60000001007 vlerh VRX_VRRD " " arch13 zarch
+-e60000002007 vlerf VRX_VRRD " " arch13 zarch
+-e60000003007 vlerg VRX_VRRD " " arch13 zarch
+-
+-e60000000004 vllebrz VRX_VRRDU " " arch13 zarch
+-e60000001004 vllebrzh VRX_VRRD " " arch13 zarch
+-e60000002004 vllebrzf VRX_VRRD " " arch13 zarch
+-e60000003004 ldrv VRX_VRRD " " arch13 zarch
+-e60000003004 vllebrzg VRX_VRRD " " arch13 zarch
+-e60000006004 lerv VRX_VRRD " " arch13 zarch
+-e60000006004 vllebrze VRX_VRRD " " arch13 zarch
+-
+-e60000000001 vlebrh VRX_VRRDU " " arch13 zarch
+-e60000000003 vlebrf VRX_VRRDU " " arch13 zarch
+-e60000000002 vlebrg VRX_VRRDU " " arch13 zarch
+-
+-e60000000005 vlbrrep VRX_VRRDU " " arch13 zarch
+-e60000001005 vlbrreph VRX_VRRD " " arch13 zarch
+-e60000002005 vlbrrepf VRX_VRRD " " arch13 zarch
+-e60000003005 vlbrrepg VRX_VRRD " " arch13 zarch
+-
+-e6000000000e vstbr VRX_VRRDU " " arch13 zarch
+-e6000000100e vstbrh VRX_VRRD " " arch13 zarch
+-e6000000200e vstbrf VRX_VRRD " " arch13 zarch
+-e6000000300e vstbrg VRX_VRRD " " arch13 zarch
+-e6000000400e vstbrq VRX_VRRD " " arch13 zarch
+-
+-e6000000000f vster VRX_VRRDU " " arch13 zarch
+-e6000000100f vsterh VRX_VRRD " " arch13 zarch
+-e6000000200f vsterf VRX_VRRD " " arch13 zarch
+-e6000000300f vsterg VRX_VRRD " " arch13 zarch
+-
+-e60000000009 vstebrh VRX_VRRDU " " arch13 zarch
+-e6000000000b vstebrf VRX_VRRDU " " arch13 zarch
+-e6000000000b sterv VRX_VRRD " " arch13 zarch
+-e6000000000a vstebrg VRX_VRRDU " " arch13 zarch
+-e6000000000a stdrv VRX_VRRD " " arch13 zarch
+-
+-e70000000086 vsld VRI_VVV0U " " arch13 zarch
+-e70000000087 vsrd VRI_VVV0U " " arch13 zarch
+-
+-e7000000008b vstrs VRR_VVVUU0V " " arch13 zarch optparm
+-
+-e7000000008b vstrsb VRR_VVVU0VB " " arch13 zarch optparm
+-e7000100008b vstrsh VRR_VVVU0VB " " arch13 zarch optparm
+-e7000200008b vstrsf VRR_VVVU0VB " " arch13 zarch optparm
+-
+-e7000020008b vstrszb VRR_VVVU0VB2 " " arch13 zarch optparm
+-e7000120008b vstrszh VRR_VVVU0VB2 " " arch13 zarch optparm
+-e7000220008b vstrszf VRR_VVVU0VB2 " " arch13 zarch optparm
+-
+-e700000000c3 vcfps VRR_VV0UUU " " arch13 zarch
+-e700000020c3 vcefb VRR_VV0UU " " arch13 zarch
+-e700000820c3 wcefb VRR_VV0UU8 " " arch13 zarch
+-
+-e700000000c1 vcfpl VRR_VV0UUU " " arch13 zarch
+-e700000020c1 vcelfb VRR_VV0UU " " arch13 zarch
+-e700000820c1 wcelfb VRR_VV0UU8 " " arch13 zarch
+-
+-e700000000c2 vcsfp VRR_VV0UUU " " arch13 zarch
+-e700000020c2 vcfeb VRR_VV0UU " " arch13 zarch
+-e700000820c2 wcfeb VRR_VV0UU8 " " arch13 zarch
+-
+-e700000000c0 vclfp VRR_VV0UUU " " arch13 zarch
+-e700000020c0 vclfeb VRR_VV0UU " " arch13 zarch
+-e700000820c0 wclfeb VRR_VV0UU8 " " arch13 zarch
+-
+-b939 dfltcc RRF_R0RR2 " " arch13 zarch
+-
+-b938 sortl RRE_RR " " arch13 zarch
+-
+-e60000000050 vcvb VRR_RV0UU " " arch13 zarch optparm
+-e60000000052 vcvbg VRR_RV0UU " " arch13 zarch optparm
+-
+-b93a kdsa RRE_RR " " arch13 zarch
++
++# Miscellaneous Instruction Extensions Facility 2
++
++b9f5 ncrk RRF_R0RR2 "and with complement 32 bit" arch13 zarch
++b9e5 ncgrk RRF_R0RR2 "and with complement 64 bit" arch13 zarch
++e50a mvcrl SSE_RDRD "move right to left" arch13 zarch
++b974 nnrk RRF_R0RR2 "nand 32 bit" arch13 zarch
++b964 nngrk RRF_R0RR2 "nand 64 bit" arch13 zarch
++b976 nork RRF_R0RR2 "nor 32 bit" arch13 zarch
++b966 nogrk RRF_R0RR2 "nor 64 bit" arch13 zarch
++b977 nxrk RRF_R0RR2 "not exclusive or 32 bit" arch13 zarch
++b967 nxgrk RRF_R0RR2 "not exclusive or 64 bit" arch13 zarch
++b975 ocrk RRF_R0RR2 "or with complement 32 bit" arch13 zarch
++b965 ocgrk RRF_R0RR2 "or with complement 64 bit" arch13 zarch
++b9e1 popcnt RRF_U0RR "population count arch13" arch13 zarch optparm
++b9f0 selr RRF_RURR "select 32 bit" arch13 zarch
++b9f00000 selr*20 RRF_R0RR3 "select 32 bit" arch13 zarch
++b9e3 selgr RRF_RURR "select 64 bit" arch13 zarch
++b9e30000 selgr*20 RRF_R0RR3 "select 64 bit" arch13 zarch
++b9c0 selfhr RRF_RURR "select high" arch13 zarch
++b9c00000 selfhr*20 RRF_R0RR3 "select high" arch13 zarch
++
++# Vector Enhancements Facility 2
++
++e60000000006 vlbr VRX_VRRDU "vector load byte reversed elements" arch13 zarch
++e60000001006 vlbrh VRX_VRRD "vector load byte reversed halfword elements" arch13 zarch
++e60000002006 vlbrf VRX_VRRD "vector load byte reversed word elements" arch13 zarch
++e60000003006 vlbrg VRX_VRRD "vector load byte reversed doubleword elements" arch13 zarch
++e60000004006 vlbrq VRX_VRRD "vector load byte reversed quadword elements" arch13 zarch
++
++e60000000007 vler VRX_VRRDU "vector load elements reversed" arch13 zarch
++e60000001007 vlerh VRX_VRRD "vector load halfword elements reversed" arch13 zarch
++e60000002007 vlerf VRX_VRRD "vector load word elements reversed" arch13 zarch
++e60000003007 vlerg VRX_VRRD "vector load doubleword elements reversed" arch13 zarch
++
++e60000000004 vllebrz VRX_VRRDU "vector load byte reversed element and zero" arch13 zarch
++e60000001004 vllebrzh VRX_VRRD "vector load byte reversed halfword element and zero" arch13 zarch
++e60000002004 vllebrzf VRX_VRRD "vector load byte reversed word element and zero" arch13 zarch
++e60000003004 ldrv VRX_VRRD "load byte reversed doubleword" arch13 zarch
++e60000003004 vllebrzg VRX_VRRD "vector load byte reversed doubleword element and zero" arch13 zarch
++e60000006004 lerv VRX_VRRD "load byte reversed word" arch13 zarch
++e60000006004 vllebrze VRX_VRRD "vector load byte reversed word element left-aligned and zero" arch13 zarch
++
++e60000000001 vlebrh VRX_VRRDU "vector load byte reversed halfword element" arch13 zarch
++e60000000003 vlebrf VRX_VRRDU "vector load byte reversed word element" arch13 zarch
++e60000000002 vlebrg VRX_VRRDU "vector load byte reversed doubleword element" arch13 zarch
++
++e60000000005 vlbrrep VRX_VRRDU "vector load byte reversed element and replicate" arch13 zarch
++e60000001005 vlbrreph VRX_VRRD "vector load byte reversed halfword element and replicate" arch13 zarch
++e60000002005 vlbrrepf VRX_VRRD "vector load byte reversed word element and replicate" arch13 zarch
++e60000003005 vlbrrepg VRX_VRRD "vector load byte reversed doubleword element and replicate" arch13 zarch
++
++e6000000000e vstbr VRX_VRRDU "vector store byte reversed elements" arch13 zarch
++e6000000100e vstbrh VRX_VRRD "vector store byte reversed halfword elements" arch13 zarch
++e6000000200e vstbrf VRX_VRRD "vector store byte reversed word elements" arch13 zarch
++e6000000300e vstbrg VRX_VRRD "vector store byte reversed doubleword elements" arch13 zarch
++e6000000400e vstbrq VRX_VRRD "vector store byte reversed quadword elements" arch13 zarch
++
++e6000000000f vster VRX_VRRDU "vector store elements reversed" arch13 zarch
++e6000000100f vsterh VRX_VRRD "vector store halfword elements reversed" arch13 zarch
++e6000000200f vsterf VRX_VRRD "vector store word elements reversed" arch13 zarch
++e6000000300f vsterg VRX_VRRD "vector store doubleword elements reversed" arch13 zarch
++
++e60000000009 vstebrh VRX_VRRDU "vector store byte reversed halfword element" arch13 zarch
++e6000000000b vstebrf VRX_VRRDU "vector store byte reversed word element" arch13 zarch
++e6000000000b sterv VRX_VRRD "store byte reversed word" arch13 zarch
++e6000000000a vstebrg VRX_VRRDU "vector store byte reversed doubleword element" arch13 zarch
++e6000000000a stdrv VRX_VRRD "store byte reversed doubleword" arch13 zarch
++
++e70000000086 vsld VRI_VVV0U "vector shift left double by bit" arch13 zarch
++e70000000087 vsrd VRI_VVV0U "vector shift right double by bit" arch13 zarch
++
++e7000000008b vstrs VRR_VVVUU0V "vector string search" arch13 zarch optparm
++
++e7000000008b vstrsb VRR_VVVU0VB "vector string search byte" arch13 zarch optparm
++e7000100008b vstrsh VRR_VVVU0VB "vector string search halfword" arch13 zarch optparm
++e7000200008b vstrsf VRR_VVVU0VB "vector string search word" arch13 zarch optparm
++
++e7000020008b vstrszb VRR_VVV0V "vector string search byte zero" arch13 zarch
++e7000120008b vstrszh VRR_VVV0V "vector string search halfword zero" arch13 zarch
++e7000220008b vstrszf VRR_VVV0V "vector string search word zero" arch13 zarch
++
++e700000000c3 vcfps VRR_VV0UUU "vector fp convert from fixed" arch13 zarch
++e700000020c3 vcefb VRR_VV0UU "vector fp convert from fixed 32 bit" arch13 zarch
++e700000820c3 wcefb VRR_VV0UU8 "vector fp convert from fixed 32 bit" arch13 zarch
++
++e700000000c1 vcfpl VRR_VV0UUU "vector fp convert from logical" arch13 zarch
++e700000020c1 vcelfb VRR_VV0UU "vector fp convert from logical 32 bit" arch13 zarch
++e700000820c1 wcelfb VRR_VV0UU8 "vector fp convert from logical 32 bit" arch13 zarch
++
++e700000000c2 vcsfp VRR_VV0UUU "vector fp convert to fixed" arch13 zarch
++e700000020c2 vcfeb VRR_VV0UU "vector fp convert to fixed 32 bit" arch13 zarch
++e700000820c2 wcfeb VRR_VV0UU8 "vector fp convert to fixed 32 bit" arch13 zarch
++
++e700000000c0 vclfp VRR_VV0UUU "vector fp convert to logical" arch13 zarch
++e700000020c0 vclfeb VRR_VV0UU "vector fp convert to logical 32 bit" arch13 zarch
++e700000820c0 wclfeb VRR_VV0UU8 "vector fp convert to logical 32 bit" arch13 zarch
++
++# Deflate conversion facility
++
++b939 dfltcc RRF_R0RR2 "deflate conversion call" arch13 zarch
++
++# Enhanced-Sort Facility
++
++b938 sortl RRE_RR "sort lists" arch13 zarch
++
++# Vector packed decimal enhancement facility
++
++e60000000050 vcvb VRR_RV0UU "vector convert to binary 32 bit" arch13 zarch optparm
++e60000000052 vcvbg VRR_RV0UU "vector convert to binary 64 bit" arch13 zarch optparm
++
++# Message Security Assist Extension 9
++
++b93a kdsa RRE_RR "compute digital signature authentication" arch13 zarch
diff --git a/SPECS/gdb.spec b/SPECS/gdb.spec
index eb7ae37..4abc60b 100644
--- a/SPECS/gdb.spec
+++ b/SPECS/gdb.spec
@@ -26,7 +26,7 @@ Version: 8.2
# The release always contains a leading reserved number, start it at 1.
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 6%{?dist}
+Release: 11%{?dist}
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
Group: Development/Debuggers
@@ -1034,6 +1034,25 @@ fi
%endif
%changelog
+* Thu Jan 23 2020 Sergio Durigan Junior <sergiodj@redhat.com> - 8.2-11.el8
+- Revert previous change (RH BZ 1786466).
+
+* Thu Jan 16 2020 Sergio Durigan Junior <sergiodj@redhat.com> - 8.2-10.el8
+- Do not build i686 RPMs. Make the x86_64 RPMs Obsoletes/Provides
+ previous i686 RPMs (RH BZ 1786466).
+
+* Wed Jan 8 2020 Sergio Durigan Junior <sergiodj@redhat.com> - 8.2-9.el8
+- Implement s390x arch13 support (Andreas Krebbel, RH BZ 1768593).
+
+* Tue Oct 22 2019 Keith Seitz <keiths@redhat.com> - 8.2-8.el8
+- Fix buffer overflow reading sections with invalid sizes
+ (Keith Seitz, RH BZ 1742099)
+
+* Thu Oct 17 2019 Keith Seitz <keiths@redhat.com> - 8.2-7.el8
+- Fix segfault that happens on parse_macro_definition because
+ debugedit corrupts the .debug_macro section (Sergio Durigan Junior,
+ RH BZ 1708192).
+
* Wed Apr 3 2019 Keith Seitz <keiths@redhat.com> 8.2-6.el8
- Fix yum vs dnf messaging for RHEL8 (RH BZ 1666249):
Add gdb-rhbz1666249-suggest-yum-instead-of-dnf.pattch