r4524 - in glibc-package/branches/eglibc-2.13/debian: . patches patches/any patches/hurd-i386 testsuite-checking
Author: sthibault
Date: 2011-02-16 22:53:19 +0000 (Wed, 16 Feb 2011)
New Revision: 4524
Added:
glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-glro_dl_debug_mask.diff
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-ptsname.diff
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-header-prot.diff
glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-psiginfo.diff
Modified:
glibc-package/branches/eglibc-2.13/debian/changelog
glibc-package/branches/eglibc-2.13/debian/patches/series
glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i486-gnu-libc
glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i686-gnu-i386
glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i686-gnu-i686
glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i686-gnu-xen
Log:
* Add patches/any/cvs-glro_dl_debug_mask.diff to fix build without
EGLIBC_RTLD_DEBUG support.
* Add patches/hurd-i386/submitted-header-prot.diff,
patches/hurd-i386/submitted-psiginfo.diff, and
patches/hurd-i386/local-ptsname.diff to fix hurd-i386 build.
* Update expected hurd-i386 failures with new tests.
Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-12 20:44:29 UTC (rev 4523)
+++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-16 22:53:19 UTC (rev 4524)
@@ -1,5 +1,6 @@
eglibc (2.13-0exp1) experimental; urgency=low
+ [ Aurelien Jarno ]
* New upstream release:
- Fix spurious warning in bswap_16() with -Wconversion. Closes:
#561249.
@@ -116,6 +117,14 @@
* Add patches/any/submitted-ldsodefs_rtld_debug.diff to fix
EGLIBC_RTLD_DEBUG support on non NPTL systems.
+ [ Samuel Thibault ]
+ * Add patches/any/cvs-glro_dl_debug_mask.diff to fix build without
+ EGLIBC_RTLD_DEBUG support.
+ * Add patches/hurd-i386/submitted-header-prot.diff,
+ patches/hurd-i386/submitted-psiginfo.diff, and
+ patches/hurd-i386/local-ptsname.diff to fix hurd-i386 build.
+ * Update expected hurd-i386 failures with new tests.
+
-- Aurelien Jarno <aurel32@debian.org> Tue, 08 Feb 2011 09:27:55 +0100
eglibc (2.11.2-11) unstable; urgency=low
Added: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-glro_dl_debug_mask.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-glro_dl_debug_mask.diff (rev 0)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-glro_dl_debug_mask.diff 2011-02-16 22:53:19 UTC (rev 4524)
@@ -0,0 +1,11 @@
+--- a/elf/dl-lookup.c.original 2011-02-11 11:01:37.000000000 +0000
++++ b/elf/dl-lookup.c 2011-02-11 11:02:19.000000000 +0000
+@@ -423,7 +423,7 @@ do_lookup_x (const char *undef_name, uin
+ hash table. */
+ if (__builtin_expect (tab->size, 0))
+ {
+- assert (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK);
++ assert (GLRO_dl_debug_mask & DL_DEBUG_PRELINK);
+ __rtld_lock_unlock_recursive (tab->lock);
+ goto success;
+ }
Added: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-ptsname.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-ptsname.diff (rev 0)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/local-ptsname.diff 2011-02-16 22:53:19 UTC (rev 4524)
@@ -0,0 +1,19 @@
+This is a bit lame (thus not submitted), but should work for now.
+
+---
+ ptsname.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+--- a/sysdeps/mach/hurd/ptsname.c.original 2011-02-11 12:24:59.000000000 +0000
++++ b/sysdeps/mach/hurd/ptsname.c 2011-02-11 12:26:57.000000000 +0000
+@@ -63,3 +63,11 @@ __ptsname_r (int fd, char *buf, size_t b
+ return 0;
+ }
+ weak_alias (__ptsname_r, ptsname_r)
++
++int
++__ptsname_internal (int fd, char *buf, size_t buflen, struct stat64 *stp)
++{
++ if (__fxstat64 (_STAT_VER, fd, stp) < 0)
++ return errno;
++ return __ptsname_r (fd, buf, buflen);
++}
Added: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-header-prot.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-header-prot.diff (rev 0)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-header-prot.diff 2011-02-16 22:53:19 UTC (rev 4524)
@@ -0,0 +1,43 @@
+2011-02-16 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * sysdeps/mach/i386/sysdep.h: Add _MACH_I386_SYSDEP_H inclusion
+ protection macro.
+ * sysdeps/mach/i386/thread_state.h: Add _MACH_I386_THREAD_STATE_H
+ inclusion protection macro.
+
+--- a/sysdeps/mach/i386/sysdep.h.original 2011-02-12 02:25:25.000000000 +0000
++++ b/sysdeps/mach/i386/sysdep.h 2011-02-12 02:25:54.000000000 +0000
+@@ -18,6 +18,9 @@
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
++#ifndef _MACH_I386_SYSDEP_H
++#define _MACH_I386_SYSDEP_H 1
++
+ /* Defines RTLD_PRIVATE_ERRNO and USE_DL_SYSINFO. */
+ #include <dl-sysdep.h>
+ #include <tls.h>
+@@ -78,3 +81,5 @@
+ #undef ENTRY
+ #undef ALIGN
+ #include <sysdeps/unix/i386/sysdep.h>
++
++#endif /* mach/i386/sysdep.h */
+--- a/sysdeps/mach/i386/thread_state.h.original 2011-02-12 02:26:16.000000000 +0000
++++ b/sysdeps/mach/i386/thread_state.h 2011-02-12 02:26:31.000000000 +0000
+@@ -17,6 +17,9 @@
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
++#ifndef _MACH_I386_THREAD_STATE_H
++#define _MACH_I386_THREAD_STATE_H 1
++
+ #include <mach/machine/thread_status.h>
+
+ #define MACHINE_NEW_THREAD_STATE_FLAVOR i386_THREAD_STATE
+@@ -45,3 +48,5 @@ struct machine_thread_all_state
+ };
+
+ #include <sysdeps/mach/thread_state.h>
++
++#endif /* mach/i386/thread_state.h */
Added: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-psiginfo.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-psiginfo.diff (rev 0)
+++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/submitted-psiginfo.diff 2011-02-16 22:53:19 UTC (rev 4524)
@@ -0,0 +1,33 @@
+2011-02-16 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * stdio-common/psiginfo.c (psiginfo): Check pinfo->si_signo against
+ SIGRTMIN and SIGRTMAX and print information in that case only when
+ SIGRTMIN is defined.
+
+---
+ psiginfo.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+--- eglibc-2.13/stdio-common/psiginfo.c.original 2011-02-10 18:39:10.000000000 +0000
++++ eglibc-2.13/stdio-common/psiginfo.c 2011-02-10 18:40:19.000000000 +0000
+@@ -86,8 +86,12 @@ psiginfo (const siginfo_t *pinfo, const
+ const char *desc;
+ if (pinfo->si_signo >= 0 && pinfo->si_signo < NSIG
+ && ((desc = INTUSE(_sys_siglist)[pinfo->si_signo]) != NULL
+- || (pinfo->si_signo >= SIGRTMIN && pinfo->si_signo < SIGRTMAX)))
++#ifdef SIGRTMIN
++ || (pinfo->si_signo >= SIGRTMIN && pinfo->si_signo < SIGRTMAX)
++#endif
++ ))
+ {
++#ifdef SIGRTMIN
+ if (desc == NULL)
+ {
+ if (pinfo->si_signo - SIGRTMIN < SIGRTMAX - pinfo->si_signo)
+@@ -106,6 +110,7 @@ psiginfo (const siginfo_t *pinfo, const
+ }
+ }
+ else
++#endif
+ fprintf (fp, "%s (", _(desc));
+
+ const char *base = NULL;
Modified: glibc-package/branches/eglibc-2.13/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/series 2011-02-12 20:44:29 UTC (rev 4523)
+++ glibc-package/branches/eglibc-2.13/debian/patches/series 2011-02-16 22:53:19 UTC (rev 4524)
@@ -112,6 +112,9 @@
hurd-i386/local-no-hp-timing.diff
hurd-i386/submitted-catch-signal.diff
hurd-i386/local-sendmsg-SCM_RIGHTS.diff
+hurd-i386/submitted-header-prot.diff
+hurd-i386/submitted-psiginfo.diff
+hurd-i386/local-ptsname.diff
ia64/local-dlfptr.diff
ia64/submitted-sysconf.diff
@@ -212,4 +215,5 @@
any/local-gai-rfc1918-scope-global.patch
any/local-dlfptr.diff
any/submitted-string2-strcmp.diff
+any/cvs-glro_dl_debug_mask.diff
any/submitted-ldsodefs_rtld_debug.diff
Modified: glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i486-gnu-libc
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i486-gnu-libc 2011-02-12 20:44:29 UTC (rev 4523)
+++ glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i486-gnu-libc 2011-02-16 22:53:19 UTC (rev 4524)
@@ -18,11 +18,13 @@
# Need investigation
annexc.out, Error 1 (ignored)
bug-glob2.out, Error 1
+bug-regex31-mem, Error 1
bug-ulimit1.out, Error 1
check-execstack.out, Error 1
check-local-headers.out, Error 1
check-localplt.out, Error 1
check-textrel.out, Error 1
+libnss_test1.so, Error 1
mtrace-tst-loading, Error 1
opendir-tst1.out, Error 1
test-assert-perr.out, Error 1
@@ -33,6 +35,7 @@
test-ifloat.out, Error 139
test-lfs.out, Error 1
test-memmem, Error 1
+test-strnlen, Error 1
tst-aio10.out, Error 1
tst-aio8.out, Error 1
tst-aio9.out, Error 1
@@ -45,9 +48,12 @@
tst-chk4.out, Error 1
tst-chk5.out, Error 1
tst-chk6.out, Error 1
+tst-clock_nanosleep.out, Error 1
tst-dlmopen1.out, Error 1
tst-error1-mem, Error 1
tst-fdopendir2.out, Error 1
+tst-fdopendir.out, Error 1
+tst-fnmatch-mem, Error 1
tst-fopenloc.check, Error 1
tst-futimesat.out, Error 1
tst-getconf.out, Error 3
Modified: glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i686-gnu-i386
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i686-gnu-i386 2011-02-12 20:44:29 UTC (rev 4523)
+++ glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i686-gnu-i386 2011-02-16 22:53:19 UTC (rev 4524)
@@ -18,11 +18,13 @@
# Need investigation
annexc.out, Error 1 (ignored)
bug-glob2.out, Error 1
+bug-regex31-mem, Error 1
bug-ulimit1.out, Error 1
check-execstack.out, Error 1
check-local-headers.out, Error 1
check-localplt.out, Error 1
check-textrel.out, Error 1
+libnss_test1.so, Error 1
mtrace-tst-loading, Error 1
opendir-tst1.out, Error 1
test-assert-perr.out, Error 1
@@ -33,6 +35,7 @@
test-ifloat.out, Error 139
test-lfs.out, Error 1
test-memmem, Error 1
+test-strnlen, Error 1
tst-aio10.out, Error 1
tst-aio8.out, Error 1
tst-aio9.out, Error 1
@@ -45,9 +48,12 @@
tst-chk4.out, Error 1
tst-chk5.out, Error 1
tst-chk6.out, Error 1
+tst-clock_nanosleep.out, Error 1
tst-dlmopen1.out, Error 1
tst-error1-mem, Error 1
tst-fdopendir2.out, Error 1
+tst-fdopendir.out, Error 1
+tst-fnmatch-mem, Error 1
tst-fopenloc.check, Error 1
tst-futimesat.out, Error 1
tst-getconf.out, Error 3
Modified: glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i686-gnu-i686
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i686-gnu-i686 2011-02-12 20:44:29 UTC (rev 4523)
+++ glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i686-gnu-i686 2011-02-16 22:53:19 UTC (rev 4524)
@@ -18,11 +18,13 @@
# Need investigation
annexc.out, Error 1 (ignored)
bug-glob2.out, Error 1
+bug-regex31-mem, Error 1
bug-ulimit1.out, Error 1
check-execstack.out, Error 1
check-local-headers.out, Error 1
check-localplt.out, Error 1
check-textrel.out, Error 1
+libnss_test1.so, Error 1
mtrace-tst-loading, Error 1
opendir-tst1.out, Error 1
test-assert-perr.out, Error 1
@@ -33,6 +35,7 @@
test-ifloat.out, Error 139
test-lfs.out, Error 1
test-memmem, Error 1
+test-strnlen, Error 1
tst-aio10.out, Error 1
tst-aio8.out, Error 1
tst-aio9.out, Error 1
@@ -45,9 +48,12 @@
tst-chk4.out, Error 1
tst-chk5.out, Error 1
tst-chk6.out, Error 1
+tst-clock_nanosleep.out, Error 1
tst-dlmopen1.out, Error 1
tst-error1-mem, Error 1
tst-fdopendir2.out, Error 1
+tst-fdopendir.out, Error 1
+tst-fnmatch-mem, Error 1
tst-fopenloc.check, Error 1
tst-futimesat.out, Error 1
tst-getconf.out, Error 3
Modified: glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i686-gnu-xen
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i686-gnu-xen 2011-02-12 20:44:29 UTC (rev 4523)
+++ glibc-package/branches/eglibc-2.13/debian/testsuite-checking/expected-results-i686-gnu-xen 2011-02-16 22:53:19 UTC (rev 4524)
@@ -18,11 +18,13 @@
# Need investigation
annexc.out, Error 1 (ignored)
bug-glob2.out, Error 1
+bug-regex31-mem, Error 1
bug-ulimit1.out, Error 1
check-execstack.out, Error 1
check-local-headers.out, Error 1
check-localplt.out, Error 1
check-textrel.out, Error 1
+libnss_test1.so, Error 1
mtrace-tst-loading, Error 1
opendir-tst1.out, Error 1
test-assert-perr.out, Error 1
@@ -33,6 +35,7 @@
test-ifloat.out, Error 139
test-lfs.out, Error 1
test-memmem, Error 1
+test-strnlen, Error 1
tst-aio10.out, Error 1
tst-aio8.out, Error 1
tst-aio9.out, Error 1
@@ -45,9 +48,12 @@
tst-chk4.out, Error 1
tst-chk5.out, Error 1
tst-chk6.out, Error 1
+tst-clock_nanosleep.out, Error 1
tst-dlmopen1.out, Error 1
tst-error1-mem, Error 1
tst-fdopendir2.out, Error 1
+tst-fdopendir.out, Error 1
+tst-fnmatch-mem, Error 1
tst-fopenloc.check, Error 1
tst-futimesat.out, Error 1
tst-getconf.out, Error 3
Reply to: