<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9758">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix embedded (arm-none-eabi) builds<br><br>Due to OS#3360, build testing for arm-none-eabi was unfortunately<br>skipped for a long time. This is a number of fixes that make the<br>compile test pass again.<br><br>Related: OS#3360<br>Change-Id: I88e3c8e1a8786ca2a6a023b0d27c74be200a8588<br>---<br>M configure.ac<br>M src/logging.c<br>M src/pseudotalloc/pseudotalloc.c<br>M src/pseudotalloc/talloc.h<br>M src/timer_clockgettime.c<br>5 files changed, 28 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index cb580a3..dd5f15b 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -91,6 +91,8 @@</span><br><span> CFLAGS="$saved_CFLAGS"</span><br><span> AC_SUBST(SYMBOL_VISIBILITY)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+AC_CHECK_FUNCS(clock_gettime localtime_r)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> AC_DEFUN([CHECK_TM_INCLUDES_TM_GMTOFF], [</span><br><span> AC_CACHE_CHECK(</span><br><span> [whether struct tm has tm_gmtoff member],</span><br><span>diff --git a/src/logging.c b/src/logging.c</span><br><span>index 147b1fb..1dfd484 100644</span><br><span>--- a/src/logging.c</span><br><span>+++ b/src/logging.c</span><br><span>@@ -356,6 +356,7 @@</span><br><span> }</span><br><span> if (!cont) {</span><br><span> if (target->print_ext_timestamp) {</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef HAVE_LOCALTIME_R</span><br><span> struct tm tm;</span><br><span> struct timeval tv;</span><br><span> osmo_gettimeofday(&tv, NULL);</span><br><span>@@ -367,6 +368,7 @@</span><br><span> if (ret < 0)</span><br><span> goto err;</span><br><span> OSMO_SNPRINTF_RET(ret, rem, offset, len);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> } else if (target->print_timestamp) {</span><br><span> char *timestr;</span><br><span> time_t tm;</span><br><span>diff --git a/src/pseudotalloc/pseudotalloc.c b/src/pseudotalloc/pseudotalloc.c</span><br><span>index 2a99066..89e6269 100644</span><br><span>--- a/src/pseudotalloc/pseudotalloc.c</span><br><span>+++ b/src/pseudotalloc/pseudotalloc.c</span><br><span>@@ -96,3 +96,19 @@</span><br><span> va_end(args);</span><br><span> return buf;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void *talloc_steal(const void *new_ctx, const void *obj)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* as we don't do hierarchical allocations, this is simply a NOP */</span><br><span style="color: hsl(120, 100%, 40%);">+ return (void *)obj;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+char *talloc_vasprintf(const void *t, const char *fmt, va_list ap)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* we have a hard-coded maximum string length of 128 bytes in this pseudo implementation */</span><br><span style="color: hsl(120, 100%, 40%);">+ char *buf = pseudotalloc_malloc(128);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!buf)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ vsnprintf(buf, 128, fmt, ap);</span><br><span style="color: hsl(120, 100%, 40%);">+ return buf;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/pseudotalloc/talloc.h b/src/pseudotalloc/talloc.h</span><br><span>index ae2e1fc..34088af 100644</span><br><span>--- a/src/pseudotalloc/talloc.h</span><br><span>+++ b/src/pseudotalloc/talloc.h</span><br><span>@@ -59,3 +59,6 @@</span><br><span> unsigned count,</span><br><span> const char *name);</span><br><span> char *talloc_asprintf(const void *ctx, const char *fmt, ...);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void *talloc_steal(const void *new_ctx, const void *obj);</span><br><span style="color: hsl(120, 100%, 40%);">+char *talloc_vasprintf(const void *t, const char *fmt, va_list ap);</span><br><span>diff --git a/src/timer_clockgettime.c b/src/timer_clockgettime.c</span><br><span>index 8d9760c..7b17fd1 100644</span><br><span>--- a/src/timer_clockgettime.c</span><br><span>+++ b/src/timer_clockgettime.c</span><br><span>@@ -44,6 +44,9 @@</span><br><span> /*! \file timer_clockgettime.c</span><br><span> */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include "config.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef HAVE_CLOCK_GETTIME</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <stdlib.h></span><br><span> #include <stdbool.h></span><br><span> #include <sys/time.h></span><br><span>@@ -135,4 +138,6 @@</span><br><span> timespecadd(&c->time, &val, &c->time);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* HAVE_CLOCK_GETTIME */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! @} */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9758">change 9758</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9758"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I88e3c8e1a8786ca2a6a023b0d27c74be200a8588 </div>
<div style="display:none"> Gerrit-Change-Number: 9758 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>