Author: aurel32 Date: 2007-12-08 11:29:41 +0000 (Sat, 08 Dec 2007) New Revision: 2735
Added: glibc-package/trunk/debian/patches/any/cvs-sched_h.diff Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/any/submitted-sched_h.diff glibc-package/trunk/debian/patches/series Log: * Moved merged parts of patches/any/submitted-sched_h.diff into patches/any/cvs-sched_h.diff. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2007-12-07 07:09:31 UTC (rev 2734) +++ glibc-package/trunk/debian/changelog 2007-12-08 11:29:41 UTC (rev 2735) @@ -1,3 +1,11 @@ +glibc (2.7-5) unstable; urgency=low + + [ Aurelien Jarno ] + * Moved merged parts of patches/any/submitted-sched_h.diff into + patches/any/cvs-sched_h.diff. + + -- Aurelien Jarno <[EMAIL PROTECTED]> Sat, 08 Dec 2007 12:29:28 +0100 + glibc (2.7-4) unstable; urgency=low [ Aurelien Jarno ] Added: glibc-package/trunk/debian/patches/any/cvs-sched_h.diff =================================================================== --- glibc-package/trunk/debian/patches/any/cvs-sched_h.diff (rev 0) +++ glibc-package/trunk/debian/patches/any/cvs-sched_h.diff 2007-12-08 11:29:41 UTC (rev 2735) @@ -0,0 +1,89 @@ +2007-12-06 Aurelien Jarno <[EMAIL PROTECTED]> + + [BZ #5452] + * sysdeps/unix/sysv/linux/bits/sched.h: Use __extension__ + keyword for gcc's braced-groups. + +Index: sysdeps/unix/sysv/linux/bits/sched.h +=================================================================== +RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/bits/sched.h,v +retrieving revision 1.28 +retrieving revision 1.29 +diff -u -d -p -r1.28 -r1.29 +--- sysdeps/unix/sysv/linux/bits/sched.h 29 Jul 2007 22:42:51 -0000 1.28 ++++ sysdeps/unix/sysv/linux/bits/sched.h 7 Dec 2007 16:36:43 -0000 1.29 +@@ -132,17 +132,21 @@ typedef struct + } while (0) + # endif + # define __CPU_SET_S(cpu, setsize, cpusetp) \ +- ({ size_t __cpu = (cpu); \ +- __cpu < 8 * (setsize) \ +- ? ((cpusetp)->__bits[__CPUELT (__cpu)] |= __CPUMASK (__cpu)) : 0; }) ++ (__extension__ \ ++ ({ size_t __cpu = (cpu); \ ++ __cpu < 8 * (setsize) \ ++ ? ((cpusetp)->__bits[__CPUELT (__cpu)] |= __CPUMASK (__cpu)) : 0; })) + # define __CPU_CLR_S(cpu, setsize, cpusetp) \ +- ({ size_t __cpu = (cpu); \ +- __cpu < 8 * (setsize) \ +- ? ((cpusetp)->__bits[__CPUELT (__cpu)] &= ~__CPUMASK (__cpu)) : 0; }) ++ (__extension__ \ ++ ({ size_t __cpu = (cpu); \ ++ __cpu < 8 * (setsize) \ ++ ? ((cpusetp)->__bits[__CPUELT (__cpu)] &= ~__CPUMASK (__cpu)) : 0; })) + # define __CPU_ISSET_S(cpu, setsize, cpusetp) \ +- ({ size_t __cpu = (cpu); \ +- __cpu < 8 * (setsize) \ +- ? (((cpusetp)->__bits[__CPUELT (__cpu)] & __CPUMASK (__cpu))) != 0 : 0; }) ++ (__extension__ \ ++ ({ size_t __cpu = (cpu); \ ++ __cpu < 8 * (setsize) \ ++ ? (((cpusetp)->__bits[__CPUELT (__cpu)] & __CPUMASK (__cpu))) != 0 \ ++ : 0; })) + + # define __CPU_COUNT_S(setsize, cpusetp) \ + __sched_cpucount (setsize, cpusetp) +@@ -152,25 +156,27 @@ typedef struct + (__builtin_memcmp (cpusetp1, cpusetp2, setsize) == 0) + # else + # define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \ +- ({ cpu_set_t *__arr1 = (cpusetp1); \ +- cpu_set_t *__arr2 = (cpusetp2); \ +- size_t __imax = (setsize) / sizeof (__cpu_mask); \ +- size_t __i; \ +- for (__i = 0; __i < __imax; ++__i) \ +- if (__arr1->__bits[__i] != __arr2->__bits[__i]) \ +- break; \ +- __i == __imax; }) ++ (__extension__ \ ++ ({ cpu_set_t *__arr1 = (cpusetp1); \ ++ cpu_set_t *__arr2 = (cpusetp2); \ ++ size_t __imax = (setsize) / sizeof (__cpu_mask); \ ++ size_t __i; \ ++ for (__i = 0; __i < __imax; ++__i) \ ++ if (__arr1->__bits[__i] != __arr2->__bits[__i]) \ ++ break; \ ++ __i == __imax; })) + # endif + + # define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \ +- ({ cpu_set_t *__dest = (destset); \ +- cpu_set_t *__arr1 = (srcset1); \ +- cpu_set_t *__arr2 = (srcset2); \ +- size_t __imax = (setsize) / sizeof (__cpu_mask); \ +- size_t __i; \ +- for (__i = 0; __i < __imax; ++__i) \ +- __dest->__bits[__i] = __arr1->__bits[__i] op __arr2->__bits[__i]; \ +- __dest; }) ++ (__extension__ \ ++ ({ cpu_set_t *__dest = (destset); \ ++ cpu_set_t *__arr1 = (srcset1); \ ++ cpu_set_t *__arr2 = (srcset2); \ ++ size_t __imax = (setsize) / sizeof (__cpu_mask); \ ++ size_t __i; \ ++ for (__i = 0; __i < __imax; ++__i) \ ++ __dest->__bits[__i] = __arr1->__bits[__i] op __arr2->__bits[__i]; \ ++ __dest; })) + + # define __CPU_ALLOC_SIZE(count) \ + ((((count) + __NCPUBITS - 1) / __NCPUBITS) * 8) Modified: glibc-package/trunk/debian/patches/any/submitted-sched_h.diff =================================================================== --- glibc-package/trunk/debian/patches/any/submitted-sched_h.diff 2007-12-07 07:09:31 UTC (rev 2734) +++ glibc-package/trunk/debian/patches/any/submitted-sched_h.diff 2007-12-08 11:29:41 UTC (rev 2735) @@ -1,8 +1,3 @@ -2007-12-06 Aurelien Jarno <[EMAIL PROTECTED]> - - * sysdeps/unix/sysv/linux/bits/sched.h: Use __extension__ - keyword for gcc's braced-groups. - 2007-11-02 Aurelien Jarno <[EMAIL PROTECTED]> * bits/sched.h (__CPU_ALLOC_SIZE): Define. @@ -19,44 +14,3 @@ __BEGIN_DECLS extern int __sched_cpucount (size_t __setsize, const cpu_set_t *__setp) -Index: sysdeps/unix/sysv/linux/bits/sched.h -=================================================================== -RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/bits/sched.h,v -retrieving revision 1.28 -diff -u -d -p -r1.28 sched.h ---- sysdeps/unix/sysv/linux/bits/sched.h 29 Jul 2007 22:42:51 -0000 1.28 -+++ sysdeps/unix/sysv/linux/bits/sched.h 6 Dec 2007 22:05:05 -0000 -@@ -132,14 +132,17 @@ typedef struct - } while (0) - # endif - # define __CPU_SET_S(cpu, setsize, cpusetp) \ -+ __extension__ \ - ({ size_t __cpu = (cpu); \ - __cpu < 8 * (setsize) \ - ? ((cpusetp)->__bits[__CPUELT (__cpu)] |= __CPUMASK (__cpu)) : 0; }) - # define __CPU_CLR_S(cpu, setsize, cpusetp) \ -+ __extension__ \ - ({ size_t __cpu = (cpu); \ - __cpu < 8 * (setsize) \ - ? ((cpusetp)->__bits[__CPUELT (__cpu)] &= ~__CPUMASK (__cpu)) : 0; }) - # define __CPU_ISSET_S(cpu, setsize, cpusetp) \ -+ __extension__ \ - ({ size_t __cpu = (cpu); \ - __cpu < 8 * (setsize) \ - ? (((cpusetp)->__bits[__CPUELT (__cpu)] & __CPUMASK (__cpu))) != 0 : 0; }) -@@ -152,6 +155,7 @@ typedef struct - (__builtin_memcmp (cpusetp1, cpusetp2, setsize) == 0) - # else - # define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \ -+ __extension__ \ - ({ cpu_set_t *__arr1 = (cpusetp1); \ - cpu_set_t *__arr2 = (cpusetp2); \ - size_t __imax = (setsize) / sizeof (__cpu_mask); \ -@@ -163,6 +167,7 @@ typedef struct - # endif - - # define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \ -+ __extension__ \ - ({ cpu_set_t *__dest = (destset); \ - cpu_set_t *__arr1 = (srcset1); \ - cpu_set_t *__arr2 = (srcset2); \ Modified: glibc-package/trunk/debian/patches/series =================================================================== --- glibc-package/trunk/debian/patches/series 2007-12-07 07:09:31 UTC (rev 2734) +++ glibc-package/trunk/debian/patches/series 2007-12-08 11:29:41 UTC (rev 2735) @@ -117,6 +117,7 @@ all/local-remove-manual.diff all/local-ru_RU.diff +any/cvs-sched_h.diff -p0 any/cvs-tzfile.diff -p1 any/local-notls.diff -p0 any/local-asserth-decls.diff -p0 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]