Index: debian/control
===================================================================
--- debian/control	(révision 4389)
+++ debian/control	(révision 4390)
@@ -113,7 +113,7 @@
 Section: libs
 Priority: required
 Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
-Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
+Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
 Provides: ${locale-compat:Depends}
 Conflicts: tzdata-etch, tzdata (<< 2007k-1)
@@ -188,7 +188,7 @@
 Section: libs
 Priority: required
 Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
-Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
+Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
 Provides: ${locale-compat:Depends}
 Conflicts: tzdata-etch, tzdata (<< 2007k-1)
@@ -263,7 +263,7 @@
 Section: libs
 Priority: required
 Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
-Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
+Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
 Provides: ${locale-compat:Depends}
 Conflicts: tzdata-etch, tzdata (<< 2007k-1)
@@ -338,7 +338,7 @@
 Section: libs
 Priority: required
 Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
-Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
+Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
 Provides: ${locale-compat:Depends}
 Conflicts: tzdata-etch, tzdata (<< 2007k-1)
@@ -675,6 +675,37 @@
  (including clones such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA 
  C3 Ezla).  
 
+Package: libc0.3-i686
+Architecture: hurd-i386
+Section: libs
+Priority: extra
+Pre-Depends: libc0.3 (= ${binary:Version})
+Depends: ${misc:Depends}
+Description: Embedded GNU C Library: Shared libraries [i686 optimized]
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C
+ library and the standard math library, as well as many others.
+ .
+ This set of libraries is optimized for i686 machines, and will only be
+ used on an i686 class CPU (check the output of `uname -m').  This includes 
+ Pentium Pro, Pentium II/III/IV, Celeron CPU's and similar class CPU's
+ (including clones such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA 
+ C3 Ezla).  
+
+Package: libc0.3-xen
+Architecture: hurd-i386
+Section: libs
+Priority: extra
+Pre-Depends: libc0.3 (= ${binary:Version})
+Depends: ${misc:Depends}
+Description: Embedded GNU C Library: Shared libraries [Xen version]
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C
+ library and the standard math library, as well as many others.
+ .
+ This set of libraries is optimized for the Xen hypervisor, and will be
+ selected instead when running under Xen.
+
 Package: libc6.1-alphaev67
 Architecture: alpha
 Section: libs
Index: debian/control.in/opt
===================================================================
--- debian/control.in/opt	(révision 4389)
+++ debian/control.in/opt	(révision 4390)
@@ -61,6 +61,37 @@
  (including clones such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA 
  C3 Ezla).  
 
+Package: libc0.3-i686
+Architecture: hurd-i386
+Section: libs
+Priority: extra
+Pre-Depends: libc0.3 (= ${binary:Version})
+Depends: ${misc:Depends}
+Description: Embedded GNU C Library: Shared libraries [i686 optimized]
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C
+ library and the standard math library, as well as many others.
+ .
+ This set of libraries is optimized for i686 machines, and will only be
+ used on an i686 class CPU (check the output of `uname -m').  This includes 
+ Pentium Pro, Pentium II/III/IV, Celeron CPU's and similar class CPU's
+ (including clones such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA 
+ C3 Ezla).  
+
+Package: libc0.3-xen
+Architecture: hurd-i386
+Section: libs
+Priority: extra
+Pre-Depends: libc0.3 (= ${binary:Version})
+Depends: ${misc:Depends}
+Description: Embedded GNU C Library: Shared libraries [Xen version]
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C
+ library and the standard math library, as well as many others.
+ .
+ This set of libraries is optimized for the Xen hypervisor, and will be
+ selected instead when running under Xen.
+
 Package: libc6.1-alphaev67
 Architecture: alpha
 Section: libs
Index: debian/control.in/libc
===================================================================
--- debian/control.in/libc	(révision 4389)
+++ debian/control.in/libc	(révision 4390)
@@ -3,7 +3,7 @@
 Section: libs
 Priority: required
 Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
-Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
+Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
 Provides: ${locale-compat:Depends}
 Conflicts: tzdata-etch, tzdata (<< 2007k-1)
Index: debian/changelog
===================================================================
--- debian/changelog	(révision 4389)
+++ debian/changelog	(révision 4390)
@@ -13,6 +13,8 @@
     timing support.
   * testsuite-checking/expected-results-i686-{i386,i686,xen}: New
     expected results.
+  * debian/control, debian/control.in/libc, debian/control/opt,
+    debian/sysdeps/hurd-i386.mk: Add lib0.3-{i686,xen} variants.
 
   [ Petr Salinger ]
   * kfreebsd/local-sysdeps.diff: update to revision 3156 (from glibc-bsd).
Index: debian/sysdeps/hurd-i386.mk
===================================================================
--- debian/sysdeps/hurd-i386.mk	(révision 0)
+++ debian/sysdeps/hurd-i386.mk	(révision 4390)
@@ -0,0 +1,28 @@
+# 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.
+EGLIBC_PASSES += i686
+DEB_ARCH_REGULAR_PACKAGES += libc0.3-i686
+i686_add-ons = $(add-ons)
+i686_configure_target=i686-gnu
+i686_extra_cflags = -march=i686 -mtune=generic
+i686_rtlddir = /lib
+i686_slibdir = /lib/i686/cmov
+i686_extra_config_options = $(extra_config_options) --disable-profile --disable-compatible-utmp
+
+# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
+# greatly increase the speed when running under the 32bit Xen hypervisor.
+EGLIBC_PASSES += xen
+DEB_ARCH_REGULAR_PACKAGES += libc0.3-xen
+xen_add-ons = $(add-ons)
+xen_configure_target=i686-gnu
+xen_extra_cflags = -march=i686 -mtune=generic -mno-tls-direct-seg-refs
+xen_rtlddir = /lib
+xen_slibdir = /lib/i686/nosegneg
+xen_extra_config_options = $(extra_config_options) --disable-profile
+
+define libc0.3-dev_extra_pkg_install
+mkdir -p debian/libc0.3-dev/usr/lib/xen
+cp -af debian/tmp-xen/usr/lib/*.a \
+	debian/libc0.3-dev/usr/lib/xen
+endef
+