Merge pull request #14112 from paul-szczepanek-arm/fix-arm-compile

0xc0170 · web-flow · commit 7ad4304c8e72 · 2021-01-05T09:45:27.000Z
ARM linking issue: compile out trace when not available
diff --git a/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/tcp.c b/connectivity/nanostack/sal-stack-nanostack/source/Common_Protocols/tcp.c
@@ -1223,7 +1223,9 @@ buffer_t *tcp_up(buffer_t *buf)
         seg_len++;
     }
 
+#if defined(FEA_TRACE_SUPPORT) && MBED_CONF_MBED_TRACE_ENABLE && (MBED_TRACE_MAX_LEVEL >= TRACE_LEVEL_DEBUG)
     tr_debug("TCP_UP: dst_p=%d, src_p=%d, flags=%s", buf->dst_sa.port, buf->src_sa.port, trace_tcp_flags(flags));
+#endif
     /* clear flags that will be ignored */
     flags &= ~(TCP_FLAG_CWR | TCP_FLAG_ECE | TCP_FLAG_URG);
 

Original file line number	Diff line number	Diff line change
`@@ -1223,7 +1223,9 @@ buffer_t tcp_up(buffer_t buf)`
`1223`	`1223`	`seg_len++;`
`1224`	`1224`	`}`
`1225`	`1225`
	`1226`	`+#if defined(FEA_TRACE_SUPPORT) && MBED_CONF_MBED_TRACE_ENABLE && (MBED_TRACE_MAX_LEVEL >= TRACE_LEVEL_DEBUG)`
`1226`	`1227`	`tr_debug("TCP_UP: dst_p=%d, src_p=%d, flags=%s", buf->dst_sa.port, buf->src_sa.port, trace_tcp_flags(flags));`
	`1228`	`+#endif`
`1227`	`1229`	`/* clear flags that will be ignored */`
`1228`	`1230`	`flags &= ~(TCP_FLAG_CWR \| TCP_FLAG_ECE \| TCP_FLAG_URG);`
`1229`	`1231`