1*4882a593SmuzhiyunFrom b2fd0f324002d0cf52ae905b2a469bf1067f182a Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Sat, 5 Sep 2020 14:30:20 +0200 4*4882a593SmuzhiyunSubject: [PATCH] src/nettest_omni.c: fix compilation with GCC10 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunGCC10 defaults to -fno-common, which breaks compilation when there are 7*4882a593Smuzhiyunmultiple definitions of implicit "extern" variables. Remove the extra 8*4882a593Smuzhiyundefinitions. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunFix #42 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSigned-off-by: Tony Ambardar <itugrok@yahoo.com> 13*4882a593Smuzhiyun[Retrieved from: 14*4882a593Smuzhiyunhttps://github.com/openwrt/packages/blob/master/net/netperf/patches/010-gcc10_multiple_definition_fix.patch] 15*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 16*4882a593Smuzhiyun[Upstream status: https://github.com/HewlettPackard/netperf/pull/48] 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun src/nettest_omni.c | 8 -------- 19*4882a593Smuzhiyun 1 file changed, 8 deletions(-) 20*4882a593Smuzhiyun 21*4882a593Smuzhiyundiff --git a/src/nettest_omni.c b/src/nettest_omni.c 22*4882a593Smuzhiyunindex 852eeb1..862088a 100644 23*4882a593Smuzhiyun--- a/src/nettest_omni.c 24*4882a593Smuzhiyun+++ b/src/nettest_omni.c 25*4882a593Smuzhiyun@@ -458,14 +458,6 @@ static int client_port_max = 65535; 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun /* different options for the sockets */ 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun-int 30*4882a593Smuzhiyun- loc_nodelay, /* don't/do use NODELAY locally */ 31*4882a593Smuzhiyun- rem_nodelay, /* don't/do use NODELAY remotely */ 32*4882a593Smuzhiyun- loc_sndavoid, /* avoid send copies locally */ 33*4882a593Smuzhiyun- loc_rcvavoid, /* avoid recv copies locally */ 34*4882a593Smuzhiyun- rem_sndavoid, /* avoid send copies remotely */ 35*4882a593Smuzhiyun- rem_rcvavoid; /* avoid recv_copies remotely */ 36*4882a593Smuzhiyun- 37*4882a593Smuzhiyun extern int 38*4882a593Smuzhiyun loc_tcpcork, 39*4882a593Smuzhiyun rem_tcpcork, 40*4882a593Smuzhiyun-- 41*4882a593Smuzhiyun2.28.0 42*4882a593Smuzhiyun 43