From: Glenn Washburn <development@efficientek.com>
To: grub-devel@gnu.org
Cc: Daniel Kiper <dkiper@net-space.pl>,
Glenn Washburn <development@efficientek.com>
Subject: [PATCH] arm-coreboot: Declare global struct ps2_state as static so symbols don't cause link failure
Date: Thu, 3 Dec 2020 00:10:26 -0600 [thread overview]
Message-ID: <20201203061026.3976080-1-development@efficientek.com> (raw)
This appears to be a new issue surfaced by switching from gcc 9.3.0 to
10.1.0 cross compiling toolchain. When linking these two object files
together, there is an error generated: "multiple definition of `ps2_state'".
This only appears to be an issue when --target=arm-linux-gnueabi and
--with-platform=coreboot. There's no need for these structs to have global
as opposed to file scope, so declaring them as static fixes this issue.
Signed-off-by: Glenn Washburn <development@efficientek.com>
---
grub-core/term/arm/cros.c | 2 +-
grub-core/term/arm/pl050.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/term/arm/cros.c b/grub-core/term/arm/cros.c
index 1ff9f8ccf..a17e49c32 100644
--- a/grub-core/term/arm/cros.c
+++ b/grub-core/term/arm/cros.c
@@ -30,7 +30,7 @@
#include <grub/fdtbus.h>
#include <grub/arm/cros_ec.h>
-struct grub_ps2_state ps2_state;
+static struct grub_ps2_state ps2_state;
struct grub_cros_ec_keyscan old_scan;
diff --git a/grub-core/term/arm/pl050.c b/grub-core/term/arm/pl050.c
index e4cda3056..b082243b0 100644
--- a/grub-core/term/arm/pl050.c
+++ b/grub-core/term/arm/pl050.c
@@ -29,7 +29,7 @@
static volatile grub_uint32_t *pl050_regs;
-struct grub_ps2_state ps2_state;
+static struct grub_ps2_state ps2_state;
static void
keyboard_controller_wait_until_ready (void)
--
2.27.0
next reply other threads:[~2020-12-03 6:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 6:10 Glenn Washburn [this message]
2020-12-03 6:15 ` [PATCH] arm-coreboot: Declare global struct ps2_state as static so symbols don't cause link failure Glenn Washburn
2020-12-03 13:47 ` Glenn Washburn
2020-12-04 12:30 ` Daniel Kiper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201203061026.3976080-1-development@efficientek.com \
--to=development@efficientek.com \
--cc=dkiper@net-space.pl \
--cc=grub-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.