Author: madcoder Date: 2007-02-08 01:02:54 +0100 (Thu, 08 Feb 2007) New Revision: 1955
Modified: glibc-package/branches/glibc-2.5/debian/changelog glibc-package/branches/glibc-2.5/debian/patches/m68k/local-mathinline_h.diff Log: Better patch for #340871 * Rework patch for #340871 (patches/m68k/local-mathinline_h.diff to use __NTH rather than __THROW) in function implementations. Modified: glibc-package/branches/glibc-2.5/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-07 21:37:51 UTC (rev 1954) +++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-08 00:02:54 UTC (rev 1955) @@ -127,6 +127,8 @@ * Adding myself to Uploaders. * Rework patches/any/local-ldd.diff so that we don't use file(1) anymore (it wasn't used anyway). Closes: #165417. + * Rework patch for #340871 (patches/m68k/local-mathinline_h.diff to use + __NTH rather than __THROW) in function implementations. -- Aurelien Jarno <[EMAIL PROTECTED]> Wed, 7 Feb 2007 13:56:40 +0100 Modified: glibc-package/branches/glibc-2.5/debian/patches/m68k/local-mathinline_h.diff =================================================================== --- glibc-package/branches/glibc-2.5/debian/patches/m68k/local-mathinline_h.diff 2007-02-07 21:37:51 UTC (rev 1954) +++ glibc-package/branches/glibc-2.5/debian/patches/m68k/local-mathinline_h.diff 2007-02-08 00:02:54 UTC (rev 1955) @@ -1,68 +1,51 @@ ---- glibc-2.3.6.original/ports/sysdeps/m68k/fpu/bits/mathinline.h 2004-10-09 23:18:03.000000000 +0200 -+++ glibc-2.3.6/ports/sysdeps/m68k/fpu/bits/mathinline.h 2006-07-09 00:31:17.000000000 +0200 -@@ -18,6 +18,22 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+/* To work around a bug in the __THROW macro in <sys/cdefs.h> */ -+#ifdef __THROW -+# undef __THROW -+#endif -+ -+#ifndef __THROW -+# ifndef __GNUC_PREREQ -+# define __GNUC_PREREQ(maj, min) (0) -+# endif -+# if defined __cplusplus && __GNUC_PREREQ (2,8) -+# define __THROW throw () -+# else -+# define __THROW -+# endif -+#endif -+ - #ifdef __GNUC__ - - #ifdef __USE_ISOC99 -@@ -100,7 +116,7 @@ +Index: glibc-2.5/ports/sysdeps/m68k/fpu/bits/mathinline.h +=================================================================== +--- glibc-2.5.orig/ports/sysdeps/m68k/fpu/bits/mathinline.h ++++ glibc-2.5/ports/sysdeps/m68k/fpu/bits/mathinline.h +@@ -100,7 +100,7 @@ /* Define a const math function. */ #define __m81_defun(rettype, func, args) \ __m81_inline rettype __attribute__((__const__)) \ - __m81_u(func) args -+ __m81_u(func) args __THROW ++ __NTH(__m81_u(func) args) /* Define the three variants of a math function that has a direct implementation in the m68k fpu. FUNC is the name for C (which will be -@@ -314,7 +330,7 @@ +@@ -313,8 +313,8 @@ + } \ \ __m81_inline float_type \ - __m81_u(__CONCAT(__fma,s))(float_type __x, float_type __y, \ +-__m81_u(__CONCAT(__fma,s))(float_type __x, float_type __y, \ - float_type __z) \ -+ float_type __z) __THROW \ ++__NTH(__m81_u(__CONCAT(__fma,s))(float_type __x, float_type __y, \ ++ float_type __z)) \ { \ return (__x * __y) + __z; \ } -@@ -331,7 +347,7 @@ +@@ -330,8 +330,8 @@ + # define __inline_functions(float_type, s) \ __m81_inline void \ - __m81_u(__CONCAT(__sincos,s))(float_type __x, float_type *__sinx, \ +-__m81_u(__CONCAT(__sincos,s))(float_type __x, float_type *__sinx, \ - float_type *__cosx) \ -+ float_type *__cosx) __THROW \ ++__NTH(__m81_u(__CONCAT(__sincos,s))(float_type __x, float_type *__sinx, \ ++ float_type *__cosx)) \ { \ __asm ("fsincos%.x %2,%1:%0" \ : "=f" (*__sinx), "=f" (*__cosx) : "f" (__x)); \ -@@ -352,13 +368,13 @@ +@@ -352,13 +352,13 @@ NAME, to make token pasting work correctly with -traditional. */ # define __inline_forward_c(rettype, name, args1, args2) \ extern __inline rettype __attribute__((__const__)) \ - name args1 \ -+ name args1 __THROW \ ++ __NTH(name args1) \ { \ return __CONCAT(__,name) args2; \ } # define __inline_forward(rettype, name, args1, args2) \ -extern __inline rettype name args1 \ -+extern __inline rettype name args1 __THROW \ ++extern __inline rettype __NTH(name args1) \ { \ return __CONCAT(__,name) args2; \ } -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]