debian/changelog

@@ -12,6 +12,15 @@ glibc (2.28-4) UNRELEASED; urgency=medium
     - debian/patches/any/submitted-sigaction-sa-restorer.diff: upstreamed.
   * debian/testsuite-xfail-debian.mk: whitelist tests that sometimes fail in
     a riscv64 QEMU VM, but not on a HiFive Unleashed board.
+  * debian/patches/submitted-gcc-8-kernel-assisted-atomics.diff: fix kernel
+    assisted atomics on armel with GCC 8.
+  * debian/control.in/main, debian/sysdeps/armel.mk: build with GCC 8 on
+    armel.
+  * debian/patches/any/submitted-workaround-math-errno-gcc-bug.diff:
+    workaround GCC bug BZ #88576 / Debian #917115 by not using -fmath-errno
+    outside of libm.  Closes: #916779.
+  * debian/patches/riscv64/git-thread-debugging.diff: fix thread debugging
+    in gdb on riscv64.
   [ Samuel Thibault ]
   * debian/testsuite-xfail-debian.mk: whitelist failing new tests on hurd.

debian/control

@@ -10,7 +10,6 @@ Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 1.17.14), xz-utils, file,
  hurd-dev (>= 1:0.9.git20181030-1) [hurd-i386] <!stage1> | libihash-dev [hurd-i386] <!stage1>,
  kfreebsd-kernel-headers [kfreebsd-any],
  binutils (>= 2.29),
- g++-7 [armel],
  g++-8, g++-8-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>,
  libidn2-0 (>= 2.0.5~) <!nocheck>,

debian/control.in/main

@@ -10,7 +10,6 @@ Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 1.17.14), xz-utils, file,
  hurd-dev (>= 1:0.9.git20181030-1) [hurd-i386] <!stage1> | libihash-dev [hurd-i386] <!stage1>,
  kfreebsd-kernel-headers [kfreebsd-any],
  binutils (>= 2.29),
- g++-7 [armel],
  g++-8, g++-8-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>,
  libidn2-0 (>= 2.0.5~) <!nocheck>,

debian/patches/any/submitted-workaround-math-errno-gcc-bug.diff

+2018-12-22  Aurelien Jarno  <aurelien@aurel32.net>
+
+	[BZ #24024]
+	* Makeconfig: Build libm with -fno-math-errno but build the remaining
+	code with -fmath-errno.
+
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -831,8 +831,8 @@ endif
+ # disable any optimization that assume default rounding mode.
+ +math-flags = -frounding-math
+ 
+-# Build libc/libm using -fno-math-errno, but run testsuite with -fmath-errno.
+-+extra-math-flags = $(if $(filter libnldbl nonlib testsuite,$(in-module)),-fmath-errno,-fno-math-errno)
++# Build libm using -fno-math-errno
+++extra-math-flags = $(if $(filter libm,$(in-module)),-fno-math-errno,-fmath-errno)
+ 
+ # We might want to compile with some stack-protection flag.
+ ifneq ($(stack-protector),)

debian/patches/arm/submitted-gcc-8-kernel-assisted-atomics.diff

+2018-12-23  Aurelien Jarno  <aurelien@aurel32.net>
+
+	[BZ #24034]
+	* sysdeps/unix/sysv/linux/arm/atomic-machine.h
+	(__arm_assisted_compare_and_exchange_val_32_acq): Use uint32_t rather
+	than __typeof (...) for the a_ptr variable.
+
+--- a/sysdeps/unix/sysv/linux/arm/atomic-machine.h
++++ b/sysdeps/unix/sysv/linux/arm/atomic-machine.h
+@@ -49,16 +49,23 @@
+    declarations of A_OLDVAL et al because when NEWVAL or OLDVAL is of the
+    form *PTR and PTR has a 'volatile ... *' type, then __typeof (*PTR) has
+    a 'volatile ...' type and this triggers -Wvolatile-register-var to
+-   complain about 'register volatile ... asm ("reg")'.  */
++   complain about 'register volatile ... asm ("reg")'.
++
++   We use the same union trick in the declaration of A_PTR because when
++   MEM is of the from *PTR and PTR has a 'const ... *' type, then __typeof
++   (*PTR) has a 'const ...' type and this enables the compiler to substitute
++   the variable with its initializer in asm statements, which may cause the
++   corresponding operand to appear in a different register.  */
+ #ifdef __thumb2__
+ /* Thumb-2 has ldrex/strex.  However it does not have barrier instructions,
+    so we still need to use the kernel helper.  */
+ # define __arm_assisted_compare_and_exchange_val_32_acq(mem, newval, oldval) \
+-  ({ union { __typeof (oldval) a; uint32_t v; } oldval_arg = { .a = (oldval) };\
++  ({ union { __typeof (mem) a; uint32_t v; } mem_arg = { .a = (mem) };       \
++     union { __typeof (oldval) a; uint32_t v; } oldval_arg = { .a = (oldval) };\
+      union { __typeof (newval) a; uint32_t v; } newval_arg = { .a = (newval) };\
+      register uint32_t a_oldval asm ("r0");				      \
+      register uint32_t a_newval asm ("r1") = newval_arg.v;		      \
+-     register __typeof (mem) a_ptr asm ("r2") = (mem);			      \
++     register uint32_t a_ptr asm ("r2") = mem_arg.v;			      \
+      register uint32_t a_tmp asm ("r3");				      \
+      register uint32_t a_oldval2 asm ("r4") = oldval_arg.v;		      \
+      __asm__ __volatile__						      \
+@@ -79,11 +86,12 @@
+      (__typeof (oldval)) a_tmp; })
+ #else
+ # define __arm_assisted_compare_and_exchange_val_32_acq(mem, newval, oldval) \
+-  ({ union { __typeof (oldval) a; uint32_t v; } oldval_arg = { .a = (oldval) };\
++  ({ union { __typeof (mem) a; uint32_t v; } mem_arg = { .a = (mem) };       \
++     union { __typeof (oldval) a; uint32_t v; } oldval_arg = { .a = (oldval) };\
+      union { __typeof (newval) a; uint32_t v; } newval_arg = { .a = (newval) };\
+      register uint32_t a_oldval asm ("r0");				      \
+      register uint32_t a_newval asm ("r1") = newval_arg.v;		      \
+-     register __typeof (mem) a_ptr asm ("r2") = (mem);			      \
++     register uint32_t a_ptr asm ("r2") = mem_arg.v;			      \
+      register uint32_t a_tmp asm ("r3");				      \
+      register uint32_t a_oldval2 asm ("r4") = oldval_arg.v;		      \
+      __asm__ __volatile__						      \

debian/patches/riscv64/git-thread-debugging.diff

+2018-08-06  Andreas Schwab  <schwab@suse.de>
+
+	* sysdeps/riscv/nptl/tls.h (DB_THREAD_SELF): Use REGISTER instead
+	of CONST_THREAD_AREA.
+
+--- a/sysdeps/riscv/nptl/tls.h
++++ b/sysdeps/riscv/nptl/tls.h
+@@ -99,9 +99,10 @@ typedef struct
+ # define TLS_DEFINE_INIT_TP(tp, pd) \
+   void *tp = (void *) (pd) + TLS_TCB_OFFSET + TLS_PRE_TCB_SIZE
+ 
+-/* Magic for libthread_db to know how to do THREAD_SELF.  */
++/* Informs libthread_db that the thread pointer is register 4, which is used
++ * to know how to do THREAD_SELF.  */
+ # define DB_THREAD_SELF \
+-  CONST_THREAD_AREA (32, TLS_TCB_OFFSET + TLS_PRE_TCB_SIZE)
++  REGISTER (64, 64, 4 * 8, - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE)
+ 
+ /* Access to data in the thread descriptor is easy.  */
+ # define THREAD_GETMEM(descr, member) \

debian/patches/series

@@ -33,6 +33,7 @@ arm/local-soname-hack.diff
 arm/local-vfp-sysdeps.diff
 arm/unsubmitted-ldso-multilib.diff
 arm/local-arm-futex.diff
+arm/submitted-gcc-8-kernel-assisted-atomics.diff
 
 hppa/local-inlining.diff
 
@@ -114,6 +115,8 @@ mips/submitted-rld_map.diff
 
 powerpc/local-powerpc8xx-dcbz.diff
 
+riscv64/git-thread-debugging.diff
+
 sh4/local-fpscr_values.diff
 
 sparc/submitted-sparc64-socketcall.diff
@@ -152,3 +155,4 @@ any/local-libpic.diff
 any/local-bootstrap-headers.diff
 any/submitted-resolv-unaligned.diff
 any/local-cudacc-float128.diff
+any/submitted-workaround-math-errno-gcc-bug.diff

debian/sysdeps/armel.mk

-# build with gcc-7 as gcc-8 triggers issues in the testsuite
-DEB_GCC_VERSION = -7
-
 # configuration options for all flavours
 extra_config_options = --enable-multi-arch