From 877f9912a52239ee56eb31078d5a4eb210d152ba Mon Sep 17 00:00:00 2001
From: Dave Anderson <anderson@redhat.com>
Date: Thu, 5 May 2016 09:13:34 -0400
Subject: [PATCH] BZ #1333295 - FTBFS due compiler warnings in elf64-s390.c

---
 crash.spec       |  7 ++++++-
 elf64-s390.patch | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 elf64-s390.patch

diff --git a/crash.spec b/crash.spec
index 4b30122..ebdebb2 100644
--- a/crash.spec
+++ b/crash.spec
@@ -4,7 +4,7 @@
 Summary: Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles
 Name: crash
 Version: 7.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3
 Group: Development/Debuggers
 Source: http://people.redhat.com/anderson/crash-%{version}.tar.gz
@@ -17,6 +17,7 @@ Requires: binutils
 Provides: bundled(libiberty)
 Patch0: lzo_snappy.patch
 Patch1: use_system_readline_v3.patch
+Patch2: elf64-s390.patch
 
 %description
 The core analysis suite is a self-contained tool that can be used to
@@ -39,6 +40,7 @@ offered by Mission Critical Linux, or the LKCD kernel patch.
 %setup -n %{name}-%{version} -q
 %patch0 -p1 -b lzo_snappy.patch
 %patch1 -p1 -b use_system_readline_v3.patch
+%patch2 -p1 -b elf64-s390.patch
 
 %build
 make RPMPKG="%{version}-%{release}" CFLAGS="%{optflags}"
@@ -67,6 +69,9 @@ rm -rf %{buildroot}
 %{_includedir}/*
 
 %changelog
+* Thu May  5 2016 Dave Anderson <anderson@redhat.com> - 7.1.5-2
+- BZ #1333295 - FTBFS due compiler warnings in elf64-s390.c
+
 * Thu Apr 28 2016 Dave Anderson <anderson@redhat.com> - 7.1.5-1
 - Update to latest upstream release
 
diff --git a/elf64-s390.patch b/elf64-s390.patch
new file mode 100644
index 0000000..d507e73
--- /dev/null
+++ b/elf64-s390.patch
@@ -0,0 +1,34 @@
+commit 5649088bccc35f1a824e2b0c6482397b13c94abd
+Author: Dave Anderson <anderson@redhat.com>
+Date:   Thu May 5 09:01:35 2016 -0400
+
+    Fix for a "[-Werror=misleading-indentation]" compiler warning that
+    is generated by gdb-7.6/bfd/elf64-s390.c when building S390X in a
+    Fedora Rawhide environment with gcc-6.0.0.
+    (anderson@redhat.com)
+
+diff --git a/gdb-7.6.patch b/gdb-7.6.patch
+index 920ea1c..794555f 100644
+--- a/gdb-7.6.patch
++++ b/gdb-7.6.patch
+@@ -2206,3 +2206,20 @@ diff -up gdb-7.6/bfd/elf64-ppc.c.orig gdb-7.6/bfd/elf64-ppc.c
+ +  gi->finished = 1; 
+ +}
+  #endif
++--- gdb-7.6/bfd/elf64-s390.c.orig
+++++ gdb-7.6/bfd/elf64-s390.c
++@@ -323,10 +323,10 @@ elf_s390_reloc_name_lookup (bfd *abfd AT
++ 	&& strcasecmp (elf_howto_table[i].name, r_name) == 0)
++       return &elf_howto_table[i];
++ 
++-    if (strcasecmp (elf64_s390_vtinherit_howto.name, r_name) == 0)
++-      return &elf64_s390_vtinherit_howto;
++-    if (strcasecmp (elf64_s390_vtentry_howto.name, r_name) == 0)
++-      return &elf64_s390_vtentry_howto;
+++  if (strcasecmp (elf64_s390_vtinherit_howto.name, r_name) == 0)
+++    return &elf64_s390_vtinherit_howto;
+++  if (strcasecmp (elf64_s390_vtentry_howto.name, r_name) == 0)
+++    return &elf64_s390_vtentry_howto;
++ 
++   return NULL;
++ }