cpupower: avoid multiple definition with gcc -fno-common
authorMike Gilbert <floppym@gentoo.org>
Wed, 26 Feb 2020 19:33:59 +0000 (14:33 -0500)
committerShuah Khan <skhan@linuxfoundation.org>
Mon, 2 Mar 2020 15:53:34 +0000 (08:53 -0700)
commit2de7fb60a4740135e03cf55c1982e393ccb87b6b
tree522553c9f12a334acf423acbeb8610efd51bc6b7
parentbb6d3fb354c5ee8d6bde2d576eb7220ea09862b9
cpupower: avoid multiple definition with gcc -fno-common

Building cpupower with -fno-common in CFLAGS results in errors due to
multiple definitions of the 'cpu_count' and 'start_time' variables.

./utils/idle_monitor/snb_idle.o:./utils/idle_monitor/cpupower-monitor.h:28:
multiple definition of `cpu_count';
./utils/idle_monitor/nhm_idle.o:./utils/idle_monitor/cpupower-monitor.h:28:
first defined here
...
./utils/idle_monitor/cpuidle_sysfs.o:./utils/idle_monitor/cpuidle_sysfs.c:22:
multiple definition of `start_time';
./utils/idle_monitor/amd_fam14h_idle.o:./utils/idle_monitor/amd_fam14h_idle.c:85:
first defined here

The -fno-common option will be enabled by default in GCC 10.

Bug: https://bugs.gentoo.org/707462
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h