[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-379-g67c5c36
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-379-g67c5c36
|
From: jscheer <js...@us...> - 2010-06-01 07:57:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 67c5c361c581e0ae352d31316a17dd5ba72dc079 (commit)
via c0245c0855abdcbc5bc748329702c7fc107d97de (commit)
from 220dec84252f25afea76c3117cde5ca598be4d61 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 67c5c361c581e0ae352d31316a17dd5ba72dc079
Merge: c0245c0855abdcbc5bc748329702c7fc107d97de 220dec84252f25afea76c3117cde5ca598be4d61
Author: Jeremie SCHEER <jer...@ar...>
Date: Tue Jun 1 09:53:05 2010 +0200
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit c0245c0855abdcbc5bc748329702c7fc107d97de
Author: Jeremie SCHEER <jer...@ar...>
Date: Tue Jun 1 09:51:02 2010 +0200
Patch for uClibc : add the function trunc to avoid problems during Qt cross-compiling.
-----------------------------------------------------------------------
Summary of changes:
.../uClibc-0.9.29-z-002-add_trunc_function.patch | 99 ++++++++++++++++++++
1 files changed, 99 insertions(+), 0 deletions(-)
create mode 100644 buildroot/toolchain/uClibc/uClibc-0.9.29-z-002-add_trunc_function.patch
diff --git a/buildroot/toolchain/uClibc/uClibc-0.9.29-z-002-add_trunc_function.patch b/buildroot/toolchain/uClibc/uClibc-0.9.29-z-002-add_trunc_function.patch
new file mode 100644
index 0000000..145bad1
--- /dev/null
+++ b/buildroot/toolchain/uClibc/uClibc-0.9.29-z-002-add_trunc_function.patch
@@ -0,0 +1,99 @@
+>From 54d204073484a66315c6143cfbc9e67c3579fa7a Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <va...@ge...>
+Date: Sat, 08 Dec 2007 00:59:10 +0000
+Subject: import trunc()/truncf() for ISO C requirements, otherwise fortran can hit infinite loops when it generates builtins+trunc() substitutes
+
+---
+diff --git a/libm/Makefile.in b/libm/Makefile.in
+index 10869a8..eb905e0 100644
+--- a/libm/Makefile.in
++++ b/libm/Makefile.in
+@@ -68,8 +68,8 @@ libm_CSRC := \
+ s_ilogb.c s_ldexp.c s_lib_version.c s_lrint.c s_lround.c s_llround.c \
+ s_log1p.c s_logb.c s_matherr.c s_modf.c s_nextafter.c s_round.c \
+ s_rint.c s_scalbn.c s_signgam.c s_significand.c s_sin.c s_tan.c \
+- s_tanh.c w_acos.c w_acosh.c w_asin.c w_atan2.c w_atanh.c w_cabs.c \
+- w_cosh.c w_drem.c w_exp.c w_fmod.c w_gamma.c w_gamma_r.c \
++ s_tanh.c s_trunc.c w_acos.c w_acosh.c w_asin.c w_atan2.c w_atanh.c \
++ w_cabs.c w_cosh.c w_drem.c w_exp.c w_fmod.c w_gamma.c w_gamma_r.c \
+ w_hypot.c w_j0.c w_j1.c w_jn.c w_lgamma.c w_lgamma_r.c \
+ w_log.c w_log10.c w_pow.c w_remainder.c w_scalb.c w_sinh.c \
+ w_sqrt.c fpmacros.c nan.c carg.c s_llrint.c
+diff --git a/libm/float_wrappers.c b/libm/float_wrappers.c
+index cd841e6..cd0ae18 100644
+--- a/libm/float_wrappers.c
++++ b/libm/float_wrappers.c
+@@ -26,7 +26,6 @@
+ #undef L_remquof /*float remquof(float, float, int *);*/
+ #undef L_scalblnf /*float scalblnf(float, long);*/
+ #undef L_tgammaf /*float tgammaf(float);*/
+-#undef L_truncf /*float truncf(float);*/
+
+ /* Implement the following, as defined by SuSv3 */
+ #if 0
+diff --git a/libm/s_trunc.c b/libm/s_trunc.c
+new file mode 100644
+index 0000000..8a4f5ae
+--- a/dev/null
++++ b/libm/s_trunc.c
+@@ -0,0 +1,58 @@
++/* Truncate argument to nearest integral value not larger than the argument.
++ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++ Contributed by Ulrich Drepper <dr...@cy...>, 1997.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++
++#include "math_private.h"
++
++
++libm_hidden_proto(trunc)
++double
++trunc (double x)
++{
++ int32_t i0, j0;
++ u_int32_t i1;
++ int sx;
++
++ EXTRACT_WORDS (i0, i1, x);
++ sx = i0 & 0x80000000;
++ j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
++ if (j0 < 20)
++ {
++ if (j0 < 0)
++ /* The magnitude of the number is < 1 so the result is +-0. */
++ INSERT_WORDS (x, sx, 0);
++ else
++ INSERT_WORDS (x, sx | (i0 & ~(0x000fffff >> j0)), 0);
++ }
++ else if (j0 > 51)
++ {
++ if (j0 == 0x400)
++ /* x is inf or NaN. */
++ return x + x;
++ }
++ else
++ {
++ INSERT_WORDS (x, i0, i1 & ~(0xffffffffu >> (j0 - 20)));
++ }
++
++ return x;
++}
++libm_hidden_def(trunc)
+--
+cgit v0.8.2.1
hooks/post-receive
--
armadeus
|
