[glibc] 01/01: debian/patches/git-updates.diff: 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 7d688f681547d62669f80bb9a2893f953cb64016
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat Sep 3 22:33:33 2016 +0200
debian/patches/git-updates.diff: update from upstream stable branch.
---
debian/changelog | 1 +
debian/patches/git-updates.diff | 64 +++++++++++++++++++++++++++++++++++++++--
2 files changed, 63 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 051c3c8..11e8610 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ glibc (2.24-2) UNRELEASED; urgency=medium
* debian/patches/any/submitted-perl-inc.diff: new patch to fix the
testsuite with perl (>= 5.22.2-4), which removed '.' from @INC by
default.
+ * debian/patches/git-updates.diff: update from upstream stable branch.
-- Aurelien Jarno <aurel32@debian.org> Wed, 31 Aug 2016 17:58:05 +0200
diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff
index 32644e6..d2b8fd4 100644
--- a/debian/patches/git-updates.diff
+++ b/debian/patches/git-updates.diff
@@ -1,10 +1,25 @@
GIT update of git://sourceware.org/git/glibc.git/release/2.24/master from glibc-2.24
diff --git a/ChangeLog b/ChangeLog
-index c44c926..3af5852 100644
+index c44c926..7521d86 100644
--- a/ChangeLog
+++ b/ChangeLog
-@@ -1,3 +1,114 @@
+@@ -1,3 +1,129 @@
++2016-09-02 Roland McGrath <roland@hack.frob.com>
++
++ * sysdeps/arm/nacl/libc.abilist: Add GLIBC_2.24 A.
++
++ * sysdeps/nacl/dup.c: Add libc_hidden_def.
++
++2016-09-02 Roland McGrath <roland@hack.frob.com>
++
++ * sysdeps/posix/wait3.c: Don't treat STAT_LOC as a union, since it's
++ not any more.
++
++2016-09-02 Roland McGrath <roland@hack.frob.com>
++
++ * sysdeps/nacl/clock.c (clock): nacl_abi_clock_t -> nacl_irt_clock_t
++
+2016-08-17 Florian Weimer <fweimer@redhat.com>
+
+ Reduce time to expected nptl/tst-once5 failure.
@@ -1105,6 +1120,16 @@ index 49d1f23..e046577 100644
-
-#~ msgid "cannot create internal descriptors"
-#~ msgstr "kan inte skapa interna deskriptorer"
+diff --git a/sysdeps/arm/nacl/libc.abilist b/sysdeps/arm/nacl/libc.abilist
+index 2f7751d..dfa7198 100644
+--- a/sysdeps/arm/nacl/libc.abilist
++++ b/sysdeps/arm/nacl/libc.abilist
+@@ -1840,4 +1840,5 @@ GLIBC_2.23 fts64_close F
+ GLIBC_2.23 fts64_open F
+ GLIBC_2.23 fts64_read F
+ GLIBC_2.23 fts64_set F
++GLIBC_2.24 GLIBC_2.24 A
+ GLIBC_2.24 quick_exit F
diff --git a/sysdeps/ia64/nptl/Makefile b/sysdeps/ia64/nptl/Makefile
index 48f1327..1e6be8e 100644
--- a/sysdeps/ia64/nptl/Makefile
@@ -1137,6 +1162,41 @@ index 117744f..dda154d 100644
libpthread-sysdep_routines += nptl-sysdep
+libpthread-shared-only-routines += nptl-sysdep
endif
+diff --git a/sysdeps/nacl/clock.c b/sysdeps/nacl/clock.c
+index 664ad65..b6fbcfd 100644
+--- a/sysdeps/nacl/clock.c
++++ b/sysdeps/nacl/clock.c
+@@ -24,6 +24,6 @@
+ clock_t
+ clock (void)
+ {
+- nacl_abi_clock_t result;
++ nacl_irt_clock_t result;
+ return NACL_CALL (__nacl_irt_basic.clock (&result), result);
+ }
+diff --git a/sysdeps/nacl/dup.c b/sysdeps/nacl/dup.c
+index 34a7cd4..cbce3f5 100644
+--- a/sysdeps/nacl/dup.c
++++ b/sysdeps/nacl/dup.c
+@@ -27,4 +27,5 @@ __dup (int fd)
+ int result;
+ return NACL_CALL (__nacl_irt_fdio.dup (fd, &result), result);
+ }
++libc_hidden_def (__dup)
+ weak_alias (__dup, dup)
+diff --git a/sysdeps/posix/wait3.c b/sysdeps/posix/wait3.c
+index cf43d97..73722d2 100644
+--- a/sysdeps/posix/wait3.c
++++ b/sysdeps/posix/wait3.c
+@@ -33,7 +33,7 @@ __wait3 (int *stat_loc, int options, struct rusage *usage)
+ __set_errno (ENOSYS);
+ return (pid_t) -1;
+ }
+- return __waitpid (WAIT_ANY, stat_loc.__iptr, options);
++ return __waitpid (WAIT_ANY, stat_loc, options);
+ }
+
+ weak_alias (__wait3, wait3)
diff --git a/sysdeps/powerpc/ifunc-sel.h b/sysdeps/powerpc/ifunc-sel.h
index 526d8ed..ac589bd 100644
--- a/sysdeps/powerpc/ifunc-sel.h
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: