r2259 - in glibc-package/branches/glibc-2.6/debian: . patches patches/any
Author: aurel32
Date: 2007-05-20 09:08:47 +0000 (Sun, 20 May 2007)
New Revision: 2259
Modified:
glibc-package/branches/glibc-2.6/debian/changelog
glibc-package/branches/glibc-2.6/debian/patches/any/local-ldso-disable-hwcap.diff
glibc-package/branches/glibc-2.6/debian/patches/series
Log:
- Update any/local-ldso-disable-hwcap.diff.
Modified: glibc-package/branches/glibc-2.6/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.6/debian/changelog 2007-05-20 07:59:56 UTC (rev 2258)
+++ glibc-package/branches/glibc-2.6/debian/changelog 2007-05-20 09:08:47 UTC (rev 2259)
@@ -31,7 +31,7 @@
- Remove any/cvs-realpath.diff (obsolete).
- Remove any/cvs-vfprintf-stack-smashing.diff (obsolete).
- Remove any/cvs-zdump-64-bit.diff (obsolete).
- - Disable any/local-ldso-disable-hwcap.diff (broken).
+ - Update any/local-ldso-disable-hwcap.diff.
- Remove any/submitted-gethostbyname_r.diff (obsolete).
- Remove any/submitted-iconv-colon.diff (merged upstream).
- Disable any/submitted-strfry.diff (broken).
Modified: glibc-package/branches/glibc-2.6/debian/patches/any/local-ldso-disable-hwcap.diff
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/any/local-ldso-disable-hwcap.diff 2007-05-20 07:59:56 UTC (rev 2258)
+++ glibc-package/branches/glibc-2.6/debian/patches/any/local-ldso-disable-hwcap.diff 2007-05-20 09:08:47 UTC (rev 2259)
@@ -5,53 +5,47 @@
# DP: Upstream status: Debian-Specific
# DP: Status Details: This isn't going to be acceptable upstream, we
# DP: only need it because we support in-place upgrades.
-# DP: Date: 2003-10-28, (Updated 2005-01-02 gotom)
+# DP: Date: 2003-10-28, (Updated 2005-01-02 gotom, 2007-05-20 aurel32)
-Index: elf/dl-sysdep.c
-===================================================================
-RCS file: /cvs/glibc/libc/elf/dl-sysdep.c,v
-retrieving revision 1.113
-diff -u -r1.113 dl-sysdep.c
---- elf/dl-sysdep.c 6 Nov 2004 00:24:47 -0000 1.113
-+++ elf/dl-sysdep.c 2 Jan 2005 10:24:13 -0000
-@@ -408,7 +408,11 @@
- #ifdef USE_TLS
+--- elf/dl-sysdep.c.orig 2006-10-28 01:11:42.000000000 +0200
++++ elf/dl-sysdep.c 2007-05-20 10:32:04.000000000 +0200
+@@ -408,6 +408,20 @@
/* For TLS enabled builds always add 'tls'. */
++cnt;
--#else
-+#endif
-+
+
+ if (__access ("/etc/ld.so.nohwcap", F_OK) == 0)
-+ cnt = 0;
++ {
++ /* If hwcap is disabled, we only have the base directory to search. */
++ result = (struct r_strlenpair *) malloc (sizeof (*result));
++ if (result == NULL)
++ goto no_memory;
+
- if (cnt == 0)
- {
- /* If we no have platform name and no important capability we only
-@@ -423,7 +427,6 @@
- *sz = 1;
- return result;
- }
--#endif
-
++ result[0].str = (char *) result; /* Does not really matter. */
++ result[0].len = 0;
++
++ *sz = 1;
++ return result;
++ }
++
/* Create temporary data structure to generate result table. */
temp = (struct r_strlenpair *) alloca (cnt * sizeof (*temp));
-@@ -488,9 +491,7 @@
+ m = 0;
+@@ -470,8 +484,11 @@
+ *sz = 1 << cnt;
result = (struct r_strlenpair *) malloc (*sz * sizeof (*result) + total);
if (result == NULL)
+- _dl_signal_error (ENOMEM, NULL, NULL,
+- N_("cannot create capability list"));
++ {
++ no_memory:
++ _dl_signal_error (ENOMEM, NULL, NULL,
++ N_("cannot create capability list"));
++ }
+
+ if (cnt == 1)
{
--#ifndef USE_TLS
- no_memory:
--#endif
- _dl_signal_error (ENOMEM, NULL, NULL,
- N_("cannot create capability list"));
- }
-Index: elf/dl-cache.c
-===================================================================
-RCS file: /cvs/glibc/libc/elf/dl-cache.c,v
-retrieving revision 1.46
-diff -u -r1.46 dl-cache.c
---- elf/dl-cache.c 19 Mar 2004 00:36:32 -0000 1.46
-+++ elf/dl-cache.c 2 Jan 2005 10:23:42 -0000
+--- elf/dl-cache.c.orig 2006-10-28 01:11:41.000000000 +0200
++++ elf/dl-cache.c 2007-05-20 10:15:39.000000000 +0200
@@ -244,6 +244,7 @@
if (cache_new != (void *) -1)
{
@@ -60,7 +54,7 @@
/* This is where the strings start. */
cache_data = (const char *) cache_new;
-@@ -255,6 +256,9 @@
+@@ -255,11 +256,16 @@
if (platform != (uint64_t) -1)
platform = 1ULL << platform;
@@ -68,9 +62,7 @@
+ disable_hwcap = 1;
+
/* Only accept hwcap if it's for the right platform. */
- #ifdef USE_TLS
- # define _DL_HWCAP_TLS_MASK (1LL << 63)
-@@ -264,6 +268,8 @@
+ #define _DL_HWCAP_TLS_MASK (1LL << 63)
#define HWCAP_CHECK \
if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion)) \
continue; \
Modified: glibc-package/branches/glibc-2.6/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-20 07:59:56 UTC (rev 2258)
+++ glibc-package/branches/glibc-2.6/debian/patches/series 2007-05-20 09:08:47 UTC (rev 2259)
@@ -101,7 +101,7 @@
any/local-iconv-fix-trampoline.diff -p1
any/local-ld-multiarch.diff -p0
any/local-ldd.diff -p0
-#any/local-ldso-disable-hwcap.diff -p0
+any/local-ldso-disable-hwcap.diff -p0
any/local-ldconfig.diff -p0
any/local-ldconfig-fsync.diff -p1
any/local-ldconfig-timestamps.diff -p0
Reply to: