r3482 - in glibc-package/branches/eglibc-2.10/debian: . patches/any
Author: aurel32
Date: 2009-05-10 09:37:25 +0000 (Sun, 10 May 2009)
New Revision: 3482
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/patches/any/local-dynamic-resolvconf.diff
glibc-package/branches/eglibc-2.10/debian/patches/any/local-libgcc-compat-main.diff
glibc-package/branches/eglibc-2.10/debian/patches/any/local-libgcc-compat-ports.diff
glibc-package/branches/eglibc-2.10/debian/patches/any/local-no-pagesize.diff
glibc-package/branches/eglibc-2.10/debian/patches/any/submitted-futex_robust_pi.diff
Log:
- Update debian/patches/any/submitted-futex_robust_pi.diff.
- Update debian/patches/any/local-dynamic-resolvconf.diff.
- Update debian/patches/any/local-libgcc-compat-main.diff.
- Update debian/patches/any/local-libgcc-compat-ports.diff.
- Update debian/patches/any/local-no-pagesize.diff.
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-05-10 09:07:53 UTC (rev 3481)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-05-10 09:37:25 UTC (rev 3482)
@@ -37,6 +37,11 @@
- Remove debian/patches/any/cvs-bz697-posix-regexec.diff (merged).
- Remove debian/patches/any/submitted-broken-dns.diff (merged).
- Remove debian/patches/any/submitted-mount_h.diff (merged).
+ - Update debian/patches/any/submitted-futex_robust_pi.diff.
+ - Update debian/patches/any/local-dynamic-resolvconf.diff.
+ - Update debian/patches/any/local-libgcc-compat-main.diff.
+ - Update debian/patches/any/local-libgcc-compat-ports.diff.
+ - Update debian/patches/any/local-no-pagesize.diff.
- Remove localedata/mt_MT_euro.diff (merged).
- Remove localedata/submitted-bz9731-el_CY_euro.diff (merged).
- Remove localedata/sk_SK_euro.diff (merged).
Modified: glibc-package/branches/eglibc-2.10/debian/patches/any/local-dynamic-resolvconf.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/any/local-dynamic-resolvconf.diff 2009-05-10 09:07:53 UTC (rev 3481)
+++ glibc-package/branches/eglibc-2.10/debian/patches/any/local-dynamic-resolvconf.diff 2009-05-10 09:37:25 UTC (rev 3482)
@@ -21,23 +21,20 @@
/* The following bit is copied from res_data.c (where it is #ifdef'ed
out) since res_init() should go into libc.so but the rest of that
-@@ -94,8 +94,17 @@
+@@ -94,8 +94,15 @@ res_init(void) {
int
__res_maybe_init (res_state resp, int preinit)
{
-- if (resp->options & RES_INIT) {
-- if (__res_initstamp != resp->_u._ext.initstamp) {
-+ static time_t last_mtime;
-+ struct stat statbuf;
-+ int ret;
++ static time_t last_mtime;
++ struct stat statbuf;
++ int ret;
+
-+
-+ if (resp->options & RES_INIT) {
-+ ret = stat (_PATH_RESCONF, &statbuf);
-+ if (__res_initstamp != resp->_u._ext.initstamp
-+ || (ret == 0) && (last_mtime != statbuf.st_mtime))
-+ {
-+ last_mtime = statbuf.st_mtime;
- if (resp->nscount > 0) {
+ if (resp->options & RES_INIT) {
+- if (__res_initstamp != resp->_u._ext.initstamp) {
++ ret = stat (_PATH_RESCONF, &statbuf);
++ if ((__res_initstamp != resp->_u._ext.initstamp)
++ || (ret == 0) && (last_mtime != statbuf.st_mtime)) {
++ last_mtime = statbuf.st_mtime;
+ if (resp->nscount > 0)
__res_iclose (resp, true);
- return __res_vinit (resp, 1);
+ return __res_vinit (resp, 1);
Modified: glibc-package/branches/eglibc-2.10/debian/patches/any/local-libgcc-compat-main.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/any/local-libgcc-compat-main.diff 2009-05-10 09:07:53 UTC (rev 3481)
+++ glibc-package/branches/eglibc-2.10/debian/patches/any/local-libgcc-compat-main.diff 2009-05-10 09:37:25 UTC (rev 3482)
@@ -280,69 +280,6 @@
+ __floatdidf; __floatdisf;
}
}
---- /dev/null
-+++ b/sysdeps/alpha/libgcc-compat.c
-@@ -0,0 +1,35 @@
-+/* pre-.hidden libgcc compatibility
-+ Copyright (C) 2002 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+ Contributed by Guido Guenther <agx@sigxcpu.org>
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#include <stdint.h>
-+#include <shlib-compat.h>
-+
-+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_2_6)
-+
-+typedef int int128_t __attribute__((__mode__(TI)));
-+
-+extern int128_t __multi3 (int128_t, int128_t);
-+int128_t INTUSE (__multi3) (int128_t x, int128_t y)
-+{
-+ return __multi3 (x, y);
-+}
-+symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.0);
-+
-+#endif
---- a/sysdeps/alpha/Versions
-+++ b/sysdeps/alpha/Versions
-@@ -3,6 +3,8 @@
- # functions with special/multiple interfaces
- __divqu; __remqu; __divqs; __remqs; __divlu; __remlu; __divls;
- __remls; __divl; __reml; __divq; __remq; __divqu; __remqu;
-+ # libgcc-compat
-+ __multi3;
- }
- }
- libm {
---- a/sysdeps/alpha/Makefile
-+++ b/sysdeps/alpha/Makefile
-@@ -46,3 +46,11 @@
- # libc.so requires about 16k for the small data area, which is well
- # below the 64k maximum.
- pic-ccflag = -fpic
-+
-+ifeq ($(subdir),csu)
-+ifeq (yes,$(build-shared))
-+# Compatibility
-+sysdep_routines += libgcc-compat
-+shared-only-routines += libgcc-compat
-+endif
-+endif
--- a/sysdeps/ia64/Makefile
+++ b/sysdeps/ia64/Makefile
@@ -12,8 +12,8 @@
Modified: glibc-package/branches/eglibc-2.10/debian/patches/any/local-libgcc-compat-ports.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/any/local-libgcc-compat-ports.diff 2009-05-10 09:07:53 UTC (rev 3481)
+++ glibc-package/branches/eglibc-2.10/debian/patches/any/local-libgcc-compat-ports.diff 2009-05-10 09:37:25 UTC (rev 3482)
@@ -374,3 +374,66 @@
+shared-only-routines += libgcc-compat
+endif
+endif
+--- /dev/null
++++ b/ports/sysdeps/alpha/libgcc-compat.c
+@@ -0,0 +1,35 @@
++/* pre-.hidden libgcc compatibility
++ Copyright (C) 2002 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++ Contributed by Guido Guenther <agx@sigxcpu.org>
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <stdint.h>
++#include <shlib-compat.h>
++
++#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_2_6)
++
++typedef int int128_t __attribute__((__mode__(TI)));
++
++extern int128_t __multi3 (int128_t, int128_t);
++int128_t INTUSE (__multi3) (int128_t x, int128_t y)
++{
++ return __multi3 (x, y);
++}
++symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.0);
++
++#endif
+--- a/ports/sysdeps/alpha/Versions
++++ b/ports/sysdeps/alpha/Versions
+@@ -3,6 +3,8 @@
+ # functions with special/multiple interfaces
+ __divqu; __remqu; __divqs; __remqs; __divlu; __remlu; __divls;
+ __remls; __divl; __reml; __divq; __remq; __divqu; __remqu;
++ # libgcc-compat
++ __multi3;
+ }
+ }
+ libm {
+--- a/ports/sysdeps/alpha/Makefile
++++ b/ports/sysdeps/alpha/Makefile
+@@ -46,3 +46,11 @@
+ # libc.so requires about 16k for the small data area, which is well
+ # below the 64k maximum.
+ pic-ccflag = -fpic
++
++ifeq ($(subdir),csu)
++ifeq (yes,$(build-shared))
++# Compatibility
++sysdep_routines += libgcc-compat
++shared-only-routines += libgcc-compat
++endif
++endif
Modified: glibc-package/branches/eglibc-2.10/debian/patches/any/local-no-pagesize.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/any/local-no-pagesize.diff 2009-05-10 09:07:53 UTC (rev 3481)
+++ glibc-package/branches/eglibc-2.10/debian/patches/any/local-no-pagesize.diff 2009-05-10 09:37:25 UTC (rev 3482)
@@ -5,8 +5,8 @@
sysdeps/unix/sysv/linux/x86_64/sys/user.h | 4 ++--
4 files changed, 8 insertions(+), 7 deletions(-)
---- a/sysdeps/unix/sysv/linux/alpha/sys/user.h
-+++ b/sysdeps/unix/sysv/linux/alpha/sys/user.h
+--- a/ports/sysdeps/unix/sysv/linux/alpha/sys/user.h
++++ b/ports/sysdeps/unix/sysv/linux/alpha/sys/user.h
@@ -23,7 +23,7 @@
only. Don't read too much into it. Don't use it for anything other
than gdb/strace unless you know what you are doing. */
Modified: glibc-package/branches/eglibc-2.10/debian/patches/any/submitted-futex_robust_pi.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/any/submitted-futex_robust_pi.diff 2009-05-10 09:07:53 UTC (rev 3481)
+++ glibc-package/branches/eglibc-2.10/debian/patches/any/submitted-futex_robust_pi.diff 2009-05-10 09:37:25 UTC (rev 3482)
@@ -8,7 +8,7 @@
index 29afe27..edbe250 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
-@@ -454,16 +454,28 @@
+@@ -454,11 +454,16 @@
# define __ASSUME_ATFCTS 1
#endif
@@ -30,6 +30,10 @@
# define __ASSUME_SET_ROBUST_LIST 1
#endif
+@@ -469,8 +474,15 @@
+ # define __ASSUME_COMPLETE_READV_WRITEV 1
+ #endif
+
-/* Support for PI futexes was added in 2.6.18. */
-#if __LINUX_KERNEL_VERSION >= 0x020612
+/* Support for PI futexes was added in 2.6.18 on i386, powerpc, s390, sparc64
@@ -43,8 +47,8 @@
+ || (__LINUX_KERNEL_VERSION >= 0x020617 && defined __sh__)
# define __ASSUME_FUTEX_LOCK_PI 1
#endif
+
-
2009-09-27 Aurelien Jarno <aurelien@aurel32.net>
* sysdeps/unix/sysv/linux/arm/kernel-features.h
Reply to: