r1721 - in glibc-package/branches/glibc-2.4/debian: . patches patches/any rules.d sysdeps
Author: aurel32
Date: 2006-08-14 13:08:34 +0000 (Mon, 14 Aug 2006)
New Revision: 1721
Removed:
glibc-package/branches/glibc-2.4/debian/patches/any/local-ldconfig-tls.diff
Modified:
glibc-package/branches/glibc-2.4/debian/TODO
glibc-package/branches/glibc-2.4/debian/patches/series
glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
Log:
Remove some more linuxthreads specific things.
Modified: glibc-package/branches/glibc-2.4/debian/TODO
===================================================================
--- glibc-package/branches/glibc-2.4/debian/TODO 2006-08-13 14:27:04 UTC (rev 1720)
+++ glibc-package/branches/glibc-2.4/debian/TODO 2006-08-14 13:08:34 UTC (rev 1721)
@@ -12,13 +12,11 @@
package.
* libc:
- - Only add some libraries to the optimized packages and to /lib/tls,
- instead of all of them?
+ - Only add some libraries to the optimized packages instead of all of them?
- Add patch to display (or ignore) linux-gate.so.1 in ldd.
- Check dpkg-shlibdeps for linux-gate.so.1 handling.
- Don't do make install for libc6-i686 if we aren't going to use the
- results - it's very slow. We may need to make install for nptl to
- get the few headers that differ.
+ results - it's very slow.
- Fix /usr/sbin/tzconfig to take a parameter. Right now we set the links
by hand in libc.postinst in the noninteractive case, but it would be
better if the tool could just do everything for us.
@@ -29,8 +27,6 @@
- What do we do for headers on 32/64 systems? Do we generate
#if wrappers for /usr/include? This looks like a non-issue since
only asm needs it.
- - -dev support for library variants like nptl? 64-bit libraries are
- covered.
* locales:
Deleted: glibc-package/branches/glibc-2.4/debian/patches/any/local-ldconfig-tls.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/local-ldconfig-tls.diff 2006-08-13 14:27:04 UTC (rev 1720)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/local-ldconfig-tls.diff 2006-08-14 13:08:34 UTC (rev 1721)
@@ -1,27 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Make ldconfig prefer TLS-capable directories.
-# DP: Author: Daniel Jacobowitz <dan@debian.org>
-# DP: Upstream status: Not submitted
-# DP: Status Details: This is too much a hack to submit, but it's an
-# improvement.
-# DP: Date: 2003-10-24
-
---- glibc-2.3.2/elf/cache.c.orig 2003-10-24 19:57:55.000000000 -0400
-+++ glibc-2.3.2/elf/cache.c 2003-10-24 20:06:06.000000000 -0400
-@@ -246,6 +246,16 @@ int compare (const struct cache_entry *e
- return 1;
- else if (e1->flags > e2->flags)
- return -1;
-+#ifdef USE_TLS
-+ /* ld.so doesn't sort by "most specific hwcap". It searches based on
-+ the numbering of the bits, and TLS takes precedence. This still
-+ doesn't bring us in line with ld.so, but it does bring us closer -
-+ close enough for Debian's current needs. */
-+ else if ((e2->hwcap & (1ULL << 63)) && ! (e1->hwcap & (1ULL << 63)))
-+ return 1;
-+ else if ((e1->hwcap & (1ULL << 63)) && ! (e2->hwcap & (1ULL << 63)))
-+ return -1;
-+#endif
- /* Sort by most specific hwcap. */
- else if (e2->bits_hwcap > e1->bits_hwcap)
- return 1;
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-08-13 14:27:04 UTC (rev 1720)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-08-14 13:08:34 UTC (rev 1721)
@@ -118,7 +118,6 @@
any/local-ldd.diff -p0
any/local-ldso-disable-hwcap.diff -p0
any/local-ldconfig.diff -p0
-any/local-ldconfig-tls.diff -p1
any/local-libgcc-compat-main.diff -p0
any/local-libgcc-compat-ports.diff -p0
any/local-linuxthreads-sizefix.diff -p1
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-08-13 14:27:04 UTC (rev 1720)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-08-14 13:08:34 UTC (rev 1721)
@@ -116,11 +116,8 @@
# an unescaped regular expression. ld.so must be executable;
# libc.so and NPTL's libpthread.so print useful version
# information when executed.
- # FIXME: LinuxThread's libpthread.so doesn't. It would be good
- # to either fix that, or use a more robust method than searching
- # for /tls/ in the path to identify NPTL.
find debian/$(curpass) -type f \( -regex '.*lib.*/ld.*so.*' \
- -o -regex '.*lib.*/tls/.*libpthread.*so.*' \
+ -o -regex '.*lib.*/libpthread.*so.*' \
-o -regex '.*lib.*/libc[.-].*so.*' \) \
-exec chmod a+x '{}' ';'
dh_makeshlibs -p$(curpass) -V "$(call xx,shlib_dep)"
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-08-13 14:27:04 UTC (rev 1720)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-08-14 13:08:34 UTC (rev 1721)
@@ -20,7 +20,7 @@
i686_configure_target=i686-linux
i686_extra_cflags = -march=i686 -mtune=i686 -g1 -O3
i686_rtlddir = /lib
-i686_slibdir = /lib/tls/i686/cmov
+i686_slibdir = /lib/i686/cmov
i686_extra_config_options = $(extra_config_options) --disable-profile
# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
@@ -31,7 +31,7 @@
xen_configure_target=i686-linux
xen_extra_cflags = -march=i686 -mtune=i686 -g1 -O3 -mno-tls-direct-seg-refs
xen_rtlddir = /lib
-xen_slibdir = /lib/tls/i686/cmov
+xen_slibdir = /lib/i686/cmov
xen_extra_config_options = $(extra_config_options) --disable-profile
# build 64-bit (amd64) alternative library
Reply to: