--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: glibc: Please backport patch to fix 64-bit atomics on m68k
- From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
- Date: Tue, 21 Feb 2017 11:39:50 +0100
- Message-id: <148767359019.3384.15489190173634656128.reportbug@ikarus>
Source: glibc
Version: 2.24-9
Severity: normal
Tags: patch
User: debian-68k@lists.debian.org
Usertags: m68k
Hi!
glibc upstream recently merged a patch by Andreas Schwab to fix
64-bit atomics on m68k [1]. We have had multiple issues with
atomics on m68k in the past with packages like openjdk-8 and
firebird3.0 which I was able to resolve by downgrading glibc.
I therefore highly suspect that we need this patch to get these
aforementioned packages build properly on m68k again. I'm attaching
the cherry-picked patch for inclusion in the glibc package.
Thanks,
Adrian
> [1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=64ae9fe45662c8994b0e56ab469b01967408a154
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaubitz@debian.org
`. `' Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Description: Fix 64-bit atomics on m68k
Author: Andreas Schwab <schwab@linux-m68k.org>
Last-Update: 2017-02-20
--- glibc-2.24.orig/sysdeps/m68k/m680x0/m68020/atomic-machine.h
+++ glibc-2.24/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"); \
} \
})
--- End Message ---
--- Begin Message ---
Source: glibc
Source-Version: 2.24-12
We believe that the bug you reported is fixed in the latest version of
glibc, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 855692@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Aurelien Jarno <aurel32@debian.org> (supplier of updated glibc package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sun, 18 Jun 2017 20:04:53 +0200
Source: glibc
Binary: libc-bin libc-dev-bin libc-l10n glibc-doc glibc-source locales locales-all nscd multiarch-support libc6 libc6-dev libc6-dbg libc6-pic libc6-udeb libc6.1 libc6.1-dev libc6.1-dbg libc6.1-pic libc6.1-udeb libc0.3 libc0.3-dev libc0.3-dbg libc0.3-pic libc0.3-udeb libc0.1 libc0.1-dev libc0.1-dbg libc0.1-pic libc0.1-udeb libc6-i386 libc6-dev-i386 libc6-sparc libc6-dev-sparc libc6-sparc64 libc6-dev-sparc64 libc6-s390 libc6-dev-s390 libc6-amd64 libc6-dev-amd64 libc6-powerpc libc6-dev-powerpc libc6-ppc64 libc6-dev-ppc64 libc6-mips32 libc6-dev-mips32 libc6-mipsn32 libc6-dev-mipsn32 libc6-mips64 libc6-dev-mips64 libc0.1-i386 libc0.1-dev-i386 libc6-x32 libc6-dev-x32 libc6-xen libc0.3-xen libc6.1-alphaev67 libc0.1-i686 libc0.3-i686 libc6-i686
Architecture: source
Version: 2.24-12
Distribution: unstable
Urgency: high
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Changed-By: Aurelien Jarno <aurel32@debian.org>
Description:
glibc-doc - GNU C Library: Documentation
glibc-source - GNU C Library: sources
libc-bin - GNU C Library: Binaries
libc-dev-bin - GNU C Library: Development binaries
libc-l10n - GNU C Library: localization files
libc0.1 - GNU C Library: Shared libraries
libc0.1-dbg - GNU C Library: detached debugging symbols
libc0.1-dev - GNU C Library: Development Libraries and Header Files
libc0.1-dev-i386 - GNU C Library: 32bit development libraries for AMD64
libc0.1-i386 - GNU C Library: 32bit shared libraries for AMD64
libc0.1-i686 - transitional dummy package
libc0.1-pic - GNU C Library: PIC archive library
libc0.1-udeb - GNU C Library: Shared libraries - udeb (udeb)
libc0.3 - GNU C Library: Shared libraries
libc0.3-dbg - GNU C Library: detached debugging symbols
libc0.3-dev - GNU C Library: Development Libraries and Header Files
libc0.3-i686 - transitional dummy package
libc0.3-pic - GNU C Library: PIC archive library
libc0.3-udeb - GNU C Library: Shared libraries - udeb (udeb)
libc0.3-xen - GNU C Library: Shared libraries [Xen version]
libc6 - GNU C Library: Shared libraries
libc6-amd64 - GNU C Library: 64bit Shared libraries for AMD64
libc6-dbg - GNU C Library: detached debugging symbols
libc6-dev - GNU C Library: Development Libraries and Header Files
libc6-dev-amd64 - GNU C Library: 64bit Development Libraries for AMD64
libc6-dev-i386 - GNU C Library: 32-bit development libraries for AMD64
libc6-dev-mips32 - GNU C Library: o32 Development Libraries for MIPS
libc6-dev-mips64 - GNU C Library: 64bit Development Libraries for MIPS64
libc6-dev-mipsn32 - GNU C Library: n32 Development Libraries for MIPS64
libc6-dev-powerpc - GNU C Library: 32bit powerpc development libraries for ppc64
libc6-dev-ppc64 - GNU C Library: 64bit Development Libraries for PowerPC64
libc6-dev-s390 - GNU C Library: 32bit Development Libraries for IBM zSeries
libc6-dev-sparc - GNU C Library: 32bit Development Libraries for SPARC
libc6-dev-sparc64 - GNU C Library: 64bit Development Libraries for UltraSPARC
libc6-dev-x32 - GNU C Library: X32 ABI Development Libraries for AMD64
libc6-i386 - GNU C Library: 32-bit shared libraries for AMD64
libc6-i686 - transitional dummy package
libc6-mips32 - GNU C Library: o32 Shared libraries for MIPS
libc6-mips64 - GNU C Library: 64bit Shared libraries for MIPS64
libc6-mipsn32 - GNU C Library: n32 Shared libraries for MIPS64
libc6-pic - GNU C Library: PIC archive library
libc6-powerpc - GNU C Library: 32bit powerpc shared libraries for ppc64
libc6-ppc64 - GNU C Library: 64bit Shared libraries for PowerPC64
libc6-s390 - GNU C Library: 32bit Shared libraries for IBM zSeries
libc6-sparc - GNU C Library: 32bit Shared libraries for SPARC
libc6-sparc64 - GNU C Library: 64bit Shared libraries for UltraSPARC
libc6-udeb - GNU C Library: Shared libraries - udeb (udeb)
libc6-x32 - GNU C Library: X32 ABI Shared libraries for AMD64
libc6-xen - GNU C Library: Shared libraries [Xen version]
libc6.1 - GNU C Library: Shared libraries
libc6.1-alphaev67 - GNU C Library: Shared libraries (EV67 optimized)
libc6.1-dbg - GNU C Library: detached debugging symbols
libc6.1-dev - GNU C Library: Development Libraries and Header Files
libc6.1-pic - GNU C Library: PIC archive library
libc6.1-udeb - GNU C Library: Shared libraries - udeb (udeb)
locales - GNU C Library: National Language (locale) data [support]
locales-all - GNU C Library: Precompiled locale data
multiarch-support - Transitional package to ensure multiarch compatibility
nscd - GNU C Library: Name Service Cache Daemon
Closes: 847478 851867 855692 858738 861183 864720
Changes:
glibc (2.24-12) unstable; urgency=high
.
[ Aurelien Jarno ]
* 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.
* debian/rules, debian/rules.d/build.mk: do not capture the build path
when generating glibc-source tarball. Closes: #861183.
* debian/control.in/main: build-depends on gperf. Closes: #847478.
* debian/patches/hppa/submitted-longjmp.diff: new patch from Helge Deller
to fix longjmp on hppa. Closes: #858738.
* debian/sysdeps/mipsel.mk, debian/sysdeps/mips64el.mk: leave the default
GCC ISA level, currently MIPS32R2/MIPS64R2.
* debian/patches/any/local-CVE-2017-1000366-rtld-LD_AUDIT.diff,
debian/patches/any/local-CVE-2017-1000366-rtld-LD_LIBRARY_PATH.diff,
debian/patches/any/local-CVE-2017-1000366-rtld-LD_PRELOAD.diff: add
patches to protect the dynamic linker against stack clashes
(CVE-2017-1000366).
* debian/patches/any/cvs-vectorized-strcspn-guards.diff: patch backported
from upstream to allow usage of strcspn in ld.so.
* debian/patches/any/cvs-hwcap-AT_SECURE.diff: patch backported from
upstream to disable HWCAP for AT_SECURE programs.
.
[ John Paul Adrian Glaubitz ]
* debian/sysdeps/sh3.mk: copy from sh4.mk. Closes: #851867.
Checksums-Sha1:
3f04cb6a4949d2eb7d5b1ed6069f50a200a68ad1 8365 glibc_2.24-12.dsc
efaa9b60557a9af6836077c2b688851a32d2f1d9 1028888 glibc_2.24-12.debian.tar.xz
eaf1c8fa4095033b134c01114a5c0cc2ee533edd 7252 glibc_2.24-12_source.buildinfo
Checksums-Sha256:
a03c6e6f9dbb6a83d4cda71fbcfaf90690e74a553b59639c387519c8f97f8bfb 8365 glibc_2.24-12.dsc
aeafb5396520596e7d91b9d6e61c51030883c0f27d6c0fa436596b30a9961d5a 1028888 glibc_2.24-12.debian.tar.xz
19fcef142bf5ea701f249bde4df0edd391808f9f6856ae6c3fad9e6e1569b8e0 7252 glibc_2.24-12_source.buildinfo
Files:
545613e1363d322780af23f6ead24f8d 8365 libs required glibc_2.24-12.dsc
06f15fe7852ff927df161485c890206a 1028888 libs required glibc_2.24-12.debian.tar.xz
3eedab10abe6330ad12bc3ea4746e7bd 7252 libs required glibc_2.24-12_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEd0YmQqnvlP0Pdxltupx4Bh3djJsFAllG2TAACgkQupx4Bh3d
jJuCZg/9EXQ2uu0ldIXIUNrn5aMH4/Ut+nez9RKWLs/3pGzFlFizAC6IQ5XtdirF
qHOt5rr67nsP3wtqX/FA8NrzxPdfMySZzvIyB/3qLta44T2iK8KfC966O162kFDY
zK3IFWwezeh/7OaqghQKc6kTpnutRhW0oIXTG2UhpUrGVspqVvR1Eu3ApJtrspyw
MbfWvGK0XmYz+Ca8BMMkxufq7C0LvU/Pl3FLz2EbSMeS4Ir118WNwYqPc7ZfYwwj
CuhYbOWr6sEKZE132iY+2g2Z5oj5Sba30BqeYXQ6CnBJDpuPQpC/vBZHGpuCcv6a
Aqsuj7X86jVElMW7pteCDwsmMm+VwIGipVksiJlRv5I+6XYzkHrzYdo7OZ161tCy
8eGMGHj+cUIoufJjdIOJ9HmHqYpJ4arhs/cvIIlQPPW/1aPkA2arHvyhKQ4SQPVN
AgpJ/fwYwE7+MWZ7kGTEonudfCpx/2NZLgp9KUXBMgDLAmkYoVKDCNfS80kAZ/7p
HhIkNrXD9yq2b3/95iHl866YJO6gyqwLBRoMzfyjo4P104Le7vEvO/2yHgIlj5DI
aXFP36NHBIKouj6n4XS6zD1wZH1kqjt/D9+vvlEPdMBkjjrnTcbVQyb83nDxjqS2
1KQo8xtdb5p2xWz2Xe6kZEobKuItEKjb+Roy4N+Ad95CdPqam/4=
=Q02c
-----END PGP SIGNATURE-----
--- End Message ---