From d8e510fa7f3452e1f4f9bb93dda06a7bf56d2eae Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 26 Feb 2012 15:52:19 +0100 Subject: [PATCH] m68k: remove __kernel_{sin,cos,tan} implementations --- ChangeLog.m68k | 12 +++++++++++ sysdeps/m68k/m680x0/fpu/k_cos.c | 42 ------------------------------------- sysdeps/m68k/m680x0/fpu/k_cosf.c | 3 --- sysdeps/m68k/m680x0/fpu/k_cosl.c | 4 +--- sysdeps/m68k/m680x0/fpu/k_sin.c | 45 ---------------------------------------- sysdeps/m68k/m680x0/fpu/k_sinf.c | 3 --- sysdeps/m68k/m680x0/fpu/k_sinl.c | 4 +--- sysdeps/m68k/m680x0/fpu/k_tan.c | 44 --------------------------------------- sysdeps/m68k/m680x0/fpu/k_tanf.c | 4 +--- sysdeps/m68k/m680x0/fpu/k_tanl.c | 4 +--- 10 files changed, 16 insertions(+), 149 deletions(-) delete mode 100644 sysdeps/m68k/m680x0/fpu/k_cos.c delete mode 100644 sysdeps/m68k/m680x0/fpu/k_cosf.c delete mode 100644 sysdeps/m68k/m680x0/fpu/k_sin.c delete mode 100644 sysdeps/m68k/m680x0/fpu/k_sinf.c delete mode 100644 sysdeps/m68k/m680x0/fpu/k_tan.c diff --git a/ChangeLog.m68k b/ChangeLog.m68k index 02d1355..7104bd9 100644 --- a/ChangeLog.m68k +++ b/ChangeLog.m68k @@ -1,3 +1,15 @@ +2012-02-26 Andreas Schwab + + * sysdeps/m68k/m680x0/fpu/k_sinl.c: Replace by empty file. + * sysdeps/m68k/m680x0/fpu/k_cosl.c: Likewise. + * sysdeps/m68k/m680x0/fpu/k_tanf.c: Likewise. + * sysdeps/m68k/m680x0/fpu/k_tanl.c: Likewise. + * sysdeps/m68k/m680x0/fpu/k_sin.c: Remove. + * sysdeps/m68k/m680x0/fpu/k_sinf.c: Remove. + * sysdeps/m68k/m680x0/fpu/k_cos.c: Remove. + * sysdeps/m68k/m680x0/fpu/k_cosf.c: Remove. + * sysdeps/m68k/m680x0/fpu/k_tan.c: Remove. + 2012-02-25 Andreas Schwab * sysdeps/m68k/m680x0/fpu/s_ccosh.c: Avoid raising invalid diff --git a/sysdeps/m68k/m680x0/fpu/k_cos.c b/sysdeps/m68k/m680x0/fpu/k_cos.c deleted file mode 100644 index dd6c215..0000000 --- a/sysdeps/m68k/m680x0/fpu/k_cos.c +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - 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 -#include "math_private.h" - -#ifndef FUNC -#define FUNC cos -#endif -#ifndef float_type -#define float_type double -#endif - -#define __CONCATX(a,b) __CONCAT(a,b) - -float_type -__CONCATX(__kernel_,FUNC) (x, y) - float_type x; - float_type y; -{ - float_type sin_x, cos_x, sin_y, cos_y; - __asm__ __volatile__ ("fsincosx %2,%0:%1" : "=f" (cos_x), "=f" (sin_x) - : "f" (x)); - __asm__ __volatile__ ("fsincosx %2,%0:%1" : "=f" (cos_y), "=f" (sin_y) - : "f" (y)); - return cos_x * cos_y - sin_x * sin_y; -} diff --git a/sysdeps/m68k/m680x0/fpu/k_cosf.c b/sysdeps/m68k/m680x0/fpu/k_cosf.c deleted file mode 100644 index 2a366d0..0000000 --- a/sysdeps/m68k/m680x0/fpu/k_cosf.c +++ /dev/null @@ -1,3 +0,0 @@ -#define FUNC cosf -#define float_type float -#include diff --git a/sysdeps/m68k/m680x0/fpu/k_cosl.c b/sysdeps/m68k/m680x0/fpu/k_cosl.c index 983b665..1cc8931 100644 --- a/sysdeps/m68k/m680x0/fpu/k_cosl.c +++ b/sysdeps/m68k/m680x0/fpu/k_cosl.c @@ -1,3 +1 @@ -#define FUNC cosl -#define float_type long double -#include +/* Not needed. */ diff --git a/sysdeps/m68k/m680x0/fpu/k_sin.c b/sysdeps/m68k/m680x0/fpu/k_sin.c deleted file mode 100644 index 652ca0e..0000000 --- a/sysdeps/m68k/m680x0/fpu/k_sin.c +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - 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 -#include "math_private.h" - -#ifndef FUNC -#define FUNC sin -#endif -#ifndef float_type -#define float_type double -#endif - -#define __CONCATX(a,b) __CONCAT(a,b) - -float_type -__CONCATX(__kernel_,FUNC) (x, y, iy) - float_type x; - float_type y; - int iy; -{ - float_type sin_x, cos_x, sin_y, cos_y; - if (iy == 0) - return __m81_u(__CONCATX(__,FUNC)) (x); - __asm__ __volatile__ ("fsincosx %2,%0:%1" : "=f" (cos_x), "=f" (sin_x) - : "f" (x)); - __asm__ __volatile__ ("fsincosx %2,%0:%1" : "=f" (cos_y), "=f" (sin_y) - : "f" (y)); - return sin_x * cos_y + cos_x * sin_y; -} diff --git a/sysdeps/m68k/m680x0/fpu/k_sinf.c b/sysdeps/m68k/m680x0/fpu/k_sinf.c deleted file mode 100644 index 7050347..0000000 --- a/sysdeps/m68k/m680x0/fpu/k_sinf.c +++ /dev/null @@ -1,3 +0,0 @@ -#define FUNC sinf -#define float_type float -#include diff --git a/sysdeps/m68k/m680x0/fpu/k_sinl.c b/sysdeps/m68k/m680x0/fpu/k_sinl.c index 5a647ca..1cc8931 100644 --- a/sysdeps/m68k/m680x0/fpu/k_sinl.c +++ b/sysdeps/m68k/m680x0/fpu/k_sinl.c @@ -1,3 +1 @@ -#define FUNC sinl -#define float_type long double -#include +/* Not needed. */ diff --git a/sysdeps/m68k/m680x0/fpu/k_tan.c b/sysdeps/m68k/m680x0/fpu/k_tan.c deleted file mode 100644 index 28f6a80..0000000 --- a/sysdeps/m68k/m680x0/fpu/k_tan.c +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - 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 -#include "math_private.h" - -#ifndef FUNC -#define FUNC tan -#endif -#ifndef float_type -#define float_type double -#endif - -#define __CONCATX(a,b) __CONCAT(a,b) - -float_type -__CONCATX(__kernel_,FUNC) (x, y, iy) - float_type x; - float_type y; - int iy; -{ - float_type tan_x, tan_y; - tan_x = __m81_u(__CONCATX(__,FUNC)) (x); - tan_y = __m81_u(__CONCATX(__,FUNC)) (y); - if (iy > 0) - return (tan_x + tan_y) / (1 - tan_x * tan_y); - else - return (tan_x * tan_y - 1) / (tan_x + tan_y); -} diff --git a/sysdeps/m68k/m680x0/fpu/k_tanf.c b/sysdeps/m68k/m680x0/fpu/k_tanf.c index 777af1b..1cc8931 100644 --- a/sysdeps/m68k/m680x0/fpu/k_tanf.c +++ b/sysdeps/m68k/m680x0/fpu/k_tanf.c @@ -1,3 +1 @@ -#define FUNC tanf -#define float_type float -#include +/* Not needed. */ diff --git a/sysdeps/m68k/m680x0/fpu/k_tanl.c b/sysdeps/m68k/m680x0/fpu/k_tanl.c index f2570e6..1cc8931 100644 --- a/sysdeps/m68k/m680x0/fpu/k_tanl.c +++ b/sysdeps/m68k/m680x0/fpu/k_tanl.c @@ -1,3 +1 @@ -#define FUNC tanl -#define float_type long double -#include +/* Not needed. */ -- 2.7.4