Peter Lemenkov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39162 )
Change subject: msrtool: Fix enum type declaration ......................................................................
msrtool: Fix enum type declaration
This patch fixes compilation and linking with GCC 10:
* https://kojipkgs.fedoraproject.org//work/tasks/3541/41983541/build.log
``` gcc -o msrtool msrtool.o msrutils.o sys.o linux.o darwin.o freebsd.o geodegx2.o geodelx.o cs5536.o k8.o via_c7.o intel_pentium3_early.o intel_pentium3.o intel_pentium4_early.o intel_pentium4_later.o intel_pentium_d.o intel_core1.o intel_core2_early.o intel_core2_later.o intel_nehalem.o intel_atom.o -Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -L/lib64 -lpci /usr/bin/ld: msrutils.o:/builddir/build/BUILD/coreboot-4.10/util/msrtool/msrtool.h:50: multiple definition of `PresentTypes'; msrtool.o:/builddir/build/BUILD/coreboot-4.10/util/msrtool/msrtool.h:50: first defined here /usr/bin/ld: msrutils.o:/builddir/build/BUILD/coreboot-4.10/util/msrtool/msrtool.h:40: multiple definition of `MsrTypes'; msrtool.o:/builddir/build/BUILD/coreboot-4.10/util/msrtool/msrtool.h:40: first defined here ```
Look at this expression:
enum { ... } name;
It declares a variable with type of anonymous enumeration. Before GCC 10 it wasn't an issue since compiler defines -fcommon. With GCC 10 this declaration is no longer permitted - see the following link for further details:
* https://gcc.gnu.org/gcc-10/porting_to.html#common * https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
Let's remove unnecessary variable declaration.
Change-Id: Ie154375ad6e3c1845f7937dac0121f3b63b6dd63 Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M util/msrtool/msrtool.h 1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/39162/1
diff --git a/util/msrtool/msrtool.h b/util/msrtool/msrtool.h index 8cba4c7..192ebf2 100644 --- a/util/msrtool/msrtool.h +++ b/util/msrtool/msrtool.h @@ -32,14 +32,14 @@
#define HEXCHARS "0123456789abcdefABCDEF"
-enum { +enum MsrTypes { MSRTYPE_RDONLY, MSRTYPE_RDWR, MSRTYPE_WRONLY, MSRTYPE_EOT -} MsrTypes; +};
-enum { +enum PresentTypes { PRESENT_RSVD, PRESENT_DEC, PRESENT_BIN, @@ -47,7 +47,7 @@ PRESENT_HEX, PRESENT_HEXDEC, PRESENT_STR, -} PresentTypes; +};
struct msr { uint32_t hi;
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39162 )
Change subject: msrtool: Fix enum type declaration ......................................................................
Patch Set 3: Code-Review+1
(1 comment)
https://review.coreboot.org/c/coreboot/+/39162/3/util/msrtool/msrtool.h File util/msrtool/msrtool.h:
https://review.coreboot.org/c/coreboot/+/39162/3/util/msrtool/msrtool.h@21 PS3, Line 21: MsrTypes Can't we get rid of the names instead? They aren't used anywhere.
Peter Lemenkov has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39162 )
Change subject: msrtool: Fix enum type declaration ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/39162/3/util/msrtool/msrtool.h File util/msrtool/msrtool.h:
https://review.coreboot.org/c/coreboot/+/39162/3/util/msrtool/msrtool.h@21 PS3, Line 21: MsrTypes
Can't we get rid of the names instead? They aren't used anywhere.
Done
Hello build bot (Jenkins), Angel Pons,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/39162
to look at the new patch set (#4).
Change subject: msrtool: Fix enum type declaration ......................................................................
msrtool: Fix enum type declaration
This patch fixes compilation and linking with GCC 10:
* https://kojipkgs.fedoraproject.org//work/tasks/3541/41983541/build.log
``` gcc -o msrtool msrtool.o msrutils.o sys.o linux.o darwin.o freebsd.o geodegx2.o geodelx.o cs5536.o k8.o via_c7.o intel_pentium3_early.o intel_pentium3.o intel_pentium4_early.o intel_pentium4_later.o intel_pentium_d.o intel_core1.o intel_core2_early.o intel_core2_later.o intel_nehalem.o intel_atom.o -Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -L/lib64 -lpci /usr/bin/ld: msrutils.o:/builddir/build/BUILD/coreboot-4.10/util/msrtool/msrtool.h:50: multiple definition of `PresentTypes'; msrtool.o:/builddir/build/BUILD/coreboot-4.10/util/msrtool/msrtool.h:50: first defined here /usr/bin/ld: msrutils.o:/builddir/build/BUILD/coreboot-4.10/util/msrtool/msrtool.h:40: multiple definition of `MsrTypes'; msrtool.o:/builddir/build/BUILD/coreboot-4.10/util/msrtool/msrtool.h:40: first defined here ```
Look at this expression:
enum { ... } name;
It declares a variable with type of anonymous enumeration. Before GCC 10 it wasn't an issue since compiler defines -fcommon. With GCC 10 this declaration is no longer permitted - see the following link for further details:
* https://gcc.gnu.org/gcc-10/porting_to.html#common * https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
Let's remove unnecessary variable declaration.
Change-Id: Ie154375ad6e3c1845f7937dac0121f3b63b6dd63 Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M util/msrtool/msrtool.h 1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/39162/4
Stefan Reinauer has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/39162?usp=email )
Change subject: msrtool: Fix enum type declaration ......................................................................
Abandoned
-
Angel Pons (Code Review) -
Peter Lemenkov (Code Review)
-
Stefan Reinauer (Code Review)