Author: aurel32 Date: 2008-02-15 18:03:49 +0000 (Fri, 15 Feb 2008) New Revision: 2816
Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/any/local-ldso-disable-hwcap.diff Log: * patches/any/local-ldso-disable-hwcap.diff: revert previous changes as they break etch -> lenny upgrades. Closes: #465753. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2008-02-13 17:13:22 UTC (rev 2815) +++ glibc-package/trunk/debian/changelog 2008-02-15 18:03:49 UTC (rev 2816) @@ -1,3 +1,10 @@ +glibc (2.7-9) unstable; urgency=low + + * patches/any/local-ldso-disable-hwcap.diff: revert previous changes + as they break etch -> lenny upgrades. Closes: #465753. + + -- Aurelien Jarno <[EMAIL PROTECTED]> Fri, 15 Feb 2008 19:00:24 +0100 + glibc (2.7-8) unstable; urgency=low * any/cvs/rfc3484.diff: patch from CVS to fix recognition of interface Modified: glibc-package/trunk/debian/patches/any/local-ldso-disable-hwcap.diff =================================================================== --- glibc-package/trunk/debian/patches/any/local-ldso-disable-hwcap.diff 2008-02-13 17:13:22 UTC (rev 2815) +++ glibc-package/trunk/debian/patches/any/local-ldso-disable-hwcap.diff 2008-02-15 18:03:49 UTC (rev 2816) @@ -5,38 +5,32 @@ # 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, 2007-05-20 aurel32, -# DP: 2008-01-21 aurel32) +# DP: Date: 2003-10-28, (Updated 2005-01-02 gotom, 2007-05-20 aurel32) --- elf/dl-sysdep.c.orig +++ elf/dl-sysdep.c -@@ -408,6 +408,25 @@ +@@ -408,6 +408,20 @@ /* For TLS enabled builds always add 'tls'. */ ++cnt; + if (__access ("/etc/ld.so.nohwcap", F_OK) == 0) + { -+ /* If hwcap is disabled, we only have the base directory and tls to search. */ -+ *sz = 2; -+ result = (struct r_strlenpair *) malloc (*sz * sizeof (*result) + 3 + 1); ++ /* 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; ++ goto no_memory; + -+ result[0].str = (char *) (result + *sz); -+ result[0].len = 3 + 1; -+ result[1].str = (char *) (result + *sz); -+ result[1].len = 0; -+ cp = __mempcpy ((char *) (result + *sz), "tls", 3); -+ *cp = '/'; ++ result[0].str = (char *) result; /* Does not really matter. */ ++ result[0].len = 0; + -+ *max_capstrlen = result[0].len; ++ *sz = 1; + return result; + } + /* Create temporary data structure to generate result table. */ temp = (struct r_strlenpair *) alloca (cnt * sizeof (*temp)); m = 0; -@@ -482,8 +501,11 @@ +@@ -482,8 +496,11 @@ *sz = 1 << cnt; result = (struct r_strlenpair *) malloc (*sz * sizeof (*result) + total); if (result == NULL) @@ -50,7 +44,6 @@ if (cnt == 1) { - --- elf/dl-cache.c.orig +++ elf/dl-cache.c @@ -244,6 +244,7 @@ @@ -73,7 +66,7 @@ #define HWCAP_CHECK \ if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion)) \ continue; \ -+ if (disable_hwcap && (lib->hwcap & ~_DL_HWCAP_TLS_MASK) != 0) \ ++ if (disable_hwcap && lib->hwcap != 0) \ + continue; \ if (_DL_PLATFORMS_COUNT \ && (lib->hwcap & _DL_HWCAP_PLATFORM) != 0 \ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]