487c7ba95d
Build is broken with gcc 10 since bump to version 2.0.22 in commit
cadb8f2f31:
/tmp/instance-1/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/10.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: kexec/arch/ppc/kexec-elf-ppc.o:(.sbss+0x0): multiple definition of `ramdisk'; kexec/arch/ppc/kexec-ppc.o:(.sbss+0x0): first defined here
Fixes:
- http://autobuild.buildroot.org/results/22932529f925630ec6db3c6a4eaebbda68b3fc16
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 5e7ce27626a44428c01e0e5ab3fe60ef98ca788c Mon Sep 17 00:00:00 2001
|
|
From: Petr Tesarik <ptesarik@suse.cz>
|
|
Date: Mon, 26 Apr 2021 15:29:51 +0200
|
|
Subject: kexec-tools: Remove duplicate definition of ramdisk
|
|
|
|
The ramdisk variable is defined in kexec/arch/ppc/kexec-ppc.c. This
|
|
other definition is not needed and breaks build with -fno-common.
|
|
|
|
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
|
|
Signed-off-by: Simon Horman <horms@verge.net.au>
|
|
[Retrieved from:
|
|
https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=5e7ce27626a44428c01e0e5ab3fe60ef98ca788c]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
kexec/arch/ppc/kexec-elf-ppc.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/kexec/arch/ppc/kexec-elf-ppc.c b/kexec/arch/ppc/kexec-elf-ppc.c
|
|
index ad43ad1..4a4886e 100644
|
|
--- a/kexec/arch/ppc/kexec-elf-ppc.c
|
|
+++ b/kexec/arch/ppc/kexec-elf-ppc.c
|
|
@@ -33,7 +33,6 @@
|
|
static const int probe_debug = 0;
|
|
|
|
unsigned char reuse_initrd;
|
|
-const char *ramdisk;
|
|
int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *,
|
|
char *);
|
|
|
|
--
|
|
cgit 1.2.3-1.el7
|
|
|