r1499 - in glibc-package/trunk/debian: . sysdeps
Author: aurel32
Date: 2006-05-21 18:12:02 +0000 (Sun, 21 May 2006)
New Revision: 1499
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/i386.mk
Log:
* debian/sysdeps/i386.mk: Build back the glibc with --without-__thread on
i386 (Closes: #368022, #368326).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-05-21 17:11:17 UTC (rev 1498)
+++ glibc-package/trunk/debian/changelog 2006-05-21 18:12:02 UTC (rev 1499)
@@ -11,6 +11,8 @@
* Set the minimum kernel to 2.6.1 for the udeb package, except for i386,
m68k, mips, mipsel, powerpc and s390.
* Enable the locales-all package. (Closes: #308020)
+ * debian/sysdeps/i386.mk: Build back the glibc with --without-__thread on
+ i386 (Closes: #368022, #368326).
-- Aurelien Jarno <aurel32@debian.org> Fri, 19 May 2006 05:49:18 +0000
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2006-05-21 17:11:17 UTC (rev 1498)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2006-05-21 18:12:02 UTC (rev 1499)
@@ -1,14 +1,13 @@
-GLIBC_PASSES += nptl i686 xen
-DEB_ARCH_REGULAR_PACKAGES += libc6-i686 libc6-xen
-
udeb_MIN_KERNEL_SUPPORTED = 2.4.1
# Starting with libc6 2.3.6-6 TLS support is enabled
libc6_shlib_dep = libc6 (>= 2.3.6-6)
+libc_extra_config_options = $(extra_config_options) --without-__thread
# NPTL requires at least i486 assembly. We don't need to take
# special measures for i386 systems, since Debian kernel images now
# emulate the missing instructions on the i386.
+GLIBC_PASSES += nptl
nptl_configure_target=i486-linux
nptl_configure_build=i486-linux
nptl_extra_cflags = -march=i486 -mtune=i686 -g1 -O3
@@ -16,6 +15,8 @@
# We use -march=i686 and glibc's i686 routines use cmov, so require it.
# A Debian-local glibc patch adds cmov to the search path.
# The optimized libraries also use NPTL!
+GLIBC_PASSES += i686
+DEB_ARCH_REGULAR_PACKAGES += libc6-i686
i686_add-ons = nptl $(add-ons)
i686_configure_target=i686-linux
i686_extra_cflags = -march=i686 -mtune=i686 -g1 -O3
@@ -26,6 +27,8 @@
# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
# greatly reduce the speed when running under the Xen hypervisor.
+GLIBC_PASSES += xen
+DEB_ARCH_REGULAR_PACKAGES += libc6-xen
xen_add-ons = nptl $(add-ons)
xen_configure_target=i686-linux
xen_extra_cflags = -march=i686 -mtune=i686 -g1 -O3 -mno-tls-direct-seg-refs
@@ -38,7 +41,6 @@
GLIBC_PASSES += amd64
DEB_ARCH_REGULAR_PACKAGES += libc6-amd64 libc6-dev-amd64
libc6-amd64_shlib_dep = libc6-amd64 (>= $(shlib_dep_ver))
-
amd64_configure_target = x86_64-linux
# __x86_64__ is defined here because Makeconfig uses -undef and the
# /usr/include/asm wrappers need that symbol.
Reply to: