[glibc] 01/01: Update from upstream stable branch:
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit a09b70aefd4d52fb68df069c1fd5ef5af7fcdd92
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Jun 19 22:27:24 2016 +0200
Update from upstream stable branch:
* Update from upstream stable branch:
- fix FTBFS with recent binutils versions on mips* and sparc*. Closes:
#827477.
---
debian/changelog | 3 +++
debian/patches/git-updates.diff | 50 +++++++++++++++++++++++++++++++++++++++--
2 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0c2511e..a3d24bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
glibc (2.22-12) UNRELEASED; urgency=medium
[ Aurelien Jarno ]
+ * Update from upstream stable branch:
+ - fix FTBFS with recent binutils versions on mips* and sparc*. Closes:
+ #827477.
* debian/sysdeps/kfreebsd-i386.mk: fix libc0.1-i686 package name.
* debian/rules.d/build.mk: in case of build failure due testsuite
issues, display again the failed tests so that they appear at the end of
diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff
index 09d0e2b..58bb38c 100644
--- a/debian/patches/git-updates.diff
+++ b/debian/patches/git-updates.diff
@@ -1,10 +1,17 @@
GIT update of git://sourceware.org/git/glibc.git/release/2.22/master from glibc-2.22
diff --git a/ChangeLog b/ChangeLog
-index cb9124e..2d55a22 100644
+index cb9124e..0d3a802 100644
--- a/ChangeLog
+++ b/ChangeLog
-@@ -1,3 +1,678 @@
+@@ -1,3 +1,685 @@
++2016-06-18 Aurelien Jarno <aurelien@aurel32.net>
++
++ * sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Conditionalize
++ hidden_def, weak_alias and strong_alias on [IS_IN (libc)].
++ * sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise.
++ * sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise.
++
+2016-01-22 Stefan Liebler <stli@linux.vnet.ibm.com>
+
+ * string/tst-endian.c: Include <libc-internal.h>.
@@ -7149,6 +7156,19 @@ index 83c0340..9d5c542 100644
#endif /* not __ASSEMBLER__ */
+
+#endif /* _LINUX_MICROBLAZE_SYSDEP_H */
+diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S
+index 8915bea..60a9131 100644
+--- a/sysdeps/unix/sysv/linux/mips/vfork.S
++++ b/sysdeps/unix/sysv/linux/mips/vfork.S
+@@ -106,6 +106,8 @@ L(error):
+ #endif
+ END(__vfork)
+
++#if IS_IN (libc)
+ libc_hidden_def(__vfork)
+ weak_alias (__vfork, vfork)
+ strong_alias (__vfork, __libc_vfork)
++#endif
diff --git a/sysdeps/unix/sysv/linux/openat.c b/sysdeps/unix/sysv/linux/openat.c
index 6777123..ad8e31d 100644
--- a/sysdeps/unix/sysv/linux/openat.c
@@ -7357,6 +7377,32 @@ index 5b8c102..9f03d26 100644
-shutdown - shutdown i:ii __shutdown shutdown
-socket - socket i:iii __socket socket
-socketpair - socketpair i:iiif __socketpair socketpair
+diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
+index e71ecbc..3727877 100644
+--- a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
++++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
+@@ -44,6 +44,8 @@ ENTRY(__vfork)
+ nop
+ END(__vfork)
+
++#if IS_IN (libc)
+ libc_hidden_def (__vfork)
+ weak_alias (__vfork, vfork)
+ strong_alias (__vfork, __libc_vfork)
++#endif
+diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
+index 6939ba3..7bf5165 100644
+--- a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
++++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
+@@ -44,6 +44,8 @@ ENTRY(__vfork)
+ nop
+ END(__vfork)
+
++#if IS_IN (libc)
+ libc_hidden_def (__vfork)
+ weak_alias (__vfork, vfork)
+ strong_alias (__vfork, __libc_vfork)
++#endif
diff --git a/sysdeps/x86/fpu/bits/math-vector.h b/sysdeps/x86/fpu/bits/math-vector.h
index f9e798b..f3bfb86 100644
--- a/sysdeps/x86/fpu/bits/math-vector.h
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: