This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit fa6541802eddc595465c357587efd6d8cbf8b96b
Author: Aurelien Jarno <aurel...@aurel32.net>
Date: Sat Jun 17 01:36:52 2017 +0200
debian/patches/git-updates.diff: update from upstream stable branch:
* debian/patches/git-updates.diff: update from upstream stable branch:
- Fix 64-bit atomics on m68k. Closes: #855692.
---
debian/changelog | 1 +
debian/patches/git-updates.diff | 57 +++++++++++++++++++++++++++++++++++++++--
2 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2805e49..15c27af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ glibc (2.24-12) UNRELEASED; urgency=medium
* debian/patches/git-updates.diff: update from upstream stable branch:
- Drop patches/any/cvs-remove-pid-tid-cache-clone.diff (merged upstream).
- Remove wrong assertion on parent PID in fork.
+ - Fix 64-bit atomics on m68k. Closes: #855692.
* debian/debhelper.in/libc.templates: update the kernel 3.2 warning to
mention that the support limitation comes from Debian and not from
upstream. Closes: #864720.
diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff
index 45530a2..98aab80 100644
--- a/debian/patches/git-updates.diff
+++ b/debian/patches/git-updates.diff
@@ -1,10 +1,17 @@
GIT update of git://sourceware.org/git/glibc.git/release/2.24/master from
glibc-2.24
diff --git a/ChangeLog b/ChangeLog
-index c44c926094..3d4f5f8350 100644
+index c44c926094..1795e284ef 100644
--- a/ChangeLog
+++ b/ChangeLog
-@@ -1,3 +1,521 @@
+@@ -1,3 +1,528 @@
++2017-02-01 Andreas Schwab <sch...@linux-m68k.org>
++
++ * sysdeps/m68k/m680x0/m68020/atomic-machine.h
++ (__arch_compare_and_exchange_val_64_acq, atomic_exchange_acq)
++ (atomic_exchange_and_add, atomic_add): Add casts to 64 bit asm
++ operands.
++
+2017-05-12 Florian Weimer <fwei...@redhat.com>
+
+ [BZ #21386]
@@ -11240,6 +11247,52 @@ index e1707ab1c8..b01f712be2 100644
TID offsetof (struct pthread, tid) - TLS_PRE_TCB_SIZE
MULTIPLE_THREADS_OFFSET offsetof (struct pthread, header.multiple_threads) -
TLS_PRE_TCB_SIZE
SYSINFO_OFFSET offsetof (tcbhead_t, __private)
+diff --git a/sysdeps/m68k/m680x0/m68020/atomic-machine.h
b/sysdeps/m68k/m680x0/m68020/atomic-machine.h
+index 24bc5c5ef7..65965cca9e 100644
+--- a/sysdeps/m68k/m680x0/m68020/atomic-machine.h
++++ b/sysdeps/m68k/m680x0/m68020/atomic-machine.h
+@@ -73,7 +73,7 @@ typedef uintmax_t uatomic_max_t;
+ __typeof (mem) __memp = (mem); \
+ __asm __volatile ("cas2%.l %0:%R0,%1:%R1,(%2):(%3)" \
+ : "=d" (__ret) \
+- : "d" (newval), "r" (__memp), \
++ : "d" ((__typeof (*(mem))) (newval)), "r" (__memp), \
+ "r" ((char *) __memp + 4), "0" (oldval) \
+ : "memory"); \
+ __ret; })
+@@ -101,8 +101,9 @@ typedef uintmax_t uatomic_max_t;
+ __asm __volatile ("1: cas2%.l %0:%R0,%1:%R1,(%2):(%3);" \
+ " jbne 1b" \
+ : "=d" (__result) \
+- : "d" (newvalue), "r" (__memp), \
+- "r" ((char *) __memp + 4), "0" (__result) \
++ : "d" ((__typeof (*(mem))) (newvalue)), \
++ "r" (__memp), "r" ((char *) __memp + 4), \
++ "0" (__result) \
+ : "memory"); \
+ } \
+ __result; })
+@@ -144,7 +145,7 @@ typedef uintmax_t uatomic_max_t;
+ " cas2%.l %0:%R0,%1:%R1,(%3):(%4);" \
+ " jbne 1b" \
+ : "=d" (__result), "=&d" (__temp) \
+- : "d" (value), "r" (__memp), \
++ : "d" ((__typeof (*(mem))) (value)), "r" (__memp), \
+ "r" ((char *) __memp + 4), "0" (__result) \
+ : "memory"); \
+ } \
+@@ -175,8 +176,9 @@ typedef uintmax_t uatomic_max_t;
+ " cas2%.l %0:%R0,%1:%R1,(%3):(%4);" \
+ " jbne 1b" \
+ : "=d" (__oldval), "=&d" (__temp) \
+- : "d" (value), "r" (__memp), \
+- "r" ((char *) __memp + 4), "0" (__oldval) \
++ : "d" ((__typeof (*(mem))) (value)), \
++ "r" (__memp), "r" ((char *) __memp + 4), \
++ "0" (__oldval) \
+ : "memory"); \
+ } \
+ })
diff --git a/sysdeps/m68k/nptl/tcb-offsets.sym
b/sysdeps/m68k/nptl/tcb-offsets.sym
index b1bba65868..241fb8b47c 100644
--- a/sysdeps/m68k/nptl/tcb-offsets.sym
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
