This is an automated email from the git hooks/post-receive script. aurel32 pushed a commit to branch sid in repository glibc.
commit c51fffde8cb942b5146d62299e1d4aa851e0969c Author: Aurelien Jarno <[email protected]> Date: Sun May 8 16:26:49 2016 +0200 Drop libc*-i686 packages as GCC now defaults to i686: * Drop libc*-i686 packages as GCC now defaults to i686: - debian/control: drop packages, add provides and build-depends on g++-5 (>= 5.3.1-17). - debian/rules: convert i586 into i686 until the default is changed in dpkg-dev. - debian/sysdeps/hurd-i386.mk: stop building libc0.3-i686. Use the default compiler options to build libc0.3-xen. - debian/sysdeps/i386.mk: stop building libc6-i686. - debian/sysdeps/kfreebsd-i386.mk: drop. - debian/patches/i386/submitted-i686-timing.diff: drop. Closes: #218519. --- debian/changelog | 11 ++ debian/control | 51 +-------- debian/control.in/libc | 3 +- debian/control.in/main | 1 + debian/control.in/opt | 38 ------- debian/patches/i386/submitted-i686-timing.diff | 149 ------------------------- debian/patches/series | 1 - debian/rules | 4 +- debian/sysdeps/hurd-i386.mk | 13 --- debian/sysdeps/i386.mk | 12 -- debian/sysdeps/kfreebsd-i386.mk | 11 -- 11 files changed, 20 insertions(+), 274 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1b7c750..172f7c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,17 @@ glibc (2.22-8) UNRELEASED; urgency=medium wrong though, glibc should not be a special case: either we don't support partial upgrades or we do that for all libraries. With that let's hope people will stop reporting bugs, sigh. Closes: #819165. + * Drop libc*-i686 packages as GCC now defaults to i686: + - debian/control: drop packages, add provides and build-depends on + g++-5 (>= 5.3.1-17). + - debian/rules: convert i586 into i686 until the default is changed + in dpkg-dev. + - debian/sysdeps/hurd-i386.mk: stop building libc0.3-i686. Use the + default compiler options to build libc0.3-xen. + - debian/sysdeps/i386.mk: stop building libc6-i686. + - debian/sysdeps/kfreebsd-i386.mk: drop. + - debian/patches/i386/submitted-i686-timing.diff: drop. Closes: + #218519. -- Samuel Thibault <[email protected]> Tue, 19 Apr 2016 23:28:29 +0200 diff --git a/debian/control b/debian/control index af51f94..4970b6c 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: gettext, dpkg-dev (>= 1.17.14), xz-utils, file, quilt, kfreebsd-kernel-headers [kfreebsd-any], binutils (>= 2.21), g++-5, g++-5-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32], + g++-5 (>= 5.3.1-17) [hurd-i386 i386 kfreebsd-i386], libc-bin (>= 2.22) <cross> Build-Depends-Indep: perl, po-debconf (>= 1.0) Maintainer: GNU Libc Maintainers <[email protected]> @@ -164,9 +165,8 @@ Section: libs Priority: required Multi-Arch: same Depends: ${shlibs:Depends}, ${libgcc:Depends} -Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386] Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386] -Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64] +Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386] Conflicts: libc6-loongson2f [mipsel] Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) Replaces: libc6-amd64 [amd64], @@ -250,9 +250,8 @@ Section: libs Priority: required Multi-Arch: same Depends: ${shlibs:Depends}, ${libgcc:Depends} -Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386] Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386] -Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64] +Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386] Conflicts: libc6-loongson2f [mipsel] Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) Replaces: libc6-amd64 [amd64], @@ -336,9 +335,8 @@ Section: libs Priority: required Multi-Arch: same Depends: ${shlibs:Depends}, ${libgcc:Depends} -Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386] Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386] -Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64] +Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386] Conflicts: libc6-loongson2f [mipsel] Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) Replaces: libc6-amd64 [amd64], @@ -422,9 +420,8 @@ Section: libs Priority: required Multi-Arch: same Depends: ${shlibs:Depends}, ${libgcc:Depends} -Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386] Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386] -Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64] +Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386] Conflicts: libc6-loongson2f [mipsel] Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) Replaces: libc6-amd64 [amd64], @@ -815,25 +812,6 @@ Description: GNU C Library: X32 ABI Development Libraries for AMD64 which use the standard C library. This is the X32 ABI version of the library, meant for amd64 systems. -Package: libc6-i686 -Architecture: i386 -Section: libs -Priority: extra -Multi-Arch: same -Pre-Depends: libc6 (= ${binary:Version}) -Depends: ${misc:Depends} -Build-Profiles: <!stage1> -Description: 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 Ezra). - Package: libc6-xen Architecture: i386 Section: libs @@ -850,25 +828,6 @@ Description: GNU C Library: Shared libraries [Xen version] This set of libraries is optimized for the Xen hypervisor, and will be selected instead when running under Xen. -Package: libc0.1-i686 -Architecture: kfreebsd-i386 -Section: libs -Priority: extra -Multi-Arch: same -Pre-Depends: libc0.1 (= ${binary:Version}) -Depends: ${misc:Depends} -Build-Profiles: <!stage1> -Description: 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 Ezra). - Package: libc6.1-alphaev67 Architecture: alpha Section: libs diff --git a/debian/control.in/libc b/debian/control.in/libc index 82cfc3b..fb0fad7 100644 --- a/debian/control.in/libc +++ b/debian/control.in/libc @@ -4,9 +4,8 @@ Section: libs Priority: required Multi-Arch: same Depends: ${shlibs:Depends}, ${libgcc:Depends} -Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386] Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386] -Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64] +Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386] Conflicts: libc6-loongson2f [mipsel] Breaks: nscd (<< @GLIBC_VERSION@), locales (<< @GLIBC_VERSION@), locales-all (<< @GLIBC_VERSION@), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) Replaces: libc6-amd64 [amd64], diff --git a/debian/control.in/main b/debian/control.in/main index 0b0da96..0bad1ea 100644 --- a/debian/control.in/main +++ b/debian/control.in/main @@ -11,6 +11,7 @@ Build-Depends: gettext, dpkg-dev (>= 1.17.14), xz-utils, file, quilt, kfreebsd-kernel-headers [kfreebsd-any], binutils (>= 2.21), g++-5, g++-5-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32], + g++-5 (>= 5.3.1-17) [hurd-i386 i386 kfreebsd-i386], libc-bin (>= @GLIBC_VERSION@) <cross> Build-Depends-Indep: perl, po-debconf (>= 1.0) Maintainer: GNU Libc Maintainers <[email protected]> diff --git a/debian/control.in/opt b/debian/control.in/opt index 19961bb..f272fb5 100644 --- a/debian/control.in/opt +++ b/debian/control.in/opt @@ -1,22 +1,3 @@ -Package: libc6-i686 -Architecture: i386 -Section: libs -Priority: extra -Multi-Arch: same -Pre-Depends: libc6 (= ${binary:Version}) -Depends: ${misc:Depends} -Build-Profiles: <!stage1> -Description: 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 Ezra). - Package: libc6-xen Architecture: i386 Section: libs @@ -33,25 +14,6 @@ Description: GNU C Library: Shared libraries [Xen version] This set of libraries is optimized for the Xen hypervisor, and will be selected instead when running under Xen. -Package: libc0.1-i686 -Architecture: kfreebsd-i386 -Section: libs -Priority: extra -Multi-Arch: same -Pre-Depends: libc0.1 (= ${binary:Version}) -Depends: ${misc:Depends} -Build-Profiles: <!stage1> -Description: 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 Ezra). - Package: libc6.1-alphaev67 Architecture: alpha Section: libs diff --git a/debian/patches/i386/submitted-i686-timing.diff b/debian/patches/i386/submitted-i686-timing.diff deleted file mode 100644 index da37d07..0000000 --- a/debian/patches/i386/submitted-i686-timing.diff +++ /dev/null @@ -1,149 +0,0 @@ -# DP: Description: i386 ld.so gets sigsegv when i686 optimized library is used, -# because the structure size of rtld_global and rtld_global_ro -# are different due to HP_TIMING_AVAIL availability. -# This patch aligns those sizes for using i686 optimized library. -# DP: Author: Daniel Jacobowitz <[email protected]> -# DP: Upstream status: Pending -# DP: Status Details: -# DP: Date: 2003-10-03 (Updated 2003-10-12), (Updated 2005-01-02, 2005-03-03 gotom) - -2005-03-03 GOTO Masanori <[email protected]> - - * sysdeps/generic/ldsodefs.h (struct rtld_global, rtld_global_ro): - Include timing members if HP_TIMING_PAD is defined. - -2005-01-02 GOTO Masanori <[email protected]> - - * elf/Makefile: Regenerate. - -2003-10-12 Daniel Jacobowitz <[email protected]> - - * sysdeps/generic/ldsodefs.h (struct rtld_global): Include timing - members if HP_TIMING_PAD is defined. - * sysdeps/i386/hp-timing.h: New file. - * elf/Makefile: Add dl-altinit to routines, shared-only-routines. - * elf/dl-altinit.c: New file. - ---- - elf/Makefile | 6 +++++- - elf/dl-altinit.c | 43 +++++++++++++++++++++++++++++++++++++++++++ - sysdeps/generic/ldsodefs.h | 4 ++-- - sysdeps/i386/hp-timing.h | 34 ++++++++++++++++++++++++++++++++++ - 4 files changed, 84 insertions(+), 3 deletions(-) - ---- a/sysdeps/generic/ldsodefs.h -+++ b/sysdeps/generic/ldsodefs.h -@@ -322,7 +322,7 @@ struct rtld_global - /* The object to be initialized first. */ - EXTERN struct link_map *_dl_initfirst; - --#if HP_SMALL_TIMING_AVAIL -+#if HP_SMALL_TIMING_AVAIL || defined HP_TIMING_PAD - /* Start time on CPU clock. */ - EXTERN hp_timing_t _dl_cpuclock_offset; - #endif ---- /dev/null -+++ b/sysdeps/i386/hp-timing.h -@@ -0,0 +1,34 @@ -+/* High precision, low overhead timing functions. i386 version. -+ Copyright (C) 2003 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#ifndef _i386_HP_TIMING_H -+#define _i386_HP_TIMING_H 1 -+ -+#define hp_timing_t hp_timing_t__ -+#include <sysdeps/generic/hp-timing.h> -+#undef hp_timing_t -+ -+/* We don't use high-precision timers, but we might load an i686 libpthread -+ which does. */ -+#define HP_TIMING_PAD 1 -+ -+/* i686 uses 64bit values for the times. */ -+typedef unsigned long long int hp_timing_t; -+ -+#endif /* hp-timing.h */ ---- /dev/null -+++ b/elf/dl-altinit.c -@@ -0,0 +1,43 @@ -+/* Extra initializers for shared libc. -+ Copyright (C) 2003 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#include <ldsodefs.h> -+#include <hp-timing.h> -+ -+/* This file is used from the shared libc, to initialize anything which -+ ld.so should have initialized but didn't - for instance, if ld.so -+ is built for a machine without HP_TIMING but libc.so is built for -+ a machine with HP_TIMING, clock_gettime will expect dl_cpuclock_offset -+ to be initialized. */ -+ -+static void -+dlinit_hptiming (void) -+{ -+#if HP_SMALL_TIMING_AVAIL -+ if (GL(dl_cpuclock_offset) == 0) -+ HP_TIMING_NOW (GL(dl_cpuclock_offset)); -+#endif -+} -+ -+static void dlinit_alt (void) __attribute__((constructor)); -+static void -+dlinit_alt (void) -+{ -+ dlinit_hptiming (); -+} ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -24,7 +24,7 @@ include ../Makeconfig - headers = elf.h bits/elfclass.h link.h bits/link.h - routines = $(all-dl-routines) dl-support dl-iteratephdr \ - dl-addr enbl-secure dl-profstub \ -- dl-origin dl-libc dl-sym dl-tsd dl-sysdep -+ dl-origin dl-libc dl-sym dl-tsd dl-sysdep dl-altinit - - # The core dynamic linking functions are in libc for the static and - # profiled libraries. -@@ -50,6 +50,10 @@ CFLAGS-dl-runtime.c = -fexceptions -fasy - CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables - CFLAGS-dl-iterate-phdr.c = $(uses-callbacks) - -+# We only need to re-run initializers if ld.so and libc.so might be built -+# for different machines, so only shared libraries need dl-altinit. -+shared-only-routines += dl-altinit -+ - ifeq ($(unwind-find-fde),yes) - routines += unwind-dw2-fde-glibc - shared-only-routines += unwind-dw2-fde-glibc diff --git a/debian/patches/series b/debian/patches/series index 09fc577..9fab432 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -160,7 +160,6 @@ i386/local-biarch.diff i386/local-cmov.diff i386/local-cpuid-level2.diff i386/local-i386-ulps.diff -i386/submitted-i686-timing.diff i386/unsubmitted-quiet-ldconfig.diff kfreebsd/submitted-waitid.diff diff --git a/debian/rules b/debian/rules index 91cc222..48eae00 100755 --- a/debian/rules +++ b/debian/rules @@ -38,10 +38,10 @@ export SHELL = /bin/bash -e DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_ENDIAN ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_ENDIAN) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_GNU_TYPE ?= $(subst i586,i686,$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(subst i586,i686,$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)) DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')) diff --git a/debian/sysdeps/hurd-i386.mk b/debian/sysdeps/hurd-i386.mk index 48b022f..d5e72ee 100644 --- a/debian/sysdeps/hurd-i386.mk +++ b/debian/sysdeps/hurd-i386.mk @@ -1,20 +1,7 @@ -## 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. -#GLIBC_PASSES += i686 -#DEB_ARCH_REGULAR_PACKAGES += libc0.3-i686 -#i686_configure_target=i686-gnu -#i686_CC = $(CC) -march=i686 -mtune=generic -#i686_CXX = $(CXX) -march=i686 -mtune=generic -#i686_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov -#i686_extra_config_options = $(extra_config_options) --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. #GLIBC_PASSES += xen #DEB_ARCH_REGULAR_PACKAGES += libc0.3-xen -#xen_configure_target=i686-gnu -#xen_CC = $(CC) -march=i686 -mtune=generic -#xen_CXX = $(CXX) -march=i686 -mtune=generic #xen_extra_cflags = -mno-tls-direct-seg-refs #xen_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/nosegneg # diff --git a/debian/sysdeps/i386.mk b/debian/sysdeps/i386.mk index 59d5748..72a5a49 100644 --- a/debian/sysdeps/i386.mk +++ b/debian/sysdeps/i386.mk @@ -2,22 +2,10 @@ extra_config_options = --enable-multi-arch --enable-lock-elision MIN_KERNEL_SUPPORTED := 2.6.32 -# 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. -GLIBC_PASSES += i686 -DEB_ARCH_REGULAR_PACKAGES += libc6-i686 -i686_configure_target=i686-linux-gnu -i686_CC = $(CC) -march=i686 -mtune=generic -i686_CXX = $(CXX) -march=i686 -mtune=generic -i686_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov - # 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. GLIBC_PASSES += xen DEB_ARCH_REGULAR_PACKAGES += libc6-xen -xen_configure_target=i686-linux-gnu -xen_CC = $(CC) -march=i686 -mtune=generic -xen_CXX = $(CXX) -march=i686 -mtune=generic xen_extra_cflags = -mno-tls-direct-seg-refs xen_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/nosegneg diff --git a/debian/sysdeps/kfreebsd-i386.mk b/debian/sysdeps/kfreebsd-i386.mk deleted file mode 100644 index d676979..0000000 --- a/debian/sysdeps/kfreebsd-i386.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build a 32-bit optimized library -GLIBC_PASSES += i686 -DEB_ARCH_REGULAR_PACKAGES += libc0.1-i686 - -# 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. -i686_add-ons = $(libc_add-ons) -i686_configure_target=i686-kfreebsd-gnu -i686_CC = $(CC) -march=i686 -mtune=generic -i686_CXX = $(CXX) -march=i686 -mtune=generic -i686_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
