r1617 - in glibc-package: branches/glibc-2.4/debian branches/glibc-2.4/debian/patches branches/glibc-2.4/debian/patches/m68k trunk/debian trunk/debian/patches trunk/debian/patches/m68k
Author: aurel32
Date: 2006-06-03 18:03:28 +0000 (Sat, 03 Jun 2006)
New Revision: 1617
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/m68k/local-mathinline_h.diff
glibc-package/branches/glibc-2.4/debian/patches/series
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/m68k/local-mathinline_h.diff
glibc-package/trunk/debian/patches/series
Log:
* Update m68k/local-mathinline_h.diff (fix bits/mathinline.h), by Roger Leigh.
Enable it. (Closes: #340871)
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-06-03 17:56:15 UTC (rev 1616)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-03 18:03:28 UTC (rev 1617)
@@ -98,8 +98,7 @@
* Add kfreebsd/local-sysdeps-2.4.diff.
* Remove m32r/cvs-elf-m32r_rel32.diff (merged upstream).
* Update m68k/local-compat.diff.
- * Update m68k/local-mathinline_h.diff to reflect the new port add-on, but
- keep it disabled.
+ * Update m68k/local-mathinline_h.diff to reflect the new port add-on.
* Update m68k/local-fpic.diff.
* Update m68k/local-reloc.diff to reflect the new port add-on.
* Update m68k/submitted-gcc34-seccomment.diff.
@@ -135,6 +134,8 @@
(Closes: #370124)
* debian/debhelper.in/nscd: create /var/run/nscd if it does not already
exist. (Closes: #370122)
+ * Update m68k/local-mathinline_h.diff (fix bits/mathinline.h), by Roger Leigh.
+ Enable it. (Closes: #340871)
-- Aurelien Jarno <aurel32@debian.org> Sat, 3 Jun 2006 16:15:48 +0200
Modified: glibc-package/branches/glibc-2.4/debian/patches/m68k/local-mathinline_h.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/m68k/local-mathinline_h.diff 2006-06-03 17:56:15 UTC (rev 1616)
+++ glibc-package/branches/glibc-2.4/debian/patches/m68k/local-mathinline_h.diff 2006-06-03 18:03:28 UTC (rev 1617)
@@ -1,49 +1,43 @@
---- libc/ports/sysdeps/m68k/fpu/bits/mathinline.h 2006-03-03 15:22:14.000000000 +0100
-+++ libc/ports/sysdeps/m68k/fpu/bits/mathinline.h 2006-04-07 00:41:04.000000000 +0200
-@@ -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
+diff -urN libc.orig/ports/sysdeps/m68k/fpu/bits/mathinline.h libc/ports/sysdeps/m68k/fpu/bits/mathinline.h
+--- libc.orig/ports/sysdeps/m68k/fpu/bits/mathinline.h 2006-06-02 13:36:36.923649683 +0200
++++ libc/ports/sysdeps/m68k/fpu/bits/mathinline.h 2006-06-02 13:40:12.155695178 +0200
+@@ -20,6 +20,39 @@
- /* 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 +314,7 @@
- \
- __m81_inline float_type \
- __m81_u(__CONCAT(__fma,s))(float_type __x, float_type __y, \
-- float_type __z) \
-+ float_type __z) __THROW \
- { \
- return (__x * __y) + __z; \
- }
-@@ -331,7 +331,7 @@
- # define __inline_functions(float_type, s) \
- __m81_inline void \
- __m81_u(__CONCAT(__sincos,s))(float_type __x, float_type *__sinx, \
-- float_type *__cosx) \
-+ float_type *__cosx) __THROW \
- { \
- __asm ("fsincos%.x %2,%1:%0" \
- : "=f" (*__sinx), "=f" (*__cosx) : "f" (__x)); \
-@@ -351,14 +351,14 @@
- /* Note that there must be no whitespace before the argument passed for
- NAME, to make token pasting work correctly with -traditional. */
- # define __inline_forward_c(rettype, name, args1, args2) \
--extern __inline rettype __attribute__((__const__)) \
-- name args1 \
--{ \
-- return __CONCAT(__,name) args2; \
-+extern __inline rettype __attribute__((__const__)) \
-+name args1 __THROW \
-+{ \
-+ return __CONCAT(__,name) args2; \
- }
+ #ifdef __GNUC__
- # define __inline_forward(rettype, name, args1, args2) \
--extern __inline rettype name args1 \
-+extern __inline rettype name args1 __THROW \
- { \
- return __CONCAT(__,name) args2; \
- }
++#ifdef __GNUC__
++
++/* GCC can always grok prototypes. For C++ programs we add throw()
++ * to help it optimize the function calls. But this works only with
++ * gcc 2.8.x and egcs. For gcc 3.2 and up we even mark C functions
++ * as non-throwing using a function attribute since programs can use
++ * the -fexceptions options for C code as well. */
++# if !defined __cplusplus && __GNUC_PREREQ (3, 3)
++# define __THROW __attribute__ ((__nothrow__))
++# define __NTH(fct) __attribute__ ((__nothrow__)) fct
++# else
++# if defined __cplusplus && __GNUC_PREREQ (2,8)
++# define __THROW throw ()
++# define __NTH(fct) fct throw ()
++# else
++# define __THROW
++# define __NTH(fct) fct
++# endif
++# endif
++
++#else /* Not GCC. */
++
++# define __inline /* No inline functions. */
++
++# define __THROW
++# define __NTH(fct) fct
++
++# define __const const
++# define __signed signed
++# define __volatile volatile
++
++#endif /* GCC. */
++
+ #ifdef __USE_ISOC99
+ /* GCC 3.1 and up have builtins that actually can be used. */
+ # if !__GNUC_PREREQ (3,1)
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-06-03 17:56:15 UTC (rev 1616)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-06-03 18:03:28 UTC (rev 1617)
@@ -79,7 +79,7 @@
m68k/local-compat.diff -p0
m68k/local-dwarf2-buildfix.diff -p0
m68k/local-fpic.diff -p0
-#m68k/local-mathinline_h.diff -p1
+m68k/local-mathinline_h.diff -p1
m68k/local-reloc.diff -p1
m68k/submitted-gcc34-seccomment.diff -p0
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-06-03 17:56:15 UTC (rev 1616)
+++ glibc-package/trunk/debian/changelog 2006-06-03 18:03:28 UTC (rev 1617)
@@ -5,6 +5,8 @@
(Closes: #370124)
* debian/debhelper.in/nscd: create /var/run/nscd if it does not already
exist. (Closes: #370122)
+ * Update m68k/local-mathinline_h.diff (fix bits/mathinline.h), by Roger Leigh.
+ Enable it. (Closes: #340871)
-- Aurelien Jarno <aurel32@debian.org> Sat, 3 Jun 2006 16:15:48 +0200
Modified: glibc-package/trunk/debian/patches/m68k/local-mathinline_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/m68k/local-mathinline_h.diff 2006-06-03 17:56:15 UTC (rev 1616)
+++ glibc-package/trunk/debian/patches/m68k/local-mathinline_h.diff 2006-06-03 18:03:28 UTC (rev 1617)
@@ -1,49 +1,43 @@
---- libc/sysdeps/m68k/fpu/bits/mathinline.h 2006-03-03 15:22:14.000000000 +0100
-+++ libc/sysdeps/m68k/fpu/bits/mathinline.h 2006-04-07 00:41:04.000000000 +0200
-@@ -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
+diff -urN libc.orig/sysdeps/m68k/fpu/bits/mathinline.h libc/sysdeps/m68k/fpu/bits/mathinline.h
+--- libc.orig/sysdeps/m68k/fpu/bits/mathinline.h 2006-06-02 13:36:36.923649683 +0200
++++ libc/sysdeps/m68k/fpu/bits/mathinline.h 2006-06-02 13:40:12.155695178 +0200
+@@ -20,6 +20,39 @@
- /* 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 +314,7 @@
- \
- __m81_inline float_type \
- __m81_u(__CONCAT(__fma,s))(float_type __x, float_type __y, \
-- float_type __z) \
-+ float_type __z) __THROW \
- { \
- return (__x * __y) + __z; \
- }
-@@ -331,7 +331,7 @@
- # define __inline_functions(float_type, s) \
- __m81_inline void \
- __m81_u(__CONCAT(__sincos,s))(float_type __x, float_type *__sinx, \
-- float_type *__cosx) \
-+ float_type *__cosx) __THROW \
- { \
- __asm ("fsincos%.x %2,%1:%0" \
- : "=f" (*__sinx), "=f" (*__cosx) : "f" (__x)); \
-@@ -351,14 +351,14 @@
- /* Note that there must be no whitespace before the argument passed for
- NAME, to make token pasting work correctly with -traditional. */
- # define __inline_forward_c(rettype, name, args1, args2) \
--extern __inline rettype __attribute__((__const__)) \
-- name args1 \
--{ \
-- return __CONCAT(__,name) args2; \
-+extern __inline rettype __attribute__((__const__)) \
-+name args1 __THROW \
-+{ \
-+ return __CONCAT(__,name) args2; \
- }
+ #ifdef __GNUC__
- # define __inline_forward(rettype, name, args1, args2) \
--extern __inline rettype name args1 \
-+extern __inline rettype name args1 __THROW \
- { \
- return __CONCAT(__,name) args2; \
- }
++#ifdef __GNUC__
++
++/* GCC can always grok prototypes. For C++ programs we add throw()
++ * to help it optimize the function calls. But this works only with
++ * gcc 2.8.x and egcs. For gcc 3.2 and up we even mark C functions
++ * as non-throwing using a function attribute since programs can use
++ * the -fexceptions options for C code as well. */
++# if !defined __cplusplus && __GNUC_PREREQ (3, 3)
++# define __THROW __attribute__ ((__nothrow__))
++# define __NTH(fct) __attribute__ ((__nothrow__)) fct
++# else
++# if defined __cplusplus && __GNUC_PREREQ (2,8)
++# define __THROW throw ()
++# define __NTH(fct) fct throw ()
++# else
++# define __THROW
++# define __NTH(fct) fct
++# endif
++# endif
++
++#else /* Not GCC. */
++
++# define __inline /* No inline functions. */
++
++# define __THROW
++# define __NTH(fct) fct
++
++# define __const const
++# define __signed signed
++# define __volatile volatile
++
++#endif /* GCC. */
++
+ #ifdef __USE_ISOC99
+ /* GCC 3.1 and up have builtins that actually can be used. */
+ # if !__GNUC_PREREQ (3,1)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-06-03 17:56:15 UTC (rev 1616)
+++ glibc-package/trunk/debian/patches/series 2006-06-03 18:03:28 UTC (rev 1617)
@@ -94,7 +94,7 @@
m68k/local-compat.diff -p1
m68k/local-dwarf2-buildfix.diff -p0
m68k/local-fpic.diff -p1
-#m68k/local-mathinline_h.diff -p1
+m68k/local-mathinline_h.diff -p1
m68k/local-reloc.diff -p1
m68k/submitted-gcc34-seccomment.diff -p0
Reply to: