r6674 - in glibc-package/branches/glibc-2.21/debian: . patches/hurd-i386
Author: sthibault
Date: 2015-10-27 12:41:27 +0000 (Tue, 27 Oct 2015)
New Revision: 6674
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/submitted-handle-eprototype.diff
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/tg-pagesize.diff
Log:
* patches/hurd-i386/tg-pagesize.diff: Refresh.
* patches/hurd-i386/submitted-handle-eprototype.diff: Refresh.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-10-25 22:16:24 UTC (rev 6673)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-10-27 12:41:27 UTC (rev 6674)
@@ -26,6 +26,10 @@
* debian/rules: don't put debug files from libc0.1-i386 and libc6-mips32
into libc0.1-dbg or libc6-dbg.
+ [ Samuel Thibault ]
+ * patches/hurd-i386/tg-pagesize.diff: Refresh.
+ * patches/hurd-i386/submitted-handle-eprototype.diff: Refresh.
+
-- Aurelien Jarno <aurel32@debian.org> Mon, 19 Oct 2015 07:05:23 +0200
glibc (2.21-0experimental2) experimental; urgency=medium
Modified: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/submitted-handle-eprototype.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/submitted-handle-eprototype.diff 2015-10-25 22:16:24 UTC (rev 6673)
+++ glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/submitted-handle-eprototype.diff 2015-10-27 12:41:27 UTC (rev 6674)
@@ -83,7 +83,7 @@
+ && (errno == EINVAL || errno == EPROTOTYPE) ? -1 : 1);
#endif
}
- if (__builtin_expect (__have_o_nonblock < 0, 0))
+ if (__glibc_unlikely (__have_o_nonblock < 0))
@@ -945,7 +945,7 @@ reopen (res_state statp, int *terrno, in
if (__have_o_nonblock == 0)
__have_o_nonblock
@@ -92,7 +92,7 @@
+ && (errno == EINVAL || errno == EPROTOTYPE) ? -1 : 1);
#endif
}
- if (__builtin_expect (__have_o_nonblock < 0, 0))
+ if (__glibc_unlikely (__have_o_nonblock < 0))
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -180,7 +180,7 @@ __libc_clntudp_bufcreate (struct sockadd
Modified: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/tg-pagesize.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/tg-pagesize.diff 2015-10-25 22:16:24 UTC (rev 6673)
+++ glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/tg-pagesize.diff 2015-10-27 12:41:27 UTC (rev 6674)
@@ -23,9 +23,9 @@
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -164,7 +164,7 @@ struct rtld_global_ro _rtld_global_ro at
+ ._dl_hwcap_mask = HWCAP_IMPORTANT,
._dl_lazy = 1,
._dl_fpu_control = _FPU_DEFAULT,
- ._dl_pointer_guard = 1,
- ._dl_pagesize = EXEC_PAGESIZE,
+ ._dl_pagesize = /* EXEC_PAGESIZE */ 4096,
._dl_inhibit_cache = 0,
Reply to: