[glibc] 01/02: Merge branch 'sid' into glibc-2.26
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.26
in repository glibc.
commit 88d1ef7f9081547a89d0afaca81108a4a5a8146b
Merge: 315855e 9460f85
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed Nov 22 00:21:23 2017 +0100
Merge branch 'sid' into glibc-2.26
debian/changelog | 24 +++++++++++-
debian/control | 52 +++++++++++++-------------
debian/control.in/libc | 6 +--
debian/control.in/mips32 | 8 ++--
debian/control.in/mips64 | 4 +-
debian/control.in/mipsn32 | 6 +--
debian/libc6-mips32.symbols.mips64 | 5 +++
debian/libc6-mips32.symbols.mips64r6 | 5 +++
debian/libc6-mips32.symbols.mips64r6el | 5 +++
debian/libc6-mips32.symbols.mipsn32 | 5 +++
debian/libc6-mips32.symbols.mipsn32el | 5 +++
debian/libc6-mips32.symbols.mipsn32r6 | 5 +++
debian/libc6-mips32.symbols.mipsn32r6el | 5 +++
debian/libc6-mips64.symbols.mipsn32 | 5 +++
debian/libc6-mips64.symbols.mipsn32el | 5 +++
debian/libc6-mips64.symbols.mipsn32r6 | 5 +++
debian/libc6-mips64.symbols.mipsn32r6el | 5 +++
debian/libc6-mips64.symbols.mipsr6 | 5 +++
debian/libc6-mips64.symbols.mipsr6el | 5 +++
debian/libc6-mipsn32.symbols.mips64 | 5 +++
debian/libc6-mipsn32.symbols.mips64r6 | 5 +++
debian/libc6-mipsn32.symbols.mips64r6el | 5 +++
debian/libc6-mipsn32.symbols.mipsr6 | 5 +++
debian/libc6-mipsn32.symbols.mipsr6el | 5 +++
debian/libc6.symbols.mips64 | 5 +++
debian/libc6.symbols.mips64r6 | 5 +++
debian/libc6.symbols.mips64r6el | 5 +++
debian/libc6.symbols.mipsn32 | 5 +++
debian/libc6.symbols.mipsn32el | 5 +++
debian/libc6.symbols.mipsn32r6 | 5 +++
debian/libc6.symbols.mipsn32r6el | 5 +++
debian/libc6.symbols.mipsr6 | 5 +++
debian/libc6.symbols.mipsr6el | 5 +++
debian/rules.d/control.mk | 3 +-
debian/script.in/nohwcap.sh | 30 ++++-----------
debian/sysdeps/mips64r6.mk | 64 ++++++++++++++++++++++++++++++++
debian/sysdeps/mips64r6el.mk | 64 ++++++++++++++++++++++++++++++++
debian/sysdeps/mipsn32r6.mk | 66 +++++++++++++++++++++++++++++++++
debian/sysdeps/mipsn32r6el.mk | 64 ++++++++++++++++++++++++++++++++
debian/sysdeps/mipsr6.mk | 60 ++++++++++++++++++++++++++++++
debian/sysdeps/mipsr6el.mk | 60 ++++++++++++++++++++++++++++++
debian/testsuite-xfail-debian.mk | 1 +
42 files changed, 584 insertions(+), 63 deletions(-)
diff --cc debian/changelog
index b8b8faf,99ff907..4f82917
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,141 -1,4 +1,141 @@@
+glibc (2.26-0experimental1) UNRELEASED; urgency=medium
+
+ [ Samuel Thibault ]
+ * debian/testsuite-xfail-debian.mk: Update hurd-i386 xfail with new test.
+
+ [ Aurelien Jarno ]
+ * Bump build-dependency on binutils to >= 2.25, as required by glibc 2.26.
+ * debian/testsuite-xfail-debian.mk: re-add double-lround XFAILs for
+ mips64el.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 19 Nov 2017 13:44:52 +0100
+
+glibc (2.26-0experimental0) experimental; urgency=medium
+
+ [ Adam Conrad ]
+ * New upstream release (LP: #1703368), with git updates to 2017-10-10:
+ - debian/{symbols.wildcards,control}: Update and regen for 2.26.
+ - debian/patches/alpha/submitted-termios_h.diff: upstreamed.
+ - debian/patches/arm/submitted-strip-bit-0.diff: upstreamed.
+ - debian/patches/hurd-i386/git-__inet6_scopeid_pton.diff: upstreamed.
+ - debian/patches/any/submitted-string2-strcmp.diff: obsolete.
+ - debian/patches/any/local-tst-writev.diff: fixed upstream.
+ - debian/patches/any/local-dynamic-resolvconf.diff: fixed upstream.
+ - debian/patches/any/submitted-unicode-9.0.0.diff: obsolete.
+ - debian/patches/any/cvs-malloc-hardening.diff: upstreamed.
+ - debian/patches/any/local-bits-sigstack.diff: fixed upstream.
+ - debian/patches/powerpc/submitted-tst-tlsopt-powerpc.diff: upstreamed.
+ - debian/patches/i386/local-cmov.diff: dropped, no longer useful.
+ - debian/patches/all/local-ldd.diff: rebased.
+ - debian/patches/any/local-ldso-disable-hwcap.diff: rebased.
+ - debian/patches/any/local-tcsetaddr.diff: rebased.
+ - debian/patches/any/submitted-resolv-unaligned.diff: rebased.
+ - debian/patches/arm/local-arm-futex.diff: rebased.
+ - debian/patches/hurd-i386/local-ED.diff: rebased.
+ - debian/patches/hurd-i386/tg-EGREGIOUS-fr.diff: rebased.
+ - debian/patches/hurd-i386/tg-EIEIO-fr.diff: rebased.
+ - debian/patches/kfreebsd/submitted-auxv.diff: rebased.
+ - debian/patches/kfreebsd/submitted-waitid.diff: rebased.
+ - debian/patches/localedata/locales-fr.diff: rebased.
+ - debian/patches/sparc/submitted-sparc64-socketcall.diff: rebased.
+ - debian/patches/localedata/local-hu_HU-sort.diff: Make testsuite
+ agree with the sorting we see in Debian, may need another look.
+ - debian/patches/any/local-cudacc-float128.diff: Local patch to prevent
+ defining __HAVE_FLOAT128 on NVIDIA's CUDA compilers (LP: #1717257)
+ - debian/patches/arm/git-arm64-memcmp.diff: Backport optimized memcmp
+ for AArch64, improving performance from 25% to 500% (LP: #1720832)
+ - debian/control.in/libc: Drop ancient Breaks satisfied in oldoldstable.
+ - debian/{debhelper.in/libc.preinst,sysdeps/amd64.mk,sysdeps/i386.mk}:
+ Bump MIN_KERNEL_SUPPORTED to 3.2 on x86, following upstream's change.
+ - debian/sysdeps/{powerpc.mk,ppc64.mk,s390x.mk}: Disable lock-elision on
+ powerpc and s390, following IBM's recommendation.
+ - debian/testsuite-xfail-debian.mk: Re-enable xfailed resolv tests.
+ - debian/testsuite-xfail-debian.mk: Allow tst-create-detached to fail on
+ all platforms; the design of this test is such that the outcome relies
+ on cache sizes and noisiness of the build system, which is unreliable.
+ - debian/rules.d/build.mk: Configure with --enable-obsolete-nsl until we
+ sort out a reasonable nsswitch migration strategy from compat to files.
+
+ [ Samuel Thibault ]
+ * Adjust hurd-i386 patches to restore build and functionality with 2.26:
+ - patches/hurd-i386/tg-gsync-libc.diff: rebased.
+ - patches/hurd-i386/tg-hurdsig-global-dispositions.diff: rebased.
+ - patches/hurd-i386/tg-pipe2.diff: rebased.
+ - patches/hurd-i386/tg-socket_flags.diff: rebased.
+ - patches/hurd-i386/tg2.25-tls.diff: rebased.
+ - patches/hurd-i386/tg2.26-sched_param.diff: New patch.
+ - patches/hurd-i386/git-sigsetops.h.diff: New patch.
+ - patches/hurd-i386/git-sigsetops-2.h.diff: New patch.
+ - patches/hurd-i386/git-sigsetops-3.h.diff: New patch.
+ - patches/hurd-i386/tg2.26-sigsetops.h.diff: New patch.
+ - patches/hurd-i386/git-bits_socket.h.diff: New patch.
+ - patches/hurd-i386/git-preadwritev2.diff: New patch.
+ - patches/hurd-i386/git-preadwritev2-2.diff: New patch.
+ - patches/hurd-i386/git-preadwritev2-3.diff: New patch.
+ - patches/hurd-i386/git-rtld-access.diff: New patch.
+ - patches/hurd-i386/git-rtld-sbrk.diff: New patch.
+ - patches/hurd-i386/git-rtld-sbrk-2.diff: New patch.
+ - patches/hurd-i386/git-divdi.diff: New patch.
+ - patches/hurd-i386/git-feraiseexcept.diff: New patch.
+ - patches/hurd-i386/cvs-libpthread.diff: Update.
+ - patches/hurd-i386/git-libpthread-2.26.diff: New patch.
+ - patches/hurd-i386/git-i386-implies-x86.diff: New patch.
+ - patches/hurd-i386/git-x86-tunables.diff: New patch.
+ - patches/hurd-i386/git-rtld-strtoul_internal.diff: New patch.
+ - patches/hurd-i386/git-clone.diff: New patch.
+ - patches/hurd-i386/git-gethostname.diff: New patch.
+ - patches/hurd-i386/cvs-libpthread-sigstate.diff: Remove unused merged
+ patch.
+ - patches/hurd-i386/cvs-send-recv-posix.diff: Remove unused merged patch.
+ - patches/hurd-i386/cvs-truncate64.diff: Remove unused merged patch.
+ - patches/hurd-i386/git-tst-udp-timeout.diff: New patch.
+ - patches/hurd-i386/git-tst-udp-nonblocking.diff: New patch.
+ - patches/hurd-i386/unsubmitted-exp-hidden-jump.diff: New patch.
+ - patches/hurd-i386/git-hidden-def.diff: New patch.
+ - patches/hurd-i386/git-hidden-def.diff-2: New patch.
+ - patches/hurd-i386/git-dl-sysdep-check.diff: New patch.
+ - patches/hurd-i386/git-socket-limit.diff: New patch.
+ - patches/hurd-i386/tg-thread-linkspace.diff: New patch.
+ - patches/hurd-i386/git-clock_gettime_gettimeofday.diff: New patch.
+ - patches/hurd-i386/tg-gsync-libc.diff: Update.
+ - patches/hurd-i386/tg-libpthread-gsync-mutex.diff: Update.
+ - patches/hurd-i386/tg-sendmsg-SCM_CREDS.diff: Update.
+ - patches/hurd-i386/git-sigsuspend_not_cancel.diff: New patch.
+ - patches/hurd-i386/tg-sysvshm.diff: Update.
+ - patches/hurd-i386/tg-ifaddrs_v6.diff: Update.
+ - patches/hurd-i386/git-dirfd-linknamespace.diff: New patch.
+ - patches/hurd-i386/git-revoke-linknamespace.diff: New patch.
+ - patches/hurd-i386/git-seekdir-linknamespace.diff: New patch.
+ - patches/hurd-i386/git-ifaddrs-linknamespace.diff: New patch.
+ - patches/hurd-i386/git-NO_HIDDEN.diff: New patch.
+ - patches/hurd-i386/unsubmitted-NO_HIDDEN.diff: Remove patch.
+ - patches/hurd-i386/unsubmitted-exp-hidden-jump.diff: Remove patch.
+ - testsuite-xfail-debian.mk: Update.
+ - testsuite-xfail-debian.mk: Remove now-removed XPG3 entries.
+
+ [ Aurelien Jarno ]
+ * debian/patches/git-updates.diff: update from upstream stable branch:
+ - Fix buffer overflow in glob with GLOB_TILDE (CVE-2017-15670). Closes:
+ #879501.
+ - Fix memory leak in glob with GLOB_TILDE (CVE-2017-15671). Closes:
+ #879500.
+ * debian/rules, debian/control.in/main: build with GCC 7.
+ * debian/testsuite-xfail-debian.mk: remove a few XFAIL on s390x that were
+ due to GCC 6 issues.
+ * debian/testsuite-xfail-debian.mk: drop support for s390.
+ * debian/testsuite-xfail-debian.mk: Use granular fma XFAIL on mips*.
+ * debian/testsuite-xfail-debian.mk: mark misc/tst-set_ppr as XFAIL on
+ powerpc as it requires a recent CPU or a recent kernel for CPU feature
+ detection.
+ * debian/patches/any/local-libgcc-compat-{abilists,main,ports}.diff: drop
+ workaround for binaries built with some broken versions of GCC 3.2 more
+ than 10 years ago.
+ * debian/testsuite-xfail-debian.mk: remove many XFAIL from mips, mipsel and
+ mips64el.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 19 Nov 2017 12:49:13 +0100
+
- glibc (2.25-2) UNRELEASED; urgency=medium
+ glibc (2.25-2) unstable; urgency=medium
[ Aurelien Jarno ]
* debian/testsuite-xfail-debian.mk: move corner cases FPU XFAIL from
diff --cc debian/control
index e138fc8,d0f207d..7157503
--- a/debian/control
+++ b/debian/control
@@@ -157,15 -158,15 +157,15 @@@ Description: Transitional package to en
be removed once nothing on the system depends on it.
Package: libc6
--Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
++Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
Section: libs
Priority: required
Multi-Arch: same
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
- Conflicts: libc6-loongson2f [mipsel]
+ Conflicts: libc6-loongson2f [mipsel], openrc (<< 0.27-2~)
-Breaks: nscd (<< 2.25), locales (<< 2.25), locales-all (<< 2.25), 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)
+Breaks: nscd (<< 2.26), locales (<< 2.26), locales-all (<< 2.26), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i686 [kfreebsd-i386],
@@@ -188,7 -189,7 +188,7 @@@ Description: GNU C Library: Shared libr
and the standard math library, as well as many others.
Package: libc6-dev
--Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
++Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
Section: libdevel
Priority: optional
Multi-Arch: same
@@@ -203,7 -204,7 +203,7 @@@ Description: GNU C Library: Developmen
and link programs which use the standard C library.
Package: libc6-dbg
--Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
++Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
Section: debug
Priority: optional
Multi-Arch: same
@@@ -215,7 -216,7 +215,7 @@@ Description: GNU C Library: detached de
library.
Package: libc6-pic
--Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
++Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
Section: libdevel
Priority: optional
Multi-Arch: same
@@@ -231,7 -232,7 +231,7 @@@ Description: GNU C Library: PIC archiv
Package: libc6-udeb
Package-Type: udeb
--Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
++Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
Section: debian-installer
Priority: optional
Provides: libc6, libc-udeb, libnss-dns-udeb, libnss-files-udeb, ${locale-compat:Depends}
@@@ -252,8 -253,8 +252,8 @@@ Multi-Arch: sam
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
- Conflicts: libc6-loongson2f [mipsel]
+ Conflicts: libc6-loongson2f [mipsel], openrc (<< 0.27-2~)
-Breaks: nscd (<< 2.25), locales (<< 2.25), locales-all (<< 2.25), 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)
+Breaks: nscd (<< 2.26), locales (<< 2.26), locales-all (<< 2.26), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i686 [kfreebsd-i386],
@@@ -340,8 -341,8 +340,8 @@@ Multi-Arch: sam
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
- Conflicts: libc6-loongson2f [mipsel]
+ Conflicts: libc6-loongson2f [mipsel], openrc (<< 0.27-2~)
-Breaks: nscd (<< 2.25), locales (<< 2.25), locales-all (<< 2.25), 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)
+Breaks: nscd (<< 2.26), locales (<< 2.26), locales-all (<< 2.26), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i686 [kfreebsd-i386],
@@@ -428,8 -429,8 +428,8 @@@ Multi-Arch: sam
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
- Conflicts: libc6-loongson2f [mipsel]
+ Conflicts: libc6-loongson2f [mipsel], openrc (<< 0.27-2~)
-Breaks: nscd (<< 2.25), locales (<< 2.25), locales-all (<< 2.25), 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)
+Breaks: nscd (<< 2.26), locales (<< 2.26), locales-all (<< 2.26), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i686 [kfreebsd-i386],
@@@ -678,7 -679,7 +678,7 @@@ Description: GNU C Library: 64bit Devel
library, meant for PowerPC64 systems.
Package: libc6-mips32
--Architecture: mipsn32 mipsn32el mips64 mips64el
++Architecture: mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
@@@ -689,13 -690,13 +689,13 @@@ Description: GNU C Library: o32 Shared
of the library, meant for MIPS systems.
Package: libc6-dev-mips32
--Architecture: mipsn32 mipsn32el mips64 mips64el
++Architecture: mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
Section: libdevel
Priority: optional
Provides: lib32c-dev
Depends: libc6-dev (= ${binary:Version}), libc6-mips32 (= ${binary:Version}),
-- libc6-dev-mipsn32 (= ${binary:Version}) [mips64 mips64el],
-- libc6-dev-mips64 (= ${binary:Version}) [mipsn32 mipsn32el],
++ libc6-dev-mipsn32 (= ${binary:Version}) [mips64 mips64el mips64r6 mips64r6el],
++ libc6-dev-mips64 (= ${binary:Version}) [mipsn32 mipsn32el mipsn32r6 mipsn32r6el],
${misc:Depends}
Recommends: gcc-multilib
Build-Profiles: <!nobiarch>
@@@ -705,7 -706,7 +705,7 @@@ Description: GNU C Library: o32 Develop
library, meant for MIPS systems.
Package: libc6-mipsn32
--Architecture: mips mipsel mips64 mips64el
++Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
@@@ -716,11 -717,11 +716,11 @@@ Description: GNU C Library: n32 Shared
of the library, meant for MIPS64 systems.
Package: libc6-dev-mipsn32
--Architecture: mips mipsel mips64 mips64el
++Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
Section: libdevel
Priority: optional
Provides: libn32c-dev
--Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev-mips64 (= ${binary:Version}) [mips mipsel], libc6-dev (= ${binary:Version}), ${misc:Depends}
++Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev-mips64 (= ${binary:Version}) [mips mipsel mipsr6 mipsr6el], libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Build-Profiles: <!nobiarch>
Description: GNU C Library: n32 Development Libraries for MIPS64
@@@ -729,7 -730,7 +729,7 @@@
library, meant for MIPS64 systems.
Package: libc6-mips64
--Architecture: mips mipsel mipsn32 mipsn32el
++Architecture: mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
@@@ -740,7 -741,7 +740,7 @@@ Description: GNU C Library: 64bit Share
of the library, meant for MIPS64 systems.
Package: libc6-dev-mips64
--Architecture: mips mipsel mipsn32 mipsn32el
++Architecture: mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el
Section: libdevel
Priority: optional
Provides: lib64c-dev
diff --cc debian/control.in/libc
index 1edc0f1,9d4138c..6fb3385
--- a/debian/control.in/libc
+++ b/debian/control.in/libc
@@@ -6,8 -6,8 +6,8 @@@ Multi-Arch: sam
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
- Conflicts: libc6-loongson2f [mipsel]
+ Conflicts: libc6-loongson2f [mipsel], openrc (<< 0.27-2~)
-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)
+Breaks: nscd (<< @GLIBC_VERSION@), locales (<< @GLIBC_VERSION@), locales-all (<< @GLIBC_VERSION@), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
libc0.1-i686 [kfreebsd-i386],
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: