r1797 - in glibc-package/branches/glibc-2.4/debian: . control.in sysdeps
Author: aurel32
Date: 2006-08-28 16:55:15 +0000 (Mon, 28 Aug 2006)
New Revision: 1797
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/control
glibc-package/branches/glibc-2.4/debian/control.in/opt
glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
Log:
* debian/sysdeps/i386.mk: install the xen flavour in /lib/i686/nosegneg and
create /etc/ld.so.conf.d/libc6-xen.conf which uses the new hwcap feature.
Closes: #363442.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-08-28 04:41:11 UTC (rev 1796)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-08-28 16:55:15 UTC (rev 1797)
@@ -129,6 +129,9 @@
from Michael Banck.
* debian/script.in/kernelcheck.sh: set the minimum kernel version to 2.6.0,
except on m68k where it is set to 2.4.1.
+ * debian/sysdeps/i386.mk: install the xen flavour in /lib/i686/nosegneg and
+ create /etc/ld.so.conf.d/libc6-xen.conf which uses the new hwcap feature.
+ Closes: #363442.
[ Jeff Bailey ]
Modified: glibc-package/branches/glibc-2.4/debian/control
===================================================================
--- glibc-package/branches/glibc-2.4/debian/control 2006-08-28 04:41:11 UTC (rev 1796)
+++ glibc-package/branches/glibc-2.4/debian/control 2006-08-28 16:55:15 UTC (rev 1797)
@@ -527,7 +527,6 @@
Package: libc6-xen
Architecture: i386
-Conflicts: libc6-i686
Section: libs
Priority: extra
Pre-Depends: libc6 (= ${Source-Version})
Modified: glibc-package/branches/glibc-2.4/debian/control.in/opt
===================================================================
--- glibc-package/branches/glibc-2.4/debian/control.in/opt 2006-08-28 04:41:11 UTC (rev 1796)
+++ glibc-package/branches/glibc-2.4/debian/control.in/opt 2006-08-28 16:55:15 UTC (rev 1797)
@@ -44,7 +44,6 @@
Package: libc6-xen
Architecture: i386
-Conflicts: libc6-i686
Section: libs
Priority: extra
Pre-Depends: @libc@ (= ${Source-Version})
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-08-28 04:41:11 UTC (rev 1796)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/i386.mk 2006-08-28 16:55:15 UTC (rev 1797)
@@ -24,16 +24,26 @@
i686_extra_config_options = $(extra_config_options) --disable-profile
# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
-# greatly reduce the speed when running under the Xen hypervisor.
+# greatly increase 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
xen_rtlddir = /lib
-xen_slibdir = /lib/i686/cmov
+xen_slibdir = /lib/i686/nosegneg
xen_extra_config_options = $(extra_config_options) --disable-profile
+define libc6-xen_extra_pkg_install
+mkdir -p debian/libc6-xen/etc/ld.so.conf.d
+echo '# This directive teaches ldconfig to search in nosegneg subdirectories' > debian/libc6-xen/etc/ld.so.conf.d/libc6-xen.conf
+echo '# and cache the DSOs there with extra bit 0 set in their hwcap match' >> debian/libc6-xen/etc/ld.so.conf.d/libc6-xen.conf
+echo '# fields. In Xen guest kernels, the vDSO tells the dynamic linker to' >> debian/libc6-xen/etc/ld.so.conf.d/libc6-xen.conf
+echo '# search in nosegneg subdirectories and to match this extra hwcap bit' >> debian/libc6-xen/etc/ld.so.conf.d/libc6-xen.conf
+echo '# in the ld.so.cache file.' >> debian/libc6-xen/etc/ld.so.conf.d/libc6-xen.conf
+echo 'hwcap 0 nosegneg' >> debian/libc6-xen/etc/ld.so.conf.d/libc6-xen.conf
+endef
+
# build 64-bit (amd64) alternative library
GLIBC_PASSES += amd64
DEB_ARCH_REGULAR_PACKAGES += libc6-amd64 libc6-dev-amd64
Reply to: