Package: release.debian.org
User: release.debian....@packages.debian.org
Usertags: unblock
Severity: normal
X-Debbugs-Cc: t...@mirbsd.de

Dear release team,

please unblock package dietlibc.

This fixes an RC bug (#851379) and updates the maintainer information.
debdiff is attached.

unblock dietlibc/0.34~cvs20160606-6

Thanks,
Christian
diff -Nru dietlibc-0.34~cvs20160606/debian/changelog dietlibc-0.34~cvs20160606/debian/changelog
--- dietlibc-0.34~cvs20160606/debian/changelog	2017-01-25 22:25:27.000000000 +0100
+++ dietlibc-0.34~cvs20160606/debian/changelog	2017-02-18 12:10:09.000000000 +0100
@@ -1,3 +1,14 @@
+dietlibc (0.34~cvs20160606-6) unstable; urgency=medium
+
+  [ Héctor Orón Martínez ]
+  * debian/control: drop myself from maintainers field.
+
+  [ Christian Seiler ]
+  * arm64: fix accidental register reuse in __testandset (Closes: #851379)
+  * Add Thorsten Glaser to Uploaders.
+
+ -- Christian Seiler <christ...@iwakd.de>  Sat, 18 Feb 2017 12:10:09 +0100
+
 dietlibc (0.34~cvs20160606-5) unstable; urgency=medium
 
   * hppa: fix pthread_atfork() and getsockopt() FTBFS bugs
diff -Nru dietlibc-0.34~cvs20160606/debian/control dietlibc-0.34~cvs20160606/debian/control
--- dietlibc-0.34~cvs20160606/debian/control	2017-01-25 22:25:27.000000000 +0100
+++ dietlibc-0.34~cvs20160606/debian/control	2017-02-18 12:10:09.000000000 +0100
@@ -2,8 +2,8 @@
 Section: devel
 Priority: optional
 Homepage: http://www.fefe.de/dietlibc/
-Maintainer: Hector Oron <zu...@debian.org>
-Uploaders: Christian Seiler <christ...@iwakd.de>
+Maintainer: Christian Seiler <christ...@iwakd.de>
+Uploaders: Thorsten Glaser <t...@mirbsd.de>
 Standards-Version: 3.9.8
 Build-Depends: debhelper (>= 9), dh-exec
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/dietlibc.git
diff -Nru dietlibc-0.34~cvs20160606/debian/patches/bugfixes/arm64-testandset.diff dietlibc-0.34~cvs20160606/debian/patches/bugfixes/arm64-testandset.diff
--- dietlibc-0.34~cvs20160606/debian/patches/bugfixes/arm64-testandset.diff	1970-01-01 01:00:00.000000000 +0100
+++ dietlibc-0.34~cvs20160606/debian/patches/bugfixes/arm64-testandset.diff	2017-02-18 12:10:09.000000000 +0100
@@ -0,0 +1,26 @@
+Description: Fix register reuse in __testandset on arm64
+ In the case where the stlxr instruction fails on arm64 (either due to
+ another thread having accesed that memory location or spuriously) the
+ register x2 (which stores the pointer to the memory location) is now
+ useless because the original implementation reused it (which it should
+ not have).
+ .
+ Just use the unused w3 register for the status result instead.
+Author: Christian Seiler <christ...@iwakd.de>
+Bug-Debian: https://bugs.debian.org/851379
+Last-Update: 2017-02-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/aarch64/__testandset.S
++++ b/aarch64/__testandset.S
+@@ -8,8 +8,8 @@ FUNC_START	__testandset
+ 	 * for details why we want to use ldxr (instead of ldaxr) here and a full memory
+ 	 * barrier afterwards. */
+ 1:	ldxr	w0, [x2]
+-	stlxr	w2, w1, [x2]
+-	cbnz	w2, 1b
++	stlxr	w3, w1, [x2]
++	cbnz	w3, 1b
+ 	dmb	ish
+ 	ret
+ FUNC_END	__testandset
diff -Nru dietlibc-0.34~cvs20160606/debian/patches/series dietlibc-0.34~cvs20160606/debian/patches/series
--- dietlibc-0.34~cvs20160606/debian/patches/series	2017-01-25 22:25:27.000000000 +0100
+++ dietlibc-0.34~cvs20160606/debian/patches/series	2017-02-18 12:10:09.000000000 +0100
@@ -11,11 +11,12 @@
 bugfixes/s390x-testandset.diff
 bugfixes/parisc-getsockopt.diff
 bugfixes/parisc-atfork.diff
-
-# Debian-specific patches (not for upstream)
 bugfixes/thread-self-vs-tcb.diff
 bugfixes/alpha-testandset.diff
+bugfixes/arm64-testandset.diff
 alpha-setjmp.diff
+
+# Debian-specific patches (not for upstream)
 debian/sparc32-mcpu-v9.diff
 debian/native-x32.diff
 debian/buildflags.diff

Reply via email to