From 7f360b952dbc02f61319b65943e1a09536434eda Mon Sep 17 00:00:00 2001
From: Dave Anderson <anderson@redhat.com>
Date: Fri, 31 Jan 2020 15:35:36 -0500
Subject: [PATCH] Update to latest upstream release Fix aarch64 build for
 gcc-10 -fno-common

---
 aarch64_gcc10_fno-common.patch | 38 ++++++++++++++++++++++++++++++++++
 crash.spec                     |  7 +++++--
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 aarch64_gcc10_fno-common.patch

diff --git a/aarch64_gcc10_fno-common.patch b/aarch64_gcc10_fno-common.patch
new file mode 100644
index 0000000..f61231d
--- /dev/null
+++ b/aarch64_gcc10_fno-common.patch
@@ -0,0 +1,38 @@
+diff --git a/gdb-7.6.patch b/gdb-7.6.patch
+index f6c311d..f64b55f 100644
+--- a/gdb-7.6.patch
++++ b/gdb-7.6.patch
+@@ -2471,3 +2471,33 @@ diff -up gdb-7.6/opcodes/configure.orig gdb-7.6/opcodes/configure
+  #else
+  # error "!__i386__ && !__x86_64__"
+  #endif
++--- gdb-7.6/gdb/features/aarch64.c.orig
+++++ gdb-7.6/gdb/features/aarch64.c
++@@ -5,7 +5,6 @@
++ #include "osabi.h"
++ #include "target-descriptions.h"
++ 
++-struct target_desc *tdesc_aarch64;
++ static void
++ initialize_tdesc_aarch64 (void)
++ {
++--- gdb-7.6/gdb/aarch64-linux-nat.c.orig
+++++ gdb-7.6/gdb/aarch64-linux-nat.c
++@@ -37,6 +37,7 @@
++ 
++ #include "gregset.h"
++ 
+++extern struct target_desc *tdesc_aarch64;
++ #include "features/aarch64.c"
++ 
++ /* Defines ps_err_e, struct ps_prochandle.  */
++--- gdb-7.6/gdb/aarch64-tdep.c.orig
+++++ gdb-7.6/gdb/aarch64-tdep.c
++@@ -52,6 +52,7 @@
++ #include "gdb_assert.h"
++ #include "vec.h"
++ 
+++struct target_desc *tdesc_aarch64;
++ #include "features/aarch64.c"
++ #include "features/aarch64-without-fpu.c"
++ 
diff --git a/crash.spec b/crash.spec
index b9a9f9b..d48ea74 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.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3
 Source: http://people.redhat.com/anderson/crash-%{version}.tar.gz
 URL: http://people.redhat.com/anderson
@@ -17,6 +17,7 @@ Provides: bundled(libiberty)
 Provides: bundled(gdb) = 7.6
 Patch0: lzo_snappy.patch
 Patch1: use_system_readline_v3.patch
+Patch2: aarch64_gcc10_fno-common.patch
 
 %description
 The core analysis suite is a self-contained tool that can be used to
@@ -38,6 +39,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 aarch64_gcc10_fno-common.patch
 
 %build
 make RPMPKG="%{version}-%{release}" CFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
@@ -61,8 +63,9 @@ cp -p defs.h %{buildroot}%{_includedir}/crash
 %{_includedir}/*
 
 %changelog
-* Fri Jan 31 2020 Dave Anderson <anderson@redhat.com> - 7.2.8-1
+* Fri Jan 31 2020 Dave Anderson <anderson@redhat.com> - 7.2.8-2
 - Update to latest upstream release
+- Fix aarch64 build for gcc-10 -fno-common
 
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild