package/makedumpfile: fix build on sparc64
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Thu, 4 Feb 2021 19:31:11 +0000 (20:31 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Fri, 5 Feb 2021 18:38:20 +0000 (19:38 +0100)
Fix the following build failure on sparc64:

/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc64-buildroot-linux-gnu/9.3.0/../../../../sparc64-buildroot-linux-gnu/bin/ld: /tmp/ccylTux8.o: in function `find_kaslr_offsets':
/home/giuliobenetti/autobuild/run/instance-0/output-1/build/makedumpfile-1.6.8/makedumpfile.c:4017: undefined reference to `get_kaslr_offset'

Even if this build failure is only raised with version 1.6.8,
get_kaslr_offset was also undeclared on sparc64 in version 1.6.7

Fixes:
 - http://autobuild.buildroot.org/results/1421f54f7599bba62c0a4bd5c65ce21c8cc7ee1a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch [new file with mode: 0644]

diff --git a/package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch b/package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch
new file mode 100644 (file)
index 0000000..defc101
--- /dev/null
@@ -0,0 +1,35 @@
+From 2c132ac5e6656723821acdb0ee57b34c42851fed Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 4 Feb 2021 20:15:56 +0100
+Subject: [PATCH] makedumpfile.h: fix build on sparc64
+
+Fix the following build failure on sparc64:
+
+/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc64-buildroot-linux-gnu/9.3.0/../../../../sparc64-buildroot-linux-gnu/bin/ld: /tmp/ccylTux8.o: in function `find_kaslr_offsets':
+/home/giuliobenetti/autobuild/run/instance-0/output-1/build/makedumpfile-1.6.8/makedumpfile.c:4017: undefined reference to `get_kaslr_offset'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/1421f54f7599bba62c0a4bd5c65ce21c8cc7ee1a
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status:
+http://lists.infradead.org/pipermail/kexec/2021-February/021996.html]
+---
+ makedumpfile.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/makedumpfile.h b/makedumpfile.h
+index 97a5554..dfc1a77 100644
+--- a/makedumpfile.h
++++ b/makedumpfile.h
+@@ -1139,6 +1139,7 @@ unsigned long long vaddr_to_paddr_sparc64(unsigned long vaddr);
+ #define get_machdep_info()      TRUE
+ #define get_phys_base()         get_phys_base_sparc64()
+ #define get_versiondep_info()   get_versiondep_info_sparc64()
++#define get_kaslr_offset(X)     stub_false()
+ #define vaddr_to_paddr(X)       vaddr_to_paddr_sparc64(X)
+ #define paddr_to_vaddr(X)     paddr_to_vaddr_general(X)
+ #define is_phys_addr(X)               stub_true_ul(X)
+-- 
+2.29.2
+