SOURCES: glibc-ppc-inline-fsqrt.patch (NEW) - try real fix

sparky sparky at pld-linux.org
Sat Nov 4 01:26:19 CET 2006


Author: sparky                       Date: Sat Nov  4 00:26:19 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- try real fix

---- Files affected:
SOURCES:
   glibc-ppc-inline-fsqrt.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/glibc-ppc-inline-fsqrt.patch
diff -u /dev/null SOURCES/glibc-ppc-inline-fsqrt.patch:1.1
--- /dev/null	Sat Nov  4 01:26:19 2006
+++ SOURCES/glibc-ppc-inline-fsqrt.patch	Sat Nov  4 01:26:14 2006
@@ -0,0 +1,157 @@
+2006-11-03  Steven Munroe  <sjmunroe at us.ibm.com>
+
+	* sysdeps/powerpc/fpu/bits/mathinline.h
+	[__LIBC_INTERNAL_MATH_INLINES]: Moved to math_private.h.
+	* sysdeps/powerpc/fpu/math_private.h: New file.
+
+diff -urN libc25-cvstip-20061018/sysdeps/powerpc/fpu/bits/mathinline.h libc24/sysdeps/powerpc/fpu/bits/mathinline.h
+--- libc25-cvstip-20061018/sysdeps/powerpc/fpu/bits/mathinline.h	2006-04-14 00:43:58.000000000 -0500
++++ libc24/sysdeps/powerpc/fpu/bits/mathinline.h	2006-11-03 17:45:55.517445184 -0600
+@@ -124,59 +124,6 @@
+ 
+ /* This code is used internally in the GNU libc.  */
+ #ifdef __LIBC_INTERNAL_MATH_INLINES
+-
+-#include <sysdep.h>
+-#include <ldsodefs.h>
+-#include <dl-procinfo.h>
+-
+-# if __WORDSIZE == 64 || defined _ARCH_PWR4
+-#  define __CPU_HAS_FSQRT 1
+-# else
+-#  define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0)
+-# endif
+-
+-extern double __slow_ieee754_sqrt (double);
+-__MATH_INLINE double
+-__NTH (__ieee754_sqrt (double __x))
+-{
+-  double __z;
+-
+-  /* If the CPU is 64-bit we can use the optional FP instructions.  */
+-  if (__CPU_HAS_FSQRT)
+-  {
+-    /* Volatile is required to prevent the compiler from moving the
+-       fsqrt instruction above the branch.  */
+-     __asm __volatile (
+-	"	fsqrt	%0,%1\n"
+-		: "=f" (__z)
+-		: "f" (__x));
+-  }
+-  else
+-     __z = __slow_ieee754_sqrt(__x);
+-
+-  return __z;
+-}
+-
+-extern float __slow_ieee754_sqrtf (float);
+-__MATH_INLINE float
+-__NTH (__ieee754_sqrtf (float __x))
+-{
+-  float __z;
+-
+-  /* If the CPU is 64-bit we can use the optional FP instructions.  */
+-  if (__CPU_HAS_FSQRT)
+-  {
+-    /* Volatile is required to prevent the compiler from moving the
+-       fsqrts instruction above the branch.  */
+-     __asm __volatile (
+-	"	fsqrts	%0,%1\n"
+-		: "=f" (__z)
+-		: "f" (__x));
+-  }
+-  else
+-     __z = __slow_ieee754_sqrtf(__x);
+-
+-  return __z;
+-}
++/* Moved to math_private.h  */
+ #endif /* __LIBC_INTERNAL_MATH_INLINES */
+ #endif /* __GNUC__ && !_SOFT_FLOAT */
+diff -urN libc25-cvstip-20061018/sysdeps/powerpc/fpu/math_private.h libc24/sysdeps/powerpc/fpu/math_private.h
+--- libc25-cvstip-20061018/sysdeps/powerpc/fpu/math_private.h	Wed Dec 31 18:00:00 1969
++++ libc24/sysdeps/powerpc/fpu/math_private.h	Fri Nov 03 17:54:05 2006
+@@ -0,0 +1,83 @@
++/* Private inline math functions for powerpc.
++   Copyright (C) 2006
++   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., 51 Franklin St - Fifth Floor, Boston, 
++   MA 02110-1301 USA  */
++
++#ifndef _PPC_MATH_PRIVATE_H_
++#define _PPC_MATH_PRIVATE_H_
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++#include <dl-procinfo.h>
++
++# if __WORDSIZE == 64 || defined _ARCH_PWR4
++#  define __CPU_HAS_FSQRT 1
++# else
++#  define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0)
++# endif
++
++# ifndef __LIBC_INTERNAL_MATH_INLINES
++extern double __slow_ieee754_sqrt (double);
++__inline double
++__ieee754_sqrt (double __x)
++{
++  double __z;
++
++  /* If the CPU is 64-bit we can use the optional FP instructions.  */
++  if (__CPU_HAS_FSQRT)
++  {
++    /* Volatile is required to prevent the compiler from moving the
++       fsqrt instruction above the branch.  */
++     __asm __volatile (
++	"	fsqrt	%0,%1\n"
++		: "=f" (__z)
++		: "f" (__x));
++  }
++  else
++     __z = __slow_ieee754_sqrt(__x);
++
++  return __z;
++}
++
++extern float __slow_ieee754_sqrtf (float);
++
++__inline float
++__ieee754_sqrtf (float __x)
++{
++  float __z;
++
++  /* If the CPU is 64-bit we can use the optional FP instructions.  */
++  if (__CPU_HAS_FSQRT)
++  {
++    /* Volatile is required to prevent the compiler from moving the
++       fsqrts instruction above the branch.  */
++     __asm __volatile (
++	"	fsqrts	%0,%1\n"
++		: "=f" (__z)
++		: "f" (__x));
++  }
++  else
++     __z = __slow_ieee754_sqrtf(__x);
++
++  return __z;
++}
++#endif /* __LIBC_INTERNAL_MATH_INLINES */
++
++# include_next <math_private.h>
++
++#endif /* _PPC_MATH_PRIVATE_H_ */
================================================================


More information about the pld-cvs-commit mailing list