1From 27222be0b8db59cae30a5fcca93255daea147bb6 Mon Sep 17 00:00:00 2001 2From: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3Date: Wed, 23 Sep 2020 19:05:23 +0200 4Subject: [PATCH] plc/plc.h: fix build with gcc 10 5 6Drop plcproperty from plc/plc.h to avoid the following build failure 7with gcc 10 (which defaults to -fno-common): 8 9/home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: rules.o:(.bss+0x0): multiple definition of `plcproperty'; pibruin.o:(.bss+0x0): first defined here 10 11Fixes: 12 - http://autobuild.buildroot.org/results/6b3064b64dea3d4aaf219f787429c25918101483 13 14Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 15[Upstream status: https://github.com/qca/open-plc-utils/pull/141] 16--- 17 plc/plc.h | 4 +--- 18 1 file changed, 1 insertion(+), 3 deletions(-) 19 20diff --git a/plc/plc.h b/plc/plc.h 21index 1fa32b53..208cf91a 100644 22--- a/plc/plc.h 23+++ b/plc/plc.h 24@@ -496,9 +496,7 @@ struct __packed plcproperty 25 uint8_t DATA_FORMAT; 26 uint32_t DATA_LENGTH; 27 uint8_t DATA_BUFFER [128]; 28-} 29- 30-plcproperty; 31+}; 32 33 #ifndef __GNUC__ 34 #pragma pack (pop) 35-- 362.28.0 37 38