Author: aurel32
Date: 2008-08-08 19:44:35 +0000 (Fri, 08 Aug 2008)
New Revision: 3052
Removed:
glibc-package/branches/glibc-2.8/debian/patches/any/local-dl-execstack.diff
glibc-package/branches/glibc-2.8/debian/patches/any/local-gcc4-wcstol_l.diff
glibc-package/branches/glibc-2.8/debian/patches/any/local-notls.diff
glibc-package/branches/glibc-2.8/debian/patches/arm/local-args6.diff
glibc-package/branches/glibc-2.8/debian/patches/arm/submitted-RTLD_SINGLE_THREAD_P.diff
Modified:
glibc-package/branches/glibc-2.8/debian/changelog
glibc-package/branches/glibc-2.8/debian/patches/series
Log:
- Remove arm/local-args6.diff (merged).
- Remove arm/submitted-RTLD_SINGLE_THREAD_P.diff (merged).
- Remove any/local-dl-execstack.diff (outdated).
- Remove any/local-gcc4-wcstol_l.diff (outdated).
- Remove any/local-notls.diff (outdated).
Modified: glibc-package/branches/glibc-2.8/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.8/debian/changelog 2008-08-08 19:22:13 UTC
(rev 3051)
+++ glibc-package/branches/glibc-2.8/debian/changelog 2008-08-08 19:44:35 UTC
(rev 3052)
@@ -19,6 +19,8 @@
- Remove amd64/cvs-vdso_clock_gettime.diff (merged).
- Remove arm/cvs-ioperm.diff (merged).
- Remove arm/cvs-gcc4-inline.diff (merged).
+ - Remove arm/local-args6.diff (merged).
+ - Remove arm/submitted-RTLD_SINGLE_THREAD_P.diff (merged).
- Remove hppa/cvs-atomic.diff (merged).
- Remove hppa/cvs-lowlevellock.diff (merged).
- Remove hurd-i386/cvs-kernel-features.diff (merged).
@@ -48,6 +50,9 @@
- Remove any/cvs-vfscanf.diff (merged).
- Remove any/cvs-sunrpc_rpc_thread.diff (merged).
- Remove any/cvs-wchar_h.diff (merged).
+ - Remove any/local-dl-execstack.diff (outdated).
+ - Remove any/local-gcc4-wcstol_l.diff (outdated).
+ - Remove any/local-notls.diff (outdated).
- Remove any/submitted-ieee754_h.diff (merged).
- Remove any/submitted-link-local_resolver.diff (merged).
- Remove localedata/cvs-locale-ig_NG.diff (merged).
Deleted:
glibc-package/branches/glibc-2.8/debian/patches/any/local-dl-execstack.diff
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/any/local-dl-execstack.diff
2008-08-08 19:22:13 UTC (rev 3051)
+++ glibc-package/branches/glibc-2.8/debian/patches/any/local-dl-execstack.diff
2008-08-08 19:44:35 UTC (rev 3052)
@@ -1,35 +0,0 @@
-# DP: Description: Support libraries that has execstack on <= 2.4.18 kernels.
-# DP: Related bugs: #321718
-# DP: Dpatch author: GOTO Masanori <[EMAIL PROTECTED]>
-# DP: Patch author: GOTO Masanori <[EMAIL PROTECTED]>
-# DP: Upstream status: Not submitted
-# DP: Status Details: Will be submitted
-# DP: Date: 2005-08-19
-
-2005-08-19 GOTO Masanori <[EMAIL PROTECTED]>
-
- * sysdeps/unix/sysv/linux/dl-execstack.c: Check not only ENOMEM but
- also EFAULT for pre 2.4.19 kernels.
-
-Index: b/sysdeps/unix/sysv/linux/dl-execstack.c
-===================================================================
---- a/sysdeps/unix/sysv/linux/dl-execstack.c 2008-08-08 19:08:18.000000000
+0200
-+++ b/sysdeps/unix/sysv/linux/dl-execstack.c 2008-08-08 19:09:03.000000000
+0200
-@@ -89,7 +89,7 @@
- page -= size;
- else
- {
-- if (errno != ENOMEM) /* Unexpected failure mode. */
-+ if (errno != ENOMEM && errno != EFAULT) /* Unexpected failure
mode. */
- {
- result = errno;
- goto out;
-@@ -115,7 +115,7 @@
- page += size;
- else
- {
-- if (errno != ENOMEM) /* Unexpected failure mode. */
-+ if (errno != ENOMEM && errno != EFAULT) /* Unexpected failure
mode. */
- {
- result = errno;
- goto out;
Deleted:
glibc-package/branches/glibc-2.8/debian/patches/any/local-gcc4-wcstol_l.diff
===================================================================
---
glibc-package/branches/glibc-2.8/debian/patches/any/local-gcc4-wcstol_l.diff
2008-08-08 19:22:13 UTC (rev 3051)
+++
glibc-package/branches/glibc-2.8/debian/patches/any/local-gcc4-wcstol_l.diff
2008-08-08 19:44:35 UTC (rev 3052)
@@ -1,44 +0,0 @@
-# DP: Description: Make glibc-2.3.5 compile with gcc-4.0 on 64bit archs.
-# DP: Related bugs:
-# DP: Dpatch author: GOTO Masanori <[EMAIL PROTECTED]>
-# DP: Patch author: Jakub Jelinek <[EMAIL PROTECTED]>
-# DP: Upstream status: Debian-Specific
-# DP: Status Details:
-# DP: Date: 2005-07-14
-
-https://www.redhat.com/archives/fedora-cvs-commits/2005-March/msg00408.html
-
- * sysdeps/wordsize-64/strtol_l.c: Don't add aliases if UNSIGNED.
- * sysdeps/wordsize-64/wcstol_l.c: Likewise.
-
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/wordsize-64/strtol_l.c,v
-retrieving revision 1.4
-retrieving revision 1.4.2.1
-Index: b/sysdeps/wordsize-64/strtol_l.c
-===================================================================
---- a/sysdeps/wordsize-64/strtol_l.c 2008-08-08 19:08:18.000000000 +0200
-+++ b/sysdeps/wordsize-64/strtol_l.c 2008-08-08 19:09:04.000000000 +0200
-@@ -8,7 +8,9 @@
- #undef ____strtoll_l_internal
- #undef __strtoll_l
- #undef strtoll_l
-+#if !UNSIGNED
- strong_alias (____strtol_l_internal, ____strtoll_l_internal)
- libc_hidden_ver (____strtol_l_internal, ____strtoll_l_internal)
- weak_alias (__strtol_l, __strtoll_l)
- weak_alias (__strtol_l, strtoll_l)
-+#endif
-Index: b/sysdeps/wordsize-64/wcstol_l.c
-===================================================================
---- a/sysdeps/wordsize-64/wcstol_l.c 2008-08-08 19:08:18.000000000 +0200
-+++ b/sysdeps/wordsize-64/wcstol_l.c 2008-08-08 19:09:04.000000000 +0200
-@@ -8,6 +8,8 @@
- #undef ____wcstoll_l_internal
- #undef __wcstoll_l
- #undef wcstoll_l
-+#if !UNSIGNED
- strong_alias (____wcstol_l_internal, ____wcstoll_l_internal)
- weak_alias (__wcstol_l, __wcstoll_l)
- weak_alias (__wcstol_l, wcstoll_l)
-+#endif
Deleted: glibc-package/branches/glibc-2.8/debian/patches/any/local-notls.diff
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/any/local-notls.diff
2008-08-08 19:22:13 UTC (rev 3051)
+++ glibc-package/branches/glibc-2.8/debian/patches/any/local-notls.diff
2008-08-08 19:44:35 UTC (rev 3052)
@@ -1,164 +0,0 @@
-# DP: Description: Fix build when TLS is not available.
-# DP: Upstream status: Submitted parts have been rejected. Parts
- submitted would very probably be rejected.
-
-2007-04-13 Aurelien Jarno <[EMAIL PROTECTED]>
-
- linuxthreads/sysdeps/pthread/gai_misc.h: Include <pthread.h>.
-
-2007-02-09 Aurelien Jarno <[EMAIL PROTECTED]>
-
- resolv/gai_misc.h: Include <pthread.h>.
-
-2007-02-06 Petr Salinger <[EMAIL PROTECTED]>
-
- inet/inet_ntoa.c: Only use __thread if USE___THREAD.
-
-2005-08-28 Thomas Schwinge <[EMAIL PROTECTED]>
-
- malloc/memusage.c: Only use __thread if USE___THREAD.
-
-
-Index: b/malloc/memusage.c
-===================================================================
---- a/malloc/memusage.c 2008-08-08 19:08:19.000000000 +0200
-+++ b/malloc/memusage.c 2008-08-08 19:09:02.000000000 +0200
-@@ -85,7 +85,11 @@
- static memusage_cntr_t decreasing_mremap;
- static memusage_size_t current_heap;
- static memusage_size_t peak_use[3];
-+#if USE___THREAD
- static __thread uintptr_t start_sp;
-+#else
-+static uintptr_t start_sp;
-+#endif
-
- /* A few macros to make the source more readable. */
- #define peak_heap peak_use[0]
-Index: b/inet/inet_ntoa.c
-===================================================================
---- a/inet/inet_ntoa.c 2008-08-08 19:08:19.000000000 +0200
-+++ b/inet/inet_ntoa.c 2008-08-08 19:09:02.000000000 +0200
-@@ -21,10 +21,14 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <arpa/inet.h>
-+#include <tls.h>
-
- /* The interface of this function is completely stupid, it requires a
- static buffer. We relax this a bit in that we allow one buffer for
- each thread. */
-+
-+#if USE_TLS && HAVE___THREAD
-+
- static __thread char buffer[18];
-
-
-@@ -37,3 +41,83 @@
-
- return buffer;
- }
-+
-+#else
-+#include <bits/libc-lock.h>
-+
-+/* The interface of this function is completely stupid, it requires a
-+ static buffer. We relax this a bit in that we allow at least one
-+ buffer for each thread. */
-+
-+/* This is the key for the thread specific memory. */
-+static __libc_key_t key;
-+
-+/* If nonzero the key allocation failed and we should better use a
-+ static buffer than fail. */
-+static char local_buf[18];
-+static char *static_buf;
-+
-+/* Destructor for the thread-specific data. */
-+static void init (void);
-+static void free_key_mem (void *mem);
-+
-+
-+char *
-+inet_ntoa (struct in_addr in)
-+{
-+ __libc_once_define (static, once);
-+ char *buffer;
-+ unsigned char *bytes;
-+
-+ /* If we have not yet initialized the buffer do it now. */
-+ __libc_once (once, init);
-+
-+ if (static_buf != NULL)
-+ buffer = static_buf;
-+ else
-+ {
-+ /* We don't use the static buffer and so we have a key. Use it
-+ to get the thread-specific buffer. */
-+ buffer = __libc_getspecific (key);
-+ if (buffer == NULL)
-+ {
-+ /* No buffer allocated so far. */
-+ buffer = malloc (18);
-+ if (buffer == NULL)
-+ /* No more memory available. We use the static buffer. */
-+ buffer = local_buf;
-+ else
-+ __libc_setspecific (key, buffer);
-+ }
-+ }
-+
-+ bytes = (unsigned char *) ∈
-+ __snprintf (buffer, 18, "%d.%d.%d.%d",
-+ bytes[0], bytes[1], bytes[2], bytes[3]);
-+
-+ return buffer;
-+}
-+
-+
-+/* Initialize buffer. */
-+static void
-+init (void)
-+{
-+ if (__libc_key_create (&key, free_key_mem))
-+ /* Creating the key failed. This means something really went
-+ wrong. In any case use a static buffer which is better than
-+ nothing. */
-+ static_buf = local_buf;
-+}
-+
-+
-+/* Free the thread specific data, this is done if a thread terminates. */
-+static void
-+free_key_mem (void *mem)
-+{
-+ free (mem);
-+ __libc_setspecific (key, NULL);
-+}
-+
-+#endif
-+
-Index: b/linuxthreads/sysdeps/pthread/gai_misc.h
-===================================================================
---- a/linuxthreads/sysdeps/pthread/gai_misc.h 2008-08-08 19:08:19.000000000
+0200
-+++ b/linuxthreads/sysdeps/pthread/gai_misc.h 2008-08-08 19:09:02.000000000
+0200
-@@ -23,6 +23,7 @@
-
- #include <assert.h>
- #include <signal.h>
-+#include <pthread.h>
-
- #undef DONT_NEED_GAI_MISC_COND
-
-Index: b/resolv/gai_misc.h
-===================================================================
---- a/resolv/gai_misc.h 2008-08-08 19:08:19.000000000 +0200
-+++ b/resolv/gai_misc.h 2008-08-08 19:09:02.000000000 +0200
-@@ -22,6 +22,7 @@
-
- #include <netdb.h>
- #include <signal.h>
-+#include <pthread.h>
-
-
- /* Used to synchronize. */
Deleted: glibc-package/branches/glibc-2.8/debian/patches/arm/local-args6.diff
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/arm/local-args6.diff
2008-08-08 19:22:13 UTC (rev 3051)
+++ glibc-package/branches/glibc-2.8/debian/patches/arm/local-args6.diff
2008-08-08 19:44:35 UTC (rev 3052)
@@ -1,14 +0,0 @@
-Index: b/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
-===================================================================
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2008-08-08
19:08:26.000000000 +0200
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2008-08-08
19:08:46.000000000 +0200
-@@ -76,6 +76,9 @@
- # define DOCARGS_6 DOCARGS_5
- # define UNDOCARGS_6 UNDOCARGS_5
-
-+# define DOCARGS_6 DOCARGS_5
-+# define UNDOCARGS_6 UNDOCARGS_5
-+
- # ifdef IS_IN_libpthread
- # define CENABLE bl PLTJMP(__pthread_enable_asynccancel)
- # define CDISABLE bl PLTJMP(__pthread_disable_asynccancel)
Deleted:
glibc-package/branches/glibc-2.8/debian/patches/arm/submitted-RTLD_SINGLE_THREAD_P.diff
===================================================================
---
glibc-package/branches/glibc-2.8/debian/patches/arm/submitted-RTLD_SINGLE_THREAD_P.diff
2008-08-08 19:22:13 UTC (rev 3051)
+++
glibc-package/branches/glibc-2.8/debian/patches/arm/submitted-RTLD_SINGLE_THREAD_P.diff
2008-08-08 19:44:35 UTC (rev 3052)
@@ -1,19 +0,0 @@
-2007-05-25 Aurelien Jarno <[EMAIL PROTECTED]>
-
- * sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
- (RTLD_SINGLE_THREAD_P): Define.
-
-Index: b/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
-===================================================================
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2008-08-08
19:08:46.000000000 +0200
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2008-08-08
19:08:47.000000000 +0200
-@@ -138,3 +138,9 @@
- __builtin_expect (THREAD_GETMEM (THREAD_SELF, \
- header.multiple_threads) == 0, 1)
- #endif
-+
-+#ifndef __ASSEMBLER__
-+# define RTLD_SINGLE_THREAD_P \
-+ __builtin_expect (THREAD_GETMEM (THREAD_SELF, \
-+ header.multiple_threads) == 0, 1)
-+#endif
Modified: glibc-package/branches/glibc-2.8/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/series 2008-08-08
19:22:13 UTC (rev 3051)
+++ glibc-package/branches/glibc-2.8/debian/patches/series 2008-08-08
19:44:35 UTC (rev 3052)
@@ -47,12 +47,10 @@
amd64/local-clone.diff
amd64/local-linuxthreads-gscope.diff
-arm/local-args6.diff
arm/local-eabi-wchar.diff
arm/local-ioperm.diff
arm/local-lowlevellock.diff
arm/local-no-hwcap.diff
-arm/submitted-RTLD_SINGLE_THREAD_P.diff
hppa/cvs-context.diff
hppa/local-inlining.diff
@@ -128,15 +126,12 @@
any/cvs-iconv-braces.diff
any/cvs-tst-regex.diff
any/cvs-regex_anchor.diff
-any/local-notls.diff
any/local-asserth-decls.diff
any/local-bashisms.diff
any/local-bindresvport_blacklist.diff
any/local-allocalim-header.diff
-any/local-dl-execstack.diff
any/local-fhs-linux-paths.diff
any/local-fhs-nscd.diff
-any/local-gcc4-wcstol_l.diff
# any/local-ipv6-lookup.diff -p1 # has issues
any/local-ld-multiarch.diff
any/local-ldd.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
