Aurelien Jarno · Aurelien Jarno · Aurelien Jarno · Samuel Thibault · Samuel Thibault · Aurelien Jarno
--- a/debian/changelog
+++ b/debian/changelog
+glibc (2.27-0experimental2) UNRELEASED; urgency=medium
+
+  [ Aurelien Jarno ]
+  * debian/sysdeps/*.mk: install gnu/lib-names-*.h for multilib builds.
+  * debian/patches/alpha/submitted-makecontext.diff: new patch to fix
+    infinite backtrace within a context created by makecontext.
+  * debian/patches/sparc/submitted-sparc32-makecontext.diff: new patch
+    to fix infinite backtrace within a context created by makecontext.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 02 Mar 2018 21:17:46 +0100
+
+glibc (2.27-0experimental1) experimental; urgency=medium
+
+  [ Samuel Thibault ]
+  * debian/patches/hurd-i386/git-test-atexit-race-common.diff: New patch,
+    fixes hurd-i386 build.
+
+  [ Aurelien Jarno ]
+  * debian/patches/any/local-ldconfig-ignore-ld.so.diff: add riscv64 program
+    interpreters.
+  * debian/libc6.symbols.riscv64: add riscv64 symbols file.
+  * debian/patches/git-updates.diff: update from upstream stable branch.
+  * debian/testsuite-xfail-debian.mk: Allow tst-malloc-usable-tunables to fail
+    on alpha, arm64, mips64el, ppc64el, ppc64, s390x and sparc64. The failure
+    is due to a kernel bug.
+  * debian/control: Update Vcs-Git and Vcs-Browser fields following the move
+    to Salsa.
+  * debian/control.in/main: do not build-depends on g++-7-multilib for the
+    nobiarch build profile.  Closes: #890131.
+  * debian/rules.d/build.mk: use the just built iconvconfig if not
+    cross-compiling.  Closes: #890132.
+  * debian/patches/any/local-ldconfig.diff: fix a typo.
+  * debian/patches/hurd-i386/submitted-bind_umask2.diff: fix a typo.
+  * debian/patches/hurd-i386/tg-hurdsig-global-dispositions.diff: fix a typo.
+  * debian/control.in/libc, debian/rules.d/debhelper.mk: drop the version
+    from the linux-libc-dev dependency, as the <bits/syscall.h> file is not
+    generated anymore from the installed kernel headers.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 24 Feb 2018 23:49:00 +0100
+
+glibc (2.27-0experimental0) experimental; urgency=medium
+
+  [ Samuel Thibault ]
+  * debian/patches/hurd-i386/git-abilist.diff: Add ABI list.
+  * debian/patches/hurd-i386/cvs-libpthread.abilist.diff: Add libpthread ABI
+  list.
+  * debian/patches/hurd-i386/libpthread_version.diff: Add compatibility ABI
+  list.
+  * debian/patches/hurd-i386/local-exec_filename.diff: Add compatibility ABI
+  list.
+  * debian/patches/hurd-i386/local-hurdsig-global-dispositions-version.diff:
+  Add additional ABI list.
+  * debian/patches/hurd-i386/local-mach_print.diff: Add local ABI list.
+  * debian/patches/hurd-i386/local-usr.diff: Fix local ABI list.
+  * debian/patches/hurd-i386/tg-gsync-libc.diff: Update ABI list.
+  * debian/patches/hurd-i386/tg-extern_inline.diff: Update ABI list.
+  * debian/patches/hurd-i386/local-versions.diff: Remove, merged upstream.
+  * debian/testsuite-xfail-debian.mk: Remove ABI list blacklist.
+
+  [ Aurelien Jarno ]
+  * New upstream version:
+    - debian/control: regenerate.
+    - debian/symbols.wildcards: update for 2.27.
+    - debian/patches/hurd-i386/tg-tls-threadvar.diff: refreshed.
+    - debian/patches/hurd-i386/tg-tlsdesc.sym.diff: upstreamed.
+    - debian/patches/hurd-i386/tg-no-hp-timing.diff: upstreamed.
+    - debian/patches/hurd-i386/local-hurdsig-global-dispositions-version.diff:
+      refreshed.
+    - debian/patches/hurd-i386/unsubmitted-gnumach.defs.diff: upstreamed.
+    - debian/patches/hurd-i386/tg-sigstate_thread_reference.diff: upstreamed.
+    - debian/patches/hurd-i386/tg-allocalim.diff: upstreamed.
+    - debian/patches/hurd-i386/tg-extern_inline.diff: upstreamed.
+    - debian/patches/hurd-i386/tg-gsync-libc.diff: upstreamed.
+    - debian/patches/hurd-i386/tg2.26-sigsetops.h.diff: upstreamed.
+    - debian/patches/hurd-i386/submitted-net.diff: refreshed.
+    - debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff: refreshed.
+    - debian/patches/hurd-i386/tg-fcntl-internal.h.diff: upstreamed.
+    - debian/patches/hurd-i386/tg-pagesize.diff: refreshed.
+  * debian/rules: tweak GCC garbage collector on 32-bit MIPS builders.
+  * debian/rules.d/tarball.mk: do a local bare clone before using git archive
+    as it doesn't support https.
+  * debian/control.in/main, debian/sysdeps/{amd64,i386,x32}.mk: enable support
+    for building static PIE.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 03 Feb 2018 16:31:03 +0100
+
+glibc (2.26.9000+20180127.7e23a7dd-0experimental0) experimental; urgency=medium
+
+  [ Samuel Thibault ]
+  * debian/patches/hurd-i386/local-exec_filename.diff: Add glibc 2.26
+    _hurd_exec_paths compatibility symbol for now.
+  * debian/patches/hurd-i386/tg-gsync-libc.diff: Update.
+
+  [ Aurelien Jarno ]
+  * New upstream snapshot from 20180127:
+    - Fix stack corruption by __pthread_register_cancel.  Closes: #887078,
+      #887886.
+    - debian/patches/hurd-i386/local-hurdsig-global-dispositions-version.diff:
+      rebased.
+    - debian/patches/hurd-i386/git-exec_filename.diff: upstreamed.
+    - debian/patches/hurd-i386/tg-faccessat.diff: upstreamed.
+    - debian/patches/hurd-i386/local-exec_filename.diff: rebased.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 27 Jan 2018 18:15:52 +0100
+
+glibc (2.26.9000+20180108.401311cf-0experimental0) experimental; 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/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/tg-gsync-libc.diff: Update.
+  * debian/testsuite-xfail-debian.mk: Update for hurd-i386.
+
+  [ 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.
+  * debian/testsuite-xfail-debian.mk: the arm kernel also pulled the new pkey
+    syscalls without real support, XFAIL the corresponding test.
+  * debian/testsuite-xfail-debian.mk: remove two math XFAIL on armel now that
+    GCC has been fixed.
+  * debian/testsuite-xfail-debian.mk: update XFAILs for the mips* Octeon 3 FPU
+    bug with the new tests.
+  * debian/testsuite-xfail-debian.mk: update XFAILs on alpha, add new math
+    tests only causing wrong exception flags, remove tests that have been
+    fixed in this release.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Mon, 08 Jan 2018 23:27:20 +0100
+
+glibc (2.26.9000+20180105.a6d0afb5-0experimental0) experimental; urgency=medium
+
+  * New upstream snapshot from 20180105:
+    - debian/patches/git-updates.diff: remove and disable.
+    - debian/patches/locale/preprocessor-collate-uli-sucks.diff: drop,
+      obsolete.
+    - debian/patches/locale/preprocessor-collate.diff: drop, obsolete.
+    - debian/patches/locale/LC_IDENTIFICATION-optional-fields.diff: rebased.
+    - debian/patches/locale/LC_COLLATE-keywords-ordering.diff: drop, obsolete.
+    - debian/patches/locale/local-all-no-archive.diff: rebased.
+    - debian/patches/localedata/sort-UTF8-first.diff: rebased.
+    - debian/patches/localedata/supported.diff: rebased.
+    - debian/patches/localedata/new-valencian-locale.diff: upstreamed.
+    - debian/patches/localedata/locale-ku_TR.diff: rebased.
+    - debian/patches/localedata/tl_PH-yesexpr.diff: upstreamed.
+    - debian/patches/localedata/fo_FO-date_fmt.diff: rebased.
+    - debian/patches/localedata/locales_CH.diff: rebased.
+    - debian/patches/localedata/locales-fr.diff: rebased.
+    - debian/patches/localedata/locale-en_DK.diff: rebased.
+    - debian/patches/localedata/locale-zh_TW.diff: rebased.
+    - debian/patches/localedata/tailor-iso14651_t1.diff: rebased, partly
+      upstreamed.
+    - debian/patches/localedata/locale-hsb_DE.diff: upstreamed.
+    - debian/patches/localedata/tailor-iso14651_t1-common.diff: drop,
+      obsolete.
+    - debian/patches/localedata/submitted-bz9725-locale-sv_SE.diff: rebased.
+    - debian/patches/localedata/locale-C.diff: add a LC_MONETARY section.
+    - debian/patches/localedata/submitted-en_AU-date_fmt.diff: rebased.
+    - debian/patches/localedata/submitted-es_MX-decimal_point.diff: rebased.
+    - debian/patches/localedata/submitted-it_IT-thousands_sep.diff: rebased.
+    - debian/patches/alpha/local-string-functions.diff: rebased.
+    - debian/patches/alpha/submitted-fminmax.diff: upstreamed.
+    - debian/patches/alpha/submitted-rlimit.diff: upstreamed.
+    - debian/patches/arm/git-arm64-memcmp.diff: upstreamed.
+    - debian/patches/hppa/local-elf-make-cflags.diff: upstreamed.
+    - debian/patches/hppa/submitted-gmon-start.diff: upstreamed.
+    - debian/patches/hurd-i386/tg-context_functions.diff: rebased.
+    - debian/patches/hurd-i386/tg-tls-threadvar.diff: rebased.
+    - debian/patches/hurd-i386/tg-faccessat.diff: rebased.
+    - debian/patches/hurd-i386/tg-gsync-libc.diff: rebased.
+    - debian/patches/hurd-i386/submitted-shm_open_pthread.diff: upstreamed.
+    - debian/patches/hurd-i386/cvs-libc_init_secure.diff: upstreamed.
+    - debian/patches/hurd-i386/local-nocheck-installed-headers.diff: rebased.
+    - debian/patches/hurd-i386/git-bits-sysmacros.h.diff: upstreamed.
+    - debian/patches/hurd-i386/git-stack_chk_fail_local.diff: upstreamed.
+    - debian/patches/hurd-i386/git-stack-protect-static.diff: upstreamed.
+    - debian/patches/hurd-i386/git-sigsetops.h.diff: upstreamed.
+    - debian/patches/hurd-i386/git-sigsetops-2.h.diff: upstreamed.
+    - debian/patches/hurd-i386/git-sigsetops-3.h.diff: upstreamed.
+    - debian/patches/hurd-i386/git-bits_socket.h.diff: upstreamed.
+    - debian/patches/hurd-i386/git-preadwritev2.diff: upstreamed.
+    - debian/patches/hurd-i386/git-preadwritev2-2.diff: upstreamed.
+    - debian/patches/hurd-i386/git-preadwritev2-3.diff: upstreamed.
+    - debian/patches/hurd-i386/git-rtld-access.diff: upstreamed.
+    - debian/patches/hurd-i386/git-rtld-sbrk.diff: upstreamed.
+    - debian/patches/hurd-i386/git-rtld-sbrk-2.diff: upstreamed.
+    - debian/patches/hurd-i386/git-divdi.diff: upstreamed.
+    - debian/patches/hurd-i386/git-feraiseexcept.diff: upstreamed.
+    - debian/patches/hurd-i386/git-x86-tunables.diff: upstreamed.
+    - debian/patches/hurd-i386/git-i386-implies-x86.diff: upstreamed.
+    - debian/patches/hurd-i386/git-rtld-strtoul_internal.diff: upstreamed.
+    - debian/patches/hurd-i386/git-clone.diff: upstreamed.
+    - debian/patches/hurd-i386/git-gethostname.diff: upstreamed.
+    - debian/patches/hurd-i386/git-tst-udp-timeout.diff: upstreamed.
+    - debian/patches/hurd-i386/git-tst-udp-nonblocking.diff: upstreamed.
+    - debian/patches/hurd-i386/git-hidden-def.diff: upstreamed.
+    - debian/patches/hurd-i386/git-hidden-def-2.diff: upstreamed.
+    - debian/patches/hurd-i386/git-dl-sysdep-check.diff: upstreamed.
+    - debian/patches/hurd-i386/git-socket-limit.diff: upstreamed.
+    - debian/patches/hurd-i386/git-clock_gettime_gettimeofday.diff: upstreamed.
+    - debian/patches/hurd-i386/git-sigsuspend_not_cancel.diff: upstreamed.
+    - debian/patches/hurd-i386/git-dirfd-linknamespace.diff: upstreamed.
+    - debian/patches/hurd-i386/git-revoke-linknamespace.diff: upstreamed.
+    - debian/patches/hurd-i386/git-seekdir-linknamespace.diff: upstreamed.
+    - debian/patches/hurd-i386/git-ifaddrs-linknamespace.diff: upstreamed.
+    - debian/patches/hurd-i386/git-NO_HIDDEN.diff: upstreamed.
+    - debian/patches/hurd-i386/git-mount_namespace.diff: upstreamed.
+    - debian/patches/mips/git-syscalls5-7-unbound-stack.diff: upstreamed.
+    - debian/patches/any/local-ld-multiarch.diff: rebased.
+    - debian/patches/any/local-disable-libnss-db.diff: rebased.
+    - debian/patches/any/local-cudacc-float128.diff: rebased.
+    - debian/patches/any/submitted-ldconfig-c-collation.diff: upstreamed.
+    - debian/patches/any/git-any-ld.so-newline.diff: upstreamed.
+    - debian/control.in/main: add a Build-Depends on bison.
+    - debian/symbols.wildcards: update for 2.26.9000.
+    - debian/rules: do not remove po/*.mo* on cleanup, they are not built in
+      the source directory anymore.
+    - debian/debhelper.in/glibc-doc.install: rename into glibc-docs.docs and
+      update to the new changelogs location.
+    - debian/changelog.upstream: update changelogs size.
+    - debian/debhelper.in/libc-dev{,-alt}.{install,lintian-overrides}: remove
+      libieee.a.
+    - debian/testsuite-xfail-debian.mk: rename math XFAILs: float -> float32,
+      double -> float64, ldouble -> float128.
+  * debian/testsuite-xfail-debian.mk: mark misc/tst-pkey as XFAIL on alpha,
+    arm64 and mips*, as there is a disagreement between kernel and glibc how
+    to report missing protection key support when the syscalls have been
+    wired.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 05 Jan 2018 22:08:07 +0100
+
 glibc (2.26-7) UNRELEASED; urgency=medium
  
  [ Samuel Thibault ]

--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
 The upstream changelog being composed of multiple files with a total size
-of more than 1.5MB, they are provided by the glibc-doc package in the
+of more than 3MB, they are provided by the glibc-doc package in the
 /usr/share/doc/glibc-doc/ directory.
--- a/debian/control
+++ b/debian/control
@@ -2,23 +2,23 @@ Source: glibc
 Section: libs
 Priority: required
 Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 1.17.14), xz-utils, file, quilt,
- autoconf, gawk, debhelper (>= 10), rdfind, symlinks, netbase, gperf,
+ autoconf, gawk, debhelper (>= 10), rdfind, symlinks, netbase, gperf, bison,
 linux-libc-dev (>= 3.9) [linux-any],
 libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
 mig (>= 1.5-3) [hurd-i386], gnumach-dev (>= 2:1.8+git20170102-1~) [hurd-i386],
 hurd-dev (>= 1:0.9.git20171119-4~) [hurd-i386] | hurd-headers-dev [hurd-i386],
 hurd-dev (>= 1:0.9.git20171119-4~) [hurd-i386] <!stage1> | libihash-dev [hurd-i386] <!stage1>,
 kfreebsd-kernel-headers [kfreebsd-any],
- binutils (>= 2.25),
- g++-7, g++-7 (>= 7.2.0-20) [amd64 i386 x32], g++-7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 s390x sparc sparc64 x32],
+ binutils (>= 2.25), binutils (>= 2.29) [amd64 i386 x32],
+ g++-7, g++-7 (>= 7.2.0-20) [amd64 i386 x32], g++-7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 s390x sparc sparc64 x32] <!nobiarch>,
 python3:native <!nocheck>,
- libc-bin (>= 2.26) <cross>
+ libc-bin (>= 2.27) <cross>
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
 Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>, Adam Conrad <adconrad@0c3.net>, Samuel Thibault <sthibault@debian.org>
 Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-glibc/glibc.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-glibc/glibc.git
+Vcs-Browser: https://salsa.debian.org/glibc-team/glibc
+Vcs-Git: https://salsa.debian.org/glibc-team/glibc.git -b glibc-2.27
 Homepage: https://www.gnu.org/software/libc/libc.html

 Package: libc-bin
@@ -97,7 +97,7 @@ Package: locales
 Architecture: all
 Section: localization
 Priority: standard
-Depends: libc-bin (>> 2.26), libc-l10n (>> 2.26), ${misc:Depends}, debconf | debconf-2.0
+Depends: libc-bin (>> 2.27), libc-l10n (>> 2.27), ${misc:Depends}, debconf | debconf-2.0
 Replaces: manpages-fr-extra (<< 20141022)
 Build-Profiles: <!stage1>
 Description: GNU C Library: National Language (locale) data [support]
@@ -115,7 +115,7 @@ Architecture: any
 Section: localization
 Priority: optional
 Multi-Arch: foreign
-Depends: libc-l10n (>> 2.26), ${misc:Depends}
+Depends: libc-l10n (>> 2.27), ${misc:Depends}
 Breaks: locales (<< 2.13-17)
 Build-Profiles: <!stage1>
 Description: GNU C Library: Precompiled locale data
@@ -165,7 +165,7 @@ 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], libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386], openrc (<< 0.27-2~)
-Breaks: nscd (<< 2.26), locales (<< 2.26), locales-all (<< 2.26), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
+Breaks: nscd (<< 2.27), locales (<< 2.27), locales-all (<< 2.27), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
 Replaces: libc6-amd64 [amd64],
          libc6-i386 [i386],
          libc0.1-i686 [kfreebsd-i386],
@@ -192,7 +192,7 @@ Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32
 Section: libdevel
 Priority: optional
 Multi-Arch: same
-Depends: libc6 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
+Depends: libc6 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
 Replaces: hurd-dev (<< 20120408-3) [hurd-i386], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
 Suggests: glibc-doc, manpages-dev
 Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
@@ -253,7 +253,7 @@ 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], libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386], openrc (<< 0.27-2~)
-Breaks: nscd (<< 2.26), locales (<< 2.26), locales-all (<< 2.26), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
+Breaks: nscd (<< 2.27), locales (<< 2.27), locales-all (<< 2.27), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
 Replaces: libc6-amd64 [amd64],
          libc6-i386 [i386],
          libc0.1-i686 [kfreebsd-i386],
@@ -280,7 +280,7 @@ Architecture: alpha ia64
 Section: libdevel
 Priority: optional
 Multi-Arch: same
-Depends: libc6.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
+Depends: libc6.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
 Replaces: hurd-dev (<< 20120408-3) [hurd-i386], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
 Suggests: glibc-doc, manpages-dev
 Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
@@ -341,7 +341,7 @@ 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], libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386], openrc (<< 0.27-2~)
-Breaks: nscd (<< 2.26), locales (<< 2.26), locales-all (<< 2.26), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
+Breaks: nscd (<< 2.27), locales (<< 2.27), locales-all (<< 2.27), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
 Replaces: libc6-amd64 [amd64],
          libc6-i386 [i386],
          libc0.1-i686 [kfreebsd-i386],
@@ -368,7 +368,7 @@ Architecture: hurd-i386
 Section: libdevel
 Priority: optional
 Multi-Arch: same
-Depends: libc0.3 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
+Depends: libc0.3 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
 Replaces: hurd-dev (<< 20120408-3) [hurd-i386], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
 Suggests: glibc-doc, manpages-dev
 Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
@@ -429,7 +429,7 @@ 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], libc0.1-i686 [kfreebsd-i386], libc6-i686 [i386], openrc (<< 0.27-2~)
-Breaks: nscd (<< 2.26), locales (<< 2.26), locales-all (<< 2.26), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
+Breaks: nscd (<< 2.27), locales (<< 2.27), locales-all (<< 2.27), hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
 Replaces: libc6-amd64 [amd64],
          libc6-i386 [i386],
          libc0.1-i686 [kfreebsd-i386],
@@ -456,7 +456,7 @@ Architecture: kfreebsd-amd64 kfreebsd-i386
 Section: libdevel
 Priority: optional
 Multi-Arch: same
-Depends: libc0.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
+Depends: libc0.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
 Replaces: hurd-dev (<< 20120408-3) [hurd-i386], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
 Suggests: glibc-doc, manpages-dev
 Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]

--- a/debian/control.in/libc
+++ b/debian/control.in/libc
@@ -34,7 +34,7 @@ Architecture: @archs@
 Section: libdevel
 Priority: optional
 Multi-Arch: same
-Depends: @libc@ (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
+Depends: @libc@ (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
 Replaces: hurd-dev (<< 20120408-3) [hurd-i386], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
 Suggests: glibc-doc, manpages-dev
 Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]

--- a/debian/control.in/main
+++ b/debian/control.in/main
@@ -2,23 +2,23 @@ Source: glibc
 Section: libs
 Priority: required
 Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 1.17.14), xz-utils, file, quilt,
- autoconf, gawk, debhelper (>= 10), rdfind, symlinks, netbase, gperf,
+ autoconf, gawk, debhelper (>= 10), rdfind, symlinks, netbase, gperf, bison,
 linux-libc-dev (>= 3.9) [linux-any],
 libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
 mig (>= 1.5-3) [hurd-i386], gnumach-dev (>= 2:1.8+git20170102-1~) [hurd-i386],
 hurd-dev (>= 1:0.9.git20171119-4~) [hurd-i386] | hurd-headers-dev [hurd-i386],
 hurd-dev (>= 1:0.9.git20171119-4~) [hurd-i386] <!stage1> | libihash-dev [hurd-i386] <!stage1>,
 kfreebsd-kernel-headers [kfreebsd-any],
- binutils (>= 2.25),
- g++-7, g++-7 (>= 7.2.0-20) [amd64 i386 x32], g++-7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 s390x sparc sparc64 x32],
+ binutils (>= 2.25), binutils (>= 2.29) [amd64 i386 x32],
+ g++-7, g++-7 (>= 7.2.0-20) [amd64 i386 x32], g++-7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 s390x sparc sparc64 x32] <!nobiarch>,
 python3:native <!nocheck>,
 libc-bin (>= @GLIBC_VERSION@) <cross>
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
 Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>, Adam Conrad <adconrad@0c3.net>, Samuel Thibault <sthibault@debian.org>
 Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-glibc/glibc.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-glibc/glibc.git
+Vcs-Browser: https://salsa.debian.org/glibc-team/glibc
+Vcs-Git: https://salsa.debian.org/glibc-team/glibc.git -b glibc-2.27
 Homepage: https://www.gnu.org/software/libc/libc.html

 Package: libc-bin

--- a/debian/debhelper.in/glibc-doc.docs
+++ b/debian/debhelper.in/glibc-doc.docs
+ChangeLog.old/*
--- a/debian/debhelper.in/glibc-doc.install
+++ b/debian/debhelper.in/glibc-doc.install
-ChangeLog*		/usr/share/doc/glibc-doc
-libidn/ChangeLog*	/usr/share/doc/glibc-doc/libidn
-localedata/ChangeLog*	/usr/share/doc/glibc-doc/localedata
--- a/debian/debhelper.in/libc-alt.lintian-overrides
+++ b/debian/debhelper.in/libc-alt.lintian-overrides
@@ -4,7 +4,6 @@ LIBC-FLAVOR: unstripped-binary-or-object */libpthread-GLIBC_VERSION.so

 # Those file are actually .o files not package in a ar archive, and
 # thus should not be stripped
-LIBC-FLAVOR: unstripped-binary-or-object */libieee.a
 LIBC-FLAVOR: unstripped-binary-or-object */libmcheck.a

 # ld.so must be executable, otherwise the system will not work

--- a/debian/debhelper.in/libc-dev-alt.install
+++ b/debian/debhelper.in/libc-dev-alt.install
@@ -6,7 +6,6 @@ TMPDIR/LIBDIR/libc_nonshared.a LIBDIR
 TMPDIR/LIBDIR/libcrypt.a LIBDIR
 TMPDIR/LIBDIR/libdl.a LIBDIR
 TMPDIR/LIBDIR/libg.a LIBDIR
-TMPDIR/LIBDIR/libieee.a LIBDIR
 TMPDIR/LIBDIR/libm.a LIBDIR
 TMPDIR/LIBDIR/libm-*.a LIBDIR
 TMPDIR/LIBDIR/libmcheck.a LIBDIR

--- a/debian/debhelper.in/libc-dev-alt.lintian-overrides
+++ b/debian/debhelper.in/libc-dev-alt.lintian-overrides
 # Those file are actually .o files not package in a ar archive, and
 # thus should not be stripped
-LIBC-dev-FLAVOR: unstripped-binary-or-object */libieee.a
 LIBC-dev-FLAVOR: unstripped-binary-or-object */libmcheck.a
--- a/debian/debhelper.in/libc-dev.install
+++ b/debian/debhelper.in/libc-dev.install
@@ -5,7 +5,6 @@ TMPDIR/LIBDIR/libc_nonshared.a LIBDIR
 TMPDIR/LIBDIR/libcrypt.a LIBDIR
 TMPDIR/LIBDIR/libdl.a LIBDIR
 TMPDIR/LIBDIR/libg.a LIBDIR
-TMPDIR/LIBDIR/libieee.a LIBDIR
 TMPDIR/LIBDIR/libm.a LIBDIR
 TMPDIR/LIBDIR/libm-*.a LIBDIR
 TMPDIR/LIBDIR/libmcheck.a LIBDIR

--- a/debian/debhelper.in/libc-dev.install.hurd-i386
+++ b/debian/debhelper.in/libc-dev.install.hurd-i386
@@ -6,7 +6,6 @@ TMPDIR/LIBDIR/libcrypt.a LIBDIR
 TMPDIR/LIBDIR/libdl.a LIBDIR
 TMPDIR/LIBDIR/libg.a LIBDIR
 TMPDIR/LIBDIR/libhurduser.a LIBDIR
-TMPDIR/LIBDIR/libieee.a LIBDIR
 TMPDIR/LIBDIR/libm.a LIBDIR
 TMPDIR/LIBDIR/libmachuser.a LIBDIR
 TMPDIR/LIBDIR/libmcheck.a LIBDIR

--- a/debian/debhelper.in/libc-dev.lintian-overrides
+++ b/debian/debhelper.in/libc-dev.lintian-overrides
 # Those file are actually .o files not package in a ar archive, and
 # thus should not be stripped
-LIBC-dev: unstripped-binary-or-object */libieee.a
 LIBC-dev: unstripped-binary-or-object */libmcheck.a
--- a/debian/libc6.symbols.riscv64
+++ b/debian/libc6.symbols.riscv64
+#include "libc6.symbols.common"
+ld-linux-riscv64-lp64d.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
--- a/debian/patches/alpha/local-string-functions.diff
+++ b/debian/patches/alpha/local-string-functions.diff
@@ -15,7 +15,7 @@ This patch removes them.
 --- a/sysdeps/alpha/strncat.S
 +++ /dev/null
 @@ -1,94 +0,0 @@
-/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
+-/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
 -   This file is part of the GNU C Library.
 -   Contributed by Richard Henderson <rth@tamu.edu>, 1996.
 -
@@ -112,7 +112,7 @@ This patch removes them.
 --- a/sysdeps/alpha/strncpy.S
 +++ /dev/null
 @@ -1,87 +0,0 @@
-/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
+-/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
 -   Contributed by Richard Henderson (rth@tamu.edu)
 -   This file is part of the GNU C Library.
 -
@@ -202,7 +202,7 @@ This patch removes them.
 --- a/sysdeps/alpha/alphaev67/strncat.S
 +++ /dev/null
 @@ -1,87 +0,0 @@
-/* Copyright (C) 2000-2017 Free Software Foundation, Inc.
+-/* Copyright (C) 2000-2018 Free Software Foundation, Inc.
 -   Contributed by Richard Henderson <rth@tamu.edu>, 1996.
 -   EV67 optimized by Rick Gorton <rick.gorton@alpha-processor.com>.
 -   This file is part of the GNU C Library.
@@ -292,7 +292,7 @@ This patch removes them.
 --- a/sysdeps/alpha/stpncpy.S
 +++ /dev/null
 @@ -1,106 +0,0 @@
-/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
+-/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
 -   This file is part of the GNU C Library.
 -   Contributed by Richard Henderson (rth@tamu.edu)
 -
@@ -401,7 +401,7 @@ This patch removes them.
 --- a/sysdeps/alpha/alphaev67/stpncpy.S
 +++ /dev/null
 @@ -1,115 +0,0 @@
-/* Copyright (C) 2000-2017 Free Software Foundation, Inc.
+-/* Copyright (C) 2000-2018 Free Software Foundation, Inc.
 -   Contributed by Richard Henderson (rth@redhat.com)
 -   This file is part of the GNU C Library.
 -
@@ -519,7 +519,7 @@ This patch removes them.
 --- a/sysdeps/alpha/strcmp.S
 +++ /dev/null
 @@ -1,194 +0,0 @@
-/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
+-/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
 -   Contributed by Richard Henderson (rth@tamu.edu)
 -   This file is part of the GNU C Library.
 -
@@ -716,7 +716,7 @@ This patch removes them.
 --- a/sysdeps/alpha/strncmp.S
 +++ /dev/null
 @@ -1,277 +0,0 @@
-/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
+-/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
 -   Contributed by Richard Henderson (rth@tamu.edu)
 -   This file is part of the GNU C Library.
 -

--- a/debian/patches/alpha/submitted-fminmax.diff
+++ b/debian/patches/alpha/submitted-fminmax.diff
-2017-12-31  Aurelien Jarno  <aurelien@aurel32.net>
-
-	[BZ #20947]
-	* sysdeps/alpha/fpu/s_fmax.S: Remove file.
-	* sysdeps/alpha/fpu/s_fmaxf.S: Likewise.
-	* sysdeps/alpha/fpu/s_fmin.S: Likewise.
-	* sysdeps/alpha/fpu/s_fminf.S: Likewise.
-
--- a/sysdeps/alpha/fpu/s_fmax.S
-+++ /dev/null
-@@ -1,57 +0,0 @@
-/* Copyright (C) 2007-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Richard Henderson.
-
-   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 <sysdep.h>
-#include <math_ldbl_opt.h>
-
-        .set noat
-	.set noreorder
-
-	.text
-ENTRY (__fmax)
-	.prologue 0
-
-	cmptun/su	$f16, $f16, $f10
-	cmptun/su	$f17, $f17, $f11
-	fmov		$f17, $f0
-	unop
-
-	trapb
-	fbne		$f10, $ret
-	fmov		$f16, $f0
-	fbne		$f11, $ret
-
-	cmptlt/su	$f16, $f17, $f11
-	trapb
-	fcmovne		$f11, $f17, $f0
-$ret:	ret
-
-END (__fmax)
-
-/* Given the in-register format of single-precision, this works there too.  */
-strong_alias (__fmax, __fmaxf)
-weak_alias (__fmaxf, fmaxf)
-
-weak_alias (__fmax, fmax)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__fmax, __fmaxl)
-weak_alias (__fmaxl, fmaxl)
-#endif
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __fmax, fmaxl, GLIBC_2_1);
-#endif
--- a/sysdeps/alpha/fpu/s_fmaxf.S
-+++ /dev/null
-@@ -1 +0,0 @@
-/* __fmaxf is in s_fmax.c  */
--- a/sysdeps/alpha/fpu/s_fmin.S
-+++ /dev/null
-@@ -1,57 +0,0 @@
-/* Copyright (C) 2007-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Richard Henderson.
-
-   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 <sysdep.h>
-#include <math_ldbl_opt.h>
-
-        .set noat
-	.set noreorder
-
-	.text
-ENTRY (__fmin)
-	.prologue 0
-
-	cmptun/su	$f16, $f16, $f10
-	cmptun/su	$f17, $f17, $f11
-	fmov		$f17, $f0
-	unop
-
-	trapb
-	fbne		$f10, $ret
-	fmov		$f16, $f0
-	fbne		$f11, $ret
-
-	cmptlt/su	$f17, $f16, $f11
-	trapb
-	fcmovne		$f11, $f17, $f0
-$ret:	ret
-
-END (__fmin)
-
-/* Given the in-register format of single-precision, this works there too.  */
-strong_alias (__fmin, __fminf)
-weak_alias (__fminf, fminf)
-
-weak_alias (__fmin, fmin)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__fmin, __fminl)
-weak_alias (__fminl, fminl)
-#endif
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __fmin, fminl, GLIBC_2_1);
-#endif
--- a/sysdeps/alpha/fpu/s_fminf.S
-+++ /dev/null
-@@ -1 +0,0 @@
-/* __fminf is in s_fmin.c  */
--- a/debian/patches/alpha/submitted-makecontext.diff
+++ b/debian/patches/alpha/submitted-makecontext.diff
+2018-03-01  Aurelien Jarno  <aurelien@aurel32.net>
+
+	[BZ #22910]
+	* sysdeps/unix/sysv/linux/alpha/setcontext.S (__startcontext): Set
+	up CFI directive to forbid further backtracing.
+
+
+--- a/sysdeps/unix/sysv/linux/alpha/makecontext.S
+++ b/sysdeps/unix/sysv/linux/alpha/makecontext.S
+@@ -138,10 +138,14 @@ weak_alias (__makecontext, makecontext)
+ 
+ 	.align	4
+ 	.ent	__startcontext
+	cfi_startproc
+ __startcontext:
+ 	.frame $31, 0, $31, 0
+ 	.prologue 0
+ 
+	/* Mark ra as undefined in order to stop unwinding here.  */
+	cfi_undefined(ra)
+
+ 	jsr	$26, ($27), 0
+ 	ldgp	$29, 0($26)
+ 	mov	$9, $16
+@@ -160,4 +164,5 @@ __startcontext:
+ 
+ 	halt
+ 
+	cfi_endproc
+ 	.end __startcontext
--- a/debian/patches/alpha/submitted-rlimit.diff
+++ b/debian/patches/alpha/submitted-rlimit.diff
-2017-12-30  Aurelien Jarno <aurelien@aurel32.net>
-
-	[BZ #22648]
-	* sysdeps/unix/sysv/linux/alpha/getrlimit64.c: New file.
-	* sysdeps/unix/sysv/linux/alpha/setrlimit64.c: Ditto.
-
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/alpha/getrlimit64.c
-@@ -0,0 +1,64 @@
-+/* Copyright (C) 2017 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 <errno.h>
-+#include <sys/types.h>
-+
-+/* Add this redirection so the strong_alias linking getrlimit64 to
-+   {__}getrlimit does not throw a type error.  */
-+#undef getrlimit
-+#undef __getrlimit
-+#define getrlimit getrlimit_redirect
-+#define __getrlimit __getrlimit_redirect
-+#include <sys/resource.h>
-+#undef getrlimit
-+#undef __getrlimit
-+
-+/* RLIM64_INFINITY was supposed to be a glibc convention rather than
-+   anything seen by the kernel, but it ended being passed to the kernel
-+   through the prlimit64 syscall.  Given that a lot of binaries with
-+   the wrong constant value are in the wild, provide a wrapper function
-+   fixing the value after the syscall.  */
-+#define KERNEL_RLIM64_INFINITY		0xffffffffffffffffULL
-+
-+int
-+__getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
-+{
-+  struct rlimit64 krlimits;
-+
-+  if (INLINE_SYSCALL_CALL (prlimit64, 0, resource, NULL, &krlimits) < 0)
-+    return -1;
-+
-+  if (krlimits.rlim_cur == KERNEL_RLIM64_INFINITY)
-+    rlimits->rlim_cur = RLIM64_INFINITY;
-+  else
-+    rlimits->rlim_cur = krlimits.rlim_cur;
-+  if (krlimits.rlim_max == KERNEL_RLIM64_INFINITY)
-+    rlimits->rlim_max = RLIM64_INFINITY;
-+  else
-+    rlimits->rlim_max = krlimits.rlim_max;
-+
-+  return 0;
-+}
-+libc_hidden_def (__getrlimit64)
-+strong_alias (__getrlimit64, __GI_getrlimit)
-+strong_alias (__getrlimit64, __GI___getrlimit)
-+strong_alias (__getrlimit64, __getrlimit)
-+weak_alias (__getrlimit64, getrlimit)
-+
-+weak_alias (__getrlimit64, getrlimit64)
-+libc_hidden_weak (getrlimit64)
--- /dev/null
-+++ b/sysdeps/unix/sysv/linux/alpha/setrlimit64.c
-@@ -0,0 +1,61 @@
-+/* Copyright (C) 2013-2017 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 <errno.h>
-+#include <sys/types.h>
-+
-+/* Add this redirection so the strong_alias linking setrlimit64 to
-+   {__}setrlimit does not throw a type error.  */
-+#undef setrlimit
-+#undef __setrlimit
-+#define setrlimit setrlimit_redirect
-+#define __setrlimit __setrlimit_redirect
-+#include <sys/resource.h>
-+#undef setrlimit
-+#undef __setrlimit
-+
-+/* RLIM64_INFINITY was supposed to be a glibc convention rather than
-+   anything seen by the kernel, but it ended being passed to the kernel
-+   through the prlimit64 syscall.  Given that a lot of binaries with
-+   the wrong constant value are in the wild, provide a wrapper function
-+   fixing the value before the syscall.  */
-+#define KERNEL_RLIM64_INFINITY		0xffffffffffffffffULL
-+
-+int
-+__setrlimit64 (enum __rlimit_resource resource, const struct rlimit64 *rlimits)
-+{
-+  struct rlimit64 krlimits;
-+
-+  if (rlimits->rlim_cur == RLIM64_INFINITY)
-+    krlimits.rlim_cur = KERNEL_RLIM64_INFINITY;
-+  else
-+    krlimits.rlim_cur = rlimits->rlim_cur;
-+  if (rlimits->rlim_max == RLIM64_INFINITY)
-+    krlimits.rlim_max = KERNEL_RLIM64_INFINITY;
-+  else
-+    krlimits.rlim_max = rlimits->rlim_max;
-+
-+  return INLINE_SYSCALL_CALL (prlimit64, 0, resource, &krlimits, NULL);
-+}
-+
-+weak_alias (__setrlimit64, setrlimit64)
-+
-+strong_alias (__setrlimit64, __setrlimit)
-+weak_alias (__setrlimit64, setrlimit)
-+#ifdef SHARED
-+__hidden_ver1 (__setrlimit64, __GI___setrlimit, __setrlimit64);
-+#endif
--- a/debian/patches/any/git-any-ld.so-newline.diff
+++ b/debian/patches/any/git-any-ld.so-newline.diff
-2017-12-10  Aurelien Jarno <aurelien@aurel32.net>
-
-	[BZ #22577]
-	* elf/rtld.c (init_tls): Add missing new line to the _dl_fatal_printf
-	call.
-
--- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -730,7 +730,7 @@ init_tls (void)
-   void *tcbp = _dl_allocate_tls_storage ();
-   if (tcbp == NULL)
-     _dl_fatal_printf ("\
-cannot allocate TLS data structures for initial thread");
-+cannot allocate TLS data structures for initial thread\n");
- 
-   /* Store for detection of the special case by __tls_get_addr
-      so it knows not to pass this dtv to the normal realloc.  */
--- a/debian/patches/any/local-cudacc-float128.diff
+++ b/debian/patches/any/local-cudacc-float128.diff
@@ -22,8 +22,8 @@ Last-Update: 2017-10-11
    floating-point type with the IEEE 754 binary128 format, and this glibc
    includes corresponding *f128 interfaces for it.  */
 #if defined _ARCH_PWR8 && defined __LITTLE_ENDIAN__ && (_CALL_ELF == 2) \
-    && defined __FLOAT128__
-+    && defined __FLOAT128__ && !defined(__CUDACC__) && !defined(__ICC)
+-    && defined __FLOAT128__ && !defined __NO_LONG_DOUBLE_MATH
+    && defined __FLOAT128__ && !defined __NO_LONG_DOUBLE_MATH && !defined(__CUDACC__) && !defined(__ICC)
 # define __HAVE_FLOAT128 1
 #else
 # define __HAVE_FLOAT128 0