diff --git a/coreboot-utils.changes b/coreboot-utils.changes index a131034..e3c2b85 100644 --- a/coreboot-utils.changes +++ b/coreboot-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 18 13:06:52 UTC 2021 - Michal Suchanek + +- Fix build with GCC 10 + * msrtool-fix-build-with-gcc-10.patch + ------------------------------------------------------------------- Sat Sep 21 20:44:50 UTC 2019 - Martin Hauke diff --git a/coreboot-utils.spec b/coreboot-utils.spec index a916d87..4131684 100644 --- a/coreboot-utils.spec +++ b/coreboot-utils.spec @@ -1,7 +1,7 @@ # # spec file for package coreboot-utils # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,7 @@ Source3: %{name}.keyring Patch1: no-pie.patch Patch2: k8resdump.diff Patch3: do-explicit-fallthrough.patch +Patch4: msrtool-fix-build-with-gcc-10.patch BuildRequires: gcc-c++ BuildRequires: pciutils-devel BuildRequires: xz @@ -49,6 +50,7 @@ used to develop and configure systems with coreboot. %if 0%{?suse_version} > 1320 %patch3 -p1 %endif +%patch4 -p1 %build make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/ectool diff --git a/msrtool-fix-build-with-gcc-10.patch b/msrtool-fix-build-with-gcc-10.patch new file mode 100644 index 0000000..a124bc0 --- /dev/null +++ b/msrtool-fix-build-with-gcc-10.patch @@ -0,0 +1,40 @@ +From d26558924250f571709cd4fe44dd1c0874c57347 Mon Sep 17 00:00:00 2001 +From: Michal Suchanek +Date: Mon, 18 Jan 2021 15:58:35 +0100 +Subject: [PATCH] msrtool: fix build with gcc 10. + +[ 84s] /usr/lib/gcc/i586-suse-linux/10/../../../../i586-suse-linux/bin/ld: msrutils.o:(.bss+0x0): multiple definition of `PresentTypes'; msrtool.o:(.bss+0x14): first defined here +[ 84s] /usr/lib/gcc/i586-suse-linux/10/../../../../i586-suse-linux/bin/ld: msrutils.o:(.bss+0x4): multiple definition of `MsrTypes'; msrtool.o:(.bss+0x18): first defined here + +There should be typedefs, not variable definitions. + +Change-Id: I663a011e9f1fc169126570d5eac7abe82d204a90 +Signed-off-by: Michal Suchanek +--- + util/msrtool/msrtool.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/util/msrtool/msrtool.h b/util/msrtool/msrtool.h +index f5e6738c5c37..e4a44f45c1f6 100644 +--- a/util/msrtool/msrtool.h ++++ b/util/msrtool/msrtool.h +@@ -18,14 +18,14 @@ + + #define HEXCHARS "0123456789abcdefABCDEF" + +-enum { ++typedef enum { + MSRTYPE_RDONLY, + MSRTYPE_RDWR, + MSRTYPE_WRONLY, + MSRTYPE_EOT + } MsrTypes; + +-enum { ++typedef enum { + PRESENT_RSVD, + PRESENT_DEC, + PRESENT_BIN, +-- +2.26.2 +