This is an automated email from the git hooks/post-receive script. aurel32 pushed a commit to branch sid in repository glibc.
commit ee6ffabef0baa307624c273367706d1bc261770e Author: Aurelien Jarno <aurel...@aurel32.net> Date: Sun Nov 6 22:08:07 2016 +0100 debian/patches/git-updates.diff: update from upstream stable branch: * debian/patches/git-updates.diff: update from upstream stable branch: - Fix flexible array usage in gconv.h. Closes: #841304. --- debian/changelog | 1 + debian/patches/git-updates.diff | 72 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c16da4f..93d0f09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ glibc (2.24-6) UNRELEASED; urgency=medium [ Aurelien Jarno ] * debian/patches/git-updates.diff: update from upstream stable branch: - Fix pread/pwrite syscalls on SH4. + - Fix flexible array usage in gconv.h. Closes: #841304. -- Aurelien Jarno <aure...@debian.org> Tue, 18 Oct 2016 23:17:42 +0200 diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff index b8f5f85..106df6b 100644 --- a/debian/patches/git-updates.diff +++ b/debian/patches/git-updates.diff @@ -1,10 +1,27 @@ 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..b2f6372 100644 +index c44c926..a51771c 100644 --- a/ChangeLog +++ b/ChangeLog -@@ -1,3 +1,168 @@ +@@ -1,3 +1,185 @@ ++2016-11-03 Joseph Myers <jos...@codesourcery.com> ++ ++ * conform/Makefile ($(linknamespace-header-tests)): Also depend on ++ $(linknamespace-symlists-tests). ++ ++2016-11-06 Aurelien Jarno <aurel...@aurel32.net> ++ ++ * iconv/gconv.h (__gconv_info): Define __data element using a ++ zero-length array. ++ ++2016-10-25 Joseph Myers <jos...@codesourcery.com> ++ ++ * sysdeps/powerpc/powerpc32/power6/memset.S (memset): Use cmplwi ++ instead of cmpli. ++ * sysdeps/powerpc/powerpc64/power6/memset.S (memset): Use cmpldi ++ instead of cmpli. ++ +2016-10-24 Adhemerval Zanella <adhemerval.zane...@linaro.org> + + * sysdeps/unix/sysv/linux/pread.c (__libc_pread): Use SYSCALL_LL_PRW. @@ -303,6 +320,31 @@ index e67bbef..7cb5a69 100644 +__END_DECLS #endif /* argp.h */ +diff --git a/conform/Makefile b/conform/Makefile +index 32a0937..762aac9 100644 +--- a/conform/Makefile ++++ b/conform/Makefile +@@ -229,6 +229,7 @@ $(linknamespace-symlist-stdlibs-tests): $(objpfx)symlist-stdlibs-%: \ + + $(linknamespace-header-tests): $(objpfx)%/linknamespace.out: \ + linknamespace.pl \ ++ $(linknamespace-symlists-tests) \ + $(linknamespace-symlist-stdlibs-tests) + (set -e; std_hdr=$*; std=$${std_hdr%%/*}; hdr=$${std_hdr#*/}; \ + mkdir -p $(@D)/scratch; \ +diff --git a/iconv/gconv.h b/iconv/gconv.h +index 8d8ce58..a870280 100644 +--- a/iconv/gconv.h ++++ b/iconv/gconv.h +@@ -139,7 +139,7 @@ typedef struct __gconv_info + { + size_t __nsteps; + struct __gconv_step *__steps; +- __extension__ struct __gconv_step_data __data __flexarr; ++ __extension__ struct __gconv_step_data __data[0]; + } *__gconv_t; + + /* Transliteration using the locale's data. */ diff --git a/malloc/arena.c b/malloc/arena.c index 229783f..4e16593 100644 --- a/malloc/arena.c @@ -1786,6 +1828,19 @@ index 526d8ed..ac589bd 100644 return ret; } #endif +diff --git a/sysdeps/powerpc/powerpc32/power6/memset.S b/sysdeps/powerpc/powerpc32/power6/memset.S +index b2a222e..d5dbe83 100644 +--- a/sysdeps/powerpc/powerpc32/power6/memset.S ++++ b/sysdeps/powerpc/powerpc32/power6/memset.S +@@ -394,7 +394,7 @@ L(cacheAlignedx): + /* A simple loop for the longer (>640 bytes) lengths. This form limits + the branch miss-predicted to exactly 1 at loop exit.*/ + L(cacheAligned512): +- cmpli cr1,rLEN,128 ++ cmplwi cr1,rLEN,128 + blt cr1,L(cacheAligned1) + dcbz 0,rMEMP + addi rLEN,rLEN,-128 diff --git a/sysdeps/powerpc/powerpc32/power9/multiarch/Implies b/sysdeps/powerpc/powerpc32/power9/multiarch/Implies index 4393b56..1a46ef0 100644 --- a/sysdeps/powerpc/powerpc32/power9/multiarch/Implies @@ -1793,6 +1848,19 @@ index 4393b56..1a46ef0 100644 @@ -1 +1 @@ -powerpc/powerpc32/power8/fpu/multiarch +powerpc/powerpc32/power8/multiarch +diff --git a/sysdeps/powerpc/powerpc64/power6/memset.S b/sysdeps/powerpc/powerpc64/power6/memset.S +index c2d1c4e..d445b1e 100644 +--- a/sysdeps/powerpc/powerpc64/power6/memset.S ++++ b/sysdeps/powerpc/powerpc64/power6/memset.S +@@ -251,7 +251,7 @@ L(cacheAlignedx): + /* A simple loop for the longer (>640 bytes) lengths. This form limits + the branch miss-predicted to exactly 1 at loop exit.*/ + L(cacheAligned512): +- cmpli cr1,rLEN,128 ++ cmpldi cr1,rLEN,128 + blt cr1,L(cacheAligned1) + dcbz 0,rMEMP + addi rLEN,rLEN,-128 diff --git a/sysdeps/powerpc/powerpc64/power9/fpu/Implies b/sysdeps/powerpc/powerpc64/power9/fpu/Implies index fad2505..ae0dbaf 100644 --- a/sysdeps/powerpc/powerpc64/power9/fpu/Implies -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git