From: Harlan Stenn Date: Sat, 28 Feb 2015 09:11:24 +0000 (+0000) Subject: [Bug 2756] ntpd hangs in startup with gcc 3.3.5 on ARM X-Git-Tag: NTP_4_3_3~14^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1beffd7c9f0e241bb7e81a5657ba8898f1c6c8d7;p=thirdparty%2Fntp.git [Bug 2756] ntpd hangs in startup with gcc 3.3.5 on ARM bk: 54f1863ccZnH7QugLgIc12mvq_GjMw --- diff --git a/ChangeLog b/ChangeLog index ebf62bf03..5fe210aaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * [Bug 2747] Upgrade libevent to 2.1.5-beta. * [Bug 2749] ntp/lib/NTP/Util.pm needs update for ntpq -w, IPv6, .POOL. . * [Bug 2751] jitter.h has stale copies of l_fp macros. +* [Bug 2756] ntpd hangs in startup with gcc 3.3.5 on ARM. * [Bug 2757] Quiet compiler warnings. --- (4.2.8p1) 2015/02/04 Released by Harlan Stenn diff --git a/configure.ac b/configure.ac index d82ad2ed2..7916548ff 100644 --- a/configure.ac +++ b/configure.ac @@ -4194,7 +4194,6 @@ case "$ans" in esac AC_MSG_CHECKING([if we should enable NIST lockclock scheme]) - AC_ARG_ENABLE( [nist], [AS_HELP_STRING( @@ -4214,7 +4213,6 @@ case "$ans" in esac AC_MSG_CHECKING([if we want support for Samba's signing daemon]) - AC_ARG_ENABLE( [ntp-signd], [AS_HELP_STRING( diff --git a/include/ntp_fp.h b/include/ntp_fp.h index 1b97e8b5c..780693226 100644 --- a/include/ntp_fp.h +++ b/include/ntp_fp.h @@ -264,10 +264,13 @@ typedef u_int32 u_fp; * headers. So far the problem has only been seen with gcc, but it * may also affect Sun compilers, in which case the defined(__GNUC__) * term should be removed. + * XSCALE also generates bad code for these, at least with GCC 3.3.5. + * This is unrelated to math.h, but the same solution applies. */ #if defined(HAVE_U_INT64) && \ !(defined(__SVR4) && defined(__sun) && \ - defined(sparc) && defined(__GNUC__)) + defined(sparc) && defined(__GNUC__) || \ + defined(__arm__) && defined(__XSCALE__) && defined(__GNUC__)) #include /* ldexp() */