From: Konstantin Ananyev Date: Mon, 3 Oct 2016 17:27:25 +0000 (+0100) Subject: eal: fix C++ link of delay function pointer X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=fd4015e98e3a436a96eb9939661dde9eb4f3e34c;p=dpdk.git eal: fix C++ link of delay function pointer When compiling with C++, it treats void (*rte_delay_us)(unsigned int us); as definition of the global variable. So further linking with librte_eal fails. Fixes: b4d63fb62240 ("eal: customize delay function") Steps to reproduce: $ cat rttm1.cpp using namespace std; int main(int argc, char *argv[]) { int ret = rte_eal_init(argc, argv); rte_delay_us(1); cout << "return code "; cout << ret; return ret; } $ g++ -m64 -I/${RTE_SDK}/${RTE_TARGET}/include -c -o rttm1.o rttm1.cpp $ gcc -m64 -pthread -o rttm1 rttm1.o -ldl -Wl,-lstdc++ \ -L/${RTE_SDK}/${RTE_TARGET}/lib -Wl,-lrte_eal .../librte_eal.a(eal_common_timer.o): (.bss+0x0): multiple definition of `rte_delay_us' rttm1.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status $ nm rttm1.o | grep rte_delay_us 0000000000000092 t _GLOBAL__sub_I_rte_delay_us 0000000000000000 B rte_delay_us Signed-off-by: Konstantin Ananyev --- diff --git a/lib/librte_eal/common/include/generic/rte_cycles.h b/lib/librte_eal/common/include/generic/rte_cycles.h index 96a2da99b3..00103ca9f6 100644 --- a/lib/librte_eal/common/include/generic/rte_cycles.h +++ b/lib/librte_eal/common/include/generic/rte_cycles.h @@ -188,7 +188,7 @@ rte_get_timer_hz(void) * @param us * The number of microseconds to wait. */ -void +extern void (*rte_delay_us)(unsigned int us); /**