1*4882a593SmuzhiyunFrom 8458abb357cd981f55d730ec2d74459a3042e571 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Tue, 6 Oct 2020 21:52:20 +0200 4*4882a593SmuzhiyunSubject: [PATCH] fix build with gcc 10 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunDefine variables in header files as extern to avoid the following build failure 7*4882a593Smuzhiyunwith gcc 10 (which defaults to -fno-common): 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-ld: 10*4882a593Smuzhiyun/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/mmc.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67: 11*4882a593Smuzhiyunmultiple definition of `sdio_func_type'; 12*4882a593Smuzhiyun/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/core.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67: 13*4882a593Smuzhiyunfirst defined here 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunFixes: 16*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/b6070c0721b33824e71833ce53423979980aa598 17*4882a593Smuzhiyun 18*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 19*4882a593Smuzhiyun[Upstream status: https://github.com/xvisor/xvisor/pull/125] 20*4882a593Smuzhiyun--- 21*4882a593Smuzhiyun drivers/mmc/core/core.h | 2 +- 22*4882a593Smuzhiyun emulators/display/drawfn.h | 10 +++++----- 23*4882a593Smuzhiyun 2 files changed, 6 insertions(+), 6 deletions(-) 24*4882a593Smuzhiyun 25*4882a593Smuzhiyundiff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h 26*4882a593Smuzhiyunindex d75d135a..e2ca3141 100644 27*4882a593Smuzhiyun--- a/drivers/mmc/core/core.h 28*4882a593Smuzhiyun+++ b/drivers/mmc/core/core.h 29*4882a593Smuzhiyun@@ -64,7 +64,7 @@ int mmc_go_idle(struct mmc_host *host); 30*4882a593Smuzhiyun * Note: Must be called with host->lock held. 31*4882a593Smuzhiyun */ 32*4882a593Smuzhiyun extern struct vmm_bus sdio_bus_type; 33*4882a593Smuzhiyun-struct vmm_device_type sdio_func_type; 34*4882a593Smuzhiyun+extern struct vmm_device_type sdio_func_type; 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun int __sdio_attach(struct mmc_host *host); 37*4882a593Smuzhiyun 38*4882a593Smuzhiyundiff --git a/emulators/display/drawfn.h b/emulators/display/drawfn.h 39*4882a593Smuzhiyunindex f9163cff..385deaf6 100644 40*4882a593Smuzhiyun--- a/emulators/display/drawfn.h 41*4882a593Smuzhiyun+++ b/emulators/display/drawfn.h 42*4882a593Smuzhiyun@@ -69,14 +69,14 @@ typedef void (*drawfn)(struct vmm_surface *, 43*4882a593Smuzhiyun DRAWFN_ORDER_MAX * \ 44*4882a593Smuzhiyun DRAWFN_FORMAT_MAX) 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun-drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE]; 47*4882a593Smuzhiyun+extern drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE]; 48*4882a593Smuzhiyun 49*4882a593Smuzhiyun-drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE]; 50*4882a593Smuzhiyun+extern drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE]; 51*4882a593Smuzhiyun 52*4882a593Smuzhiyun-drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE]; 53*4882a593Smuzhiyun+extern drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE]; 54*4882a593Smuzhiyun 55*4882a593Smuzhiyun-drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE]; 56*4882a593Smuzhiyun+extern drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE]; 57*4882a593Smuzhiyun 58*4882a593Smuzhiyun-drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE]; 59*4882a593Smuzhiyun+extern drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE]; 60*4882a593Smuzhiyun 61*4882a593Smuzhiyun #endif 62*4882a593Smuzhiyun-- 63*4882a593Smuzhiyun2.28.0 64*4882a593Smuzhiyun 65