This is an automated email from the git hooks/post-receive script. aurel32 pushed a commit to branch glibc-2.27 in repository glibc.
commit 761216c7785e6d23a08f624696e9e2a3e3ba18a6 Author: Aurelien Jarno <[email protected]> Date: Mon Jan 8 21:31:50 2018 +0100 New upstream snapshot from 20180108. --- debian/changelog | 13 +- debian/patches/hurd-i386/git-glob-PATH_MAX.diff | 22 ---- debian/patches/hurd-i386/git-glob64.diff | 134 --------------------- debian/patches/hurd-i386/git-hidden-def.diff | 42 ------- debian/patches/hurd-i386/git-jmp_buf-macros.h.diff | 20 --- .../hurd-i386/git-math-ulps-i386-update.diff | 90 -------------- debian/patches/hurd-i386/git-pwritev.diff | 26 ---- debian/patches/series | 6 - 8 files changed, 2 insertions(+), 351 deletions(-) diff --git a/debian/changelog b/debian/changelog index 906458d..557b50e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,28 +1,19 @@ -glibc (2.26.9000+20180105.a6d0afb5-0experimental1) UNRELEASED; urgency=medium +glibc (2.26.9000+20180108.401311cf-0experimental0) UNRELEASED; urgency=medium [ Samuel Thibault ] * debian/sysdeps/hurd.mk: Do not add libpthread add-on since add-ons mechanism is no more. * debian/patches/hurd-i386/submitted-net.diff: rebased. * debian/patches/hurd-i386/unsubmitted-prof-eintr.diff: rebased. - * debian/patches/hurd-i386/git-jmp_buf-macros.h.diff: New patch to fix - build. * debian/patches/hurd-i386/libpthread_build.diff: Add more Implies to fix build. Drop deprecated internal_function. * debian/patches/hurd-i386/libpthread_includes.diff: Move headers for sysdeps to find them. - * debian/patches/hurd-i386/git-glob64.diff: Fix glob symlink compatibility - for GNU. - * debian/patches/hurd-i386/git-hidden-def.diff: Fix reference to rtld hidden - symbol. * debian/patches/hurd-i386/tg-gsync-libc.diff: Update. - * debian/patches/hurd-i386/git-math-ulps-i386-update.diff: Update ULPs. - * debian/patches/hurd-i386/git-glob-PATH_MAX.diff: Fix posix glob test hurd - build. * debian/testsuite-xfail-debian.mk: Update for hurd-i386. - * debian/patches/hurd-i386/git-pwritev.diff: Fix pwritev regression. [ Aurelien Jarno ] + * New upstream snapshot from 20180108. * debian/control.in/main: Update Vcs-Git to point to the 2.27 branch. * debian/testsuite-xfail-debian.mk: update XFAILs for the mips*el Loongson 3 FPU bug with the new tests. diff --git a/debian/patches/hurd-i386/git-glob-PATH_MAX.diff b/debian/patches/hurd-i386/git-glob-PATH_MAX.diff deleted file mode 100644 index beafa87..0000000 --- a/debian/patches/hurd-i386/git-glob-PATH_MAX.diff +++ /dev/null @@ -1,22 +0,0 @@ -commit 01c7e549b2b978e69d6509864d4d067c555cb81b -Author: Samuel Thibault <[email protected]> -Date: Sat Jan 6 22:19:13 2018 +0100 - - hurd: Fix posix glob test - - * posix/tst-glob_symlinks.c [!PATH_MAX]: Define PATH_MAX macro. - -diff --git a/posix/tst-glob_symlinks.c b/posix/tst-glob_symlinks.c -index 0f3478d3d0..df3baa8757 100644 ---- a/posix/tst-glob_symlinks.c -+++ b/posix/tst-glob_symlinks.c -@@ -57,6 +57,9 @@ create_link (const char *base, const char *fname, char *linkname, - add_temp_file (linkname); - } - -+#ifndef PATH_MAX -+# define PATH_MAX 1024 -+#endif - static char valid_link[PATH_MAX]; - static char dangling_link[PATH_MAX]; - static char dangling_dir[PATH_MAX]; diff --git a/debian/patches/hurd-i386/git-glob64.diff b/debian/patches/hurd-i386/git-glob64.diff deleted file mode 100644 index c53224a..0000000 --- a/debian/patches/hurd-i386/git-glob64.diff +++ /dev/null @@ -1,134 +0,0 @@ -commit f417d92c1714406b85d887c96736801498962ff5 -Author: Samuel Thibault <[email protected]> -Date: Sat Jan 6 22:28:36 2018 +0100 - - hurd: Fix glob64 compatibility symbols - - This follows ccf970c7a ('posix: Add compat glob symbol to not follow - dangling symbols') by adding to gnu/ the same compatibility as for Linux. - - * sysdeps/gnu/glob64.c (__glob): Define macro instead of glob macro. - (__glob64): Define GLIBC_2_27 versioned symbol instead of glob64. - * sysdeps/gnu/glob-lstat-compat.c: New file. - * sysdeps/gnu/glob64-lstat-compat.c: New file. - -diff --git a/sysdeps/gnu/glob-lstat-compat.c b/sysdeps/gnu/glob-lstat-compat.c -new file mode 100644 -index 0000000000..7cb52d4fee ---- /dev/null -+++ b/sysdeps/gnu/glob-lstat-compat.c -@@ -0,0 +1,38 @@ -+/* Compat glob which does not use gl_lstat for GLOB_ALTDIRFUNC. -+ GNU version -+ Copyright (C) 2017-2018 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, see -+ <http://www.gnu.org/licenses/>. */ -+ -+#include <sys/stat.h> -+#include <shlib-compat.h> -+ -+#define glob64 __no_glob64_decl -+#include <glob.h> -+#undef glob64 -+ -+#define __glob __glob_lstat_compat -+ -+#define GLOB_ATTRIBUTE attribute_compat_text_section -+ -+/* Avoid calling gl_lstat with GLOB_ALTDIRFUNC. */ -+#define GLOB_NO_LSTAT -+ -+#include <posix/glob.c> -+ -+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_27) -+compat_symbol (libc, __glob_lstat_compat, glob, GLIBC_2_0); -+#endif -diff --git a/sysdeps/gnu/glob64-lstat-compat.c b/sysdeps/gnu/glob64-lstat-compat.c -new file mode 100644 -index 0000000000..e237407e0b ---- /dev/null -+++ b/sysdeps/gnu/glob64-lstat-compat.c -@@ -0,0 +1,48 @@ -+/* Compat glob which does not use gl_lstat for GLOB_ALTDIRFUNC. -+ GNU version -+ Copyright (C) 2017-2018 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, see -+ <http://www.gnu.org/licenses/>. */ -+ -+#include <dirent.h> -+#include <glob.h> -+#include <sys/stat.h> -+#include <shlib-compat.h> -+ -+#define dirent dirent64 -+#define __readdir(dirp) __readdir64 (dirp) -+ -+#define glob_t glob64_t -+#define __glob __glob64_lstat_compat -+#define globfree globfree64 -+ -+#undef stat -+#define stat stat64 -+#undef __stat -+#define __stat(file, buf) __xstat64 (_STAT_VER, file, buf) -+ -+#define COMPILE_GLOB64 1 -+ -+#define GLOB_ATTRIBUTE attribute_compat_text_section -+ -+/* Avoid calling gl_lstat with GLOB_ALTDIRFUNC. */ -+#define GLOB_NO_LSTAT -+ -+#include <posix/glob.c> -+ -+#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_27) -+compat_symbol (libc, __glob64_lstat_compat, glob64, GLIBC_2_1); -+#endif -diff --git a/sysdeps/gnu/glob64.c b/sysdeps/gnu/glob64.c -index 52e97e2f6a..42b5b225ca 100644 ---- a/sysdeps/gnu/glob64.c -+++ b/sysdeps/gnu/glob64.c -@@ -6,8 +6,7 @@ - #define __readdir(dirp) __readdir64 (dirp) - - #define glob_t glob64_t --#define glob(pattern, flags, errfunc, pglob) \ -- glob64 (pattern, flags, errfunc, pglob) -+#define __glob __glob64 - #define globfree(pglob) globfree64 (pglob) - - #undef stat -@@ -19,4 +18,6 @@ - - #include <posix/glob.c> - --libc_hidden_def (glob64) -+libc_hidden_def (__glob64) -+versioned_symbol (libc, __glob64, glob64, GLIBC_2_27); -+libc_hidden_ver (__glob64, glob64) diff --git a/debian/patches/hurd-i386/git-hidden-def.diff b/debian/patches/hurd-i386/git-hidden-def.diff deleted file mode 100644 index 467da5d..0000000 --- a/debian/patches/hurd-i386/git-hidden-def.diff +++ /dev/null @@ -1,42 +0,0 @@ -commit 4a5ce6e908c6b45d976fb78b65434b489dc570b6 -Author: Samuel Thibault <[email protected]> -Date: Sat Jan 6 18:18:49 2018 +0100 - - hurd: Fix build without NO_HIDDEN - - * sysdeps/i386/dl-tlsdesc.S (_dl_tlsdesc_dynamic) [NO_RTLD_HIDDEN]: Call - JUMPTARGET (___tls_get_addr) instead of HIDDEN_JUMPTARGET (___tls_get_addr). - * sysdeps/x86_64/dl-tlsdesc.S (_dl_tlsdesc_dynamic): Likewise. - -diff --git a/sysdeps/i386/dl-tlsdesc.S b/sysdeps/i386/dl-tlsdesc.S -index 8c2c40b7ec..2c4764d1aa 100644 ---- a/sysdeps/i386/dl-tlsdesc.S -+++ b/sysdeps/i386/dl-tlsdesc.S -@@ -126,7 +126,11 @@ _dl_tlsdesc_dynamic: - .p2align 4,,7 - .Lslow: - cfi_adjust_cfa_offset (28) -+#ifdef NO_RTLD_HIDDEN -+ call JUMPTARGET (___tls_get_addr) -+#else - call HIDDEN_JUMPTARGET (___tls_get_addr) -+#endif - jmp .Lret - cfi_endproc - .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic -diff --git a/sysdeps/x86_64/dl-tlsdesc.S b/sysdeps/x86_64/dl-tlsdesc.S -index 6c4e6b6c91..437bd8cde7 100644 ---- a/sysdeps/x86_64/dl-tlsdesc.S -+++ b/sysdeps/x86_64/dl-tlsdesc.S -@@ -128,7 +128,11 @@ _dl_tlsdesc_dynamic: - movq %r10, 40(%rsp) - movq %r11, 48(%rsp) - /* %rdi already points to the tlsinfo data structure. */ -+#ifdef NO_RTLD_HIDDEN -+ call JUMPTARGET (__tls_get_addr) -+#else - call HIDDEN_JUMPTARGET (__tls_get_addr) -+#endif - movq 8(%rsp), %rdx - movq 16(%rsp), %rcx - movq 24(%rsp), %r8 diff --git a/debian/patches/hurd-i386/git-jmp_buf-macros.h.diff b/debian/patches/hurd-i386/git-jmp_buf-macros.h.diff deleted file mode 100644 index f47fdbe..0000000 --- a/debian/patches/hurd-i386/git-jmp_buf-macros.h.diff +++ /dev/null @@ -1,20 +0,0 @@ -commit 5e814a15ca2b9434159dddf7bbe57c002fac079b -Author: Samuel Thibault <[email protected]> -Date: Sat Jan 6 02:27:44 2018 +0100 - - hurd: Add jmp_buf-macros.h - - * sysdeps/mach/hurd/i386/jmp_buf-macros.h: New file. - -diff --git a/sysdeps/mach/hurd/i386/jmp_buf-macros.h b/sysdeps/mach/hurd/i386/jmp_buf-macros.h -new file mode 100644 -index 0000000000..834f5fb243 ---- /dev/null -+++ b/sysdeps/mach/hurd/i386/jmp_buf-macros.h -@@ -0,0 +1,6 @@ -+#define JMP_BUF_SIZE 32 -+#define SIGJMP_BUF_SIZE 32 -+#define JMP_BUF_ALIGN 4 -+#define SIGJMP_BUF_ALIGN 4 -+#define MASK_WAS_SAVED_OFFSET 24 -+#define SAVED_MASK_OFFSET 28 diff --git a/debian/patches/hurd-i386/git-math-ulps-i386-update.diff b/debian/patches/hurd-i386/git-math-ulps-i386-update.diff deleted file mode 100644 index 633b841..0000000 --- a/debian/patches/hurd-i386/git-math-ulps-i386-update.diff +++ /dev/null @@ -1,90 +0,0 @@ -commit 107a35a5751586926dbc0fed4d044a34f79c084e -Author: Samuel Thibault <[email protected]> -Date: Sat Jan 6 22:09:42 2018 +0100 - - i386: Regenerate libm-test-ulps for for gcc 7 on i686 - - * sysdeps/i386/fpu/libm-test-ulps: Regenerated for GCC 7 with - "-O2 -march=i686". - -diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps -index 93e12af4e5..862a74e09d 100644 ---- a/sysdeps/i386/fpu/libm-test-ulps -+++ b/sysdeps/i386/fpu/libm-test-ulps -@@ -935,10 +935,10 @@ ldouble: 1 - - Function: Real part of "ccosh_downward": - double: 1 --float: 1 -+float: 2 - float128: 2 - idouble: 1 --ifloat: 1 -+ifloat: 2 - ifloat128: 2 - ildouble: 3 - ldouble: 3 -@@ -1637,20 +1637,20 @@ ldouble: 1 - - Function: Real part of "ctan_downward": - double: 1 --float: 1 -+float: 2 - float128: 4 - idouble: 1 --ifloat: 1 -+ifloat: 2 - ifloat128: 4 - ildouble: 5 - ldouble: 5 - - Function: Imaginary part of "ctan_downward": - double: 2 --float: 1 -+float: 2 - float128: 5 - idouble: 2 --ifloat: 1 -+ifloat: 2 - ifloat128: 5 - ildouble: 4 - ldouble: 4 -@@ -2099,10 +2099,10 @@ ldouble: 4 - - Function: "j1": - double: 2 --float: 1 -+float: 2 - float128: 4 - idouble: 2 --ifloat: 1 -+ifloat: 2 - ifloat128: 4 - ildouble: 1 - ldouble: 1 -@@ -2643,10 +2643,10 @@ ldouble: 1 - - Function: "y0_downward": - double: 2 --float: 2 -+float: 3 - float128: 4 - idouble: 2 --ifloat: 2 -+ifloat: 3 - ifloat128: 4 - ildouble: 5 - ldouble: 5 -@@ -2723,10 +2723,10 @@ ldouble: 4 - - Function: "yn_downward": - double: 2 --float: 2 -+float: 3 - float128: 5 - idouble: 2 --ifloat: 2 -+ifloat: 3 - ifloat128: 5 - ildouble: 5 - ldouble: 5 diff --git a/debian/patches/hurd-i386/git-pwritev.diff b/debian/patches/hurd-i386/git-pwritev.diff deleted file mode 100644 index a082127..0000000 --- a/debian/patches/hurd-i386/git-pwritev.diff +++ /dev/null @@ -1,26 +0,0 @@ -commit 200fc24b9dd2360bc850fe71ed22410051426d96 -Author: Samuel Thibault <[email protected]> -Date: Sun Jan 7 13:31:36 2018 +0100 - - hurd: Fix pwritev* - - This follows c45d78aac ('posix: Fix generic p{read,write}v buffer allocation - (BZ#22457)'), which made pwritev to use __mmap instead of __posix_memalign, - but didn't pass PROT_READ to it, while the pwrite() call does need to - read the data we have just copied over. - - * sysdeps/posix/pwritev_common.c: Add PROT_READ to __mmap prot. - -diff --git a/sysdeps/posix/pwritev_common.c b/sysdeps/posix/pwritev_common.c -index bd0f5c5257..344ab4d61b 100644 ---- a/sysdeps/posix/pwritev_common.c -+++ b/sysdeps/posix/pwritev_common.c -@@ -55,7 +55,7 @@ PWRITEV (int fd, const struct iovec *vector, int count, OFF_T offset) - but 1. it is system specific (not meant in generic implementation), and - 2. it would make the implementation more complex, and 3. it will require - another syscall (fcntl). */ -- void *buffer = __mmap (NULL, bytes, PROT_WRITE, -+ void *buffer = __mmap (NULL, bytes, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - if (__glibc_unlikely (buffer == MAP_FAILED)) - return -1; diff --git a/debian/patches/series b/debian/patches/series index 2638396..9c58dc3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -120,13 +120,7 @@ hurd-i386/local-nocheck-installed-headers.diff hurd-i386/tg2.26-sigsetops.h.diff hurd-i386/git-libpthread-2.26.diff hurd-i386/tg-thread-linkspace.diff -hurd-i386/git-jmp_buf-macros.h.diff hurd-i386/libpthread_includes.diff -hurd-i386/git-glob64.diff -hurd-i386/git-hidden-def.diff -hurd-i386/git-math-ulps-i386-update.diff -hurd-i386/git-glob-PATH_MAX.diff -hurd-i386/git-pwritev.diff i386/local-biarch.diff i386/unsubmitted-quiet-ldconfig.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
