1From 6e4e407a374512b5bcb5a7c184258653e472ef9f Mon Sep 17 00:00:00 2001 2From: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3Date: Tue, 19 Jan 2021 07:47:58 +0100 4Subject: [PATCH] fix build with gcc 10 5 6Fix the following build failure with gcc 10 (which defaults to 7-fno-common): 8 9/home/buildroot/autobuild/instance-2/output-1/host/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -fno-schedule-insns2 -fno-schedule-insns -fno-inline-small-functions -fno-caller-saves -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DBUILD_MAIN -Wimplicit-function-declaration -Dx64_BIT -o i7z i7z.o helper_functions.o i7z_Single_Socket.o i7z_Dual_Socket.o -lncurses -lpthread -lrt -lm 10/home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-gnu/10.2.0/../../../../x86_64-buildroot-linux-gnu/bin/ld: i7z_Dual_Socket.o:(.bss+0x0): multiple definition of `global_ts'; i7z_Single_Socket.o:(.bss+0x0): first defined here 11 12Fixes: 13 - http://autobuild.buildroot.org/results/1a433611ba8676cf1ca276fccaf3633971bd562e 14 15Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 16[Upstream status: https://github.com/ajaiantilal/i7z/pull/27] 17--- 18 i7z.c | 1 + 19 i7z_Dual_Socket.c | 2 +- 20 i7z_Single_Socket.c | 2 +- 21 3 files changed, 3 insertions(+), 2 deletions(-) 22 23diff --git a/i7z.c b/i7z.c 24index 61e2757..910a608 100644 25--- a/i7z.c 26+++ b/i7z.c 27@@ -34,6 +34,7 @@ int Dual_Socket(); 28 29 int socket_0_num=0, socket_1_num=1; 30 bool use_ncurses = true; 31+struct timespec global_ts; 32 33 /////////////////////LOGGING TO FILE//////////////////////////////////////// 34 FILE *fp_log_file_freq; 35diff --git a/i7z_Dual_Socket.c b/i7z_Dual_Socket.c 36index 1388339..ceafdce 100644 37--- a/i7z_Dual_Socket.c 38+++ b/i7z_Dual_Socket.c 39@@ -37,7 +37,7 @@ float Read_Voltage_CPU(int cpu_num); 40 extern struct program_options prog_options; 41 FILE *fp_log_file; 42 43-struct timespec global_ts; 44+extern struct timespec global_ts; 45 extern FILE *fp_log_file_freq_1, *fp_log_file_freq_2; 46 47 extern char* CPU_FREQUENCY_LOGGING_FILE_single; 48diff --git a/i7z_Single_Socket.c b/i7z_Single_Socket.c 49index 16e98c1..b7266e6 100644 50--- a/i7z_Single_Socket.c 51+++ b/i7z_Single_Socket.c 52@@ -35,7 +35,7 @@ int Read_Thermal_Status_CPU(int cpu_num); 53 extern struct program_options prog_options; 54 extern FILE *fp_log_file_freq; 55 56-struct timespec global_ts; 57+extern struct timespec global_ts; 58 59 extern char* CPU_FREQUENCY_LOGGING_FILE_single; 60 extern char* CPU_FREQUENCY_LOGGING_FILE_dual; 61-- 622.29.2 63 64