r4847 - in glibc-package/trunk/debian: . control.in sysdeps
Author: aurel32
Date: 2011-08-04 07:41:35 +0000 (Thu, 04 Aug 2011)
New Revision: 4847
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/sysdeps/armhf.mk
Log:
* Build with gcc-4.6/g++-4.6 on armhf to get correct atomic operations in
thumb-2 mode.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-08-04 07:20:02 UTC (rev 4846)
+++ glibc-package/trunk/debian/changelog 2011-08-04 07:41:35 UTC (rev 4847)
@@ -10,12 +10,14 @@
the directory to symlink conversion is done correctly.
* On mips/mipsel, only ship the includes symlinks in libc6-dev-mips64. Add
a dependency to libc6-dev-mips64 in libc6-dev-mipsn32.
+ * Build with gcc-4.6/g++-4.6 on armhf to get correct atomic operations in
+ thumb-2 mode.
[ Samuel Thibault ]
* patches/hurd-i386/submitted-sysvshm.diff: Fix shm creation: do not create
file on first lookup.
- -- Samuel Thibault <sthibault@debian.org> Mon, 01 Aug 2011 22:36:14 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 04 Aug 2011 09:41:02 +0200
eglibc (2.13-13) unstable; urgency=low
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2011-08-04 07:20:02 UTC (rev 4846)
+++ glibc-package/trunk/debian/control.in/main 2011-08-04 07:41:35 UTC (rev 4847)
@@ -7,7 +7,7 @@
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], gnumach-dev [hurd-i386], libpthread-stubs0-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
binutils (>= 2.20-3), binutils (>= 2.21) [sparc sparc64],
- g++-4.4 (>= 4.4.2-2), g++-4.4-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc]
+ g++-4.4 (>= 4.4.2-2) [!armhf], g++-4.6 [armhf], g++-4.4-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc]
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>
Modified: glibc-package/trunk/debian/sysdeps/armhf.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/armhf.mk 2011-08-04 07:20:02 UTC (rev 4846)
+++ glibc-package/trunk/debian/sysdeps/armhf.mk 2011-08-04 07:41:35 UTC (rev 4847)
@@ -1 +1,11 @@
libc_add-ons = ports nptl $(add-ons)
+
+# Use gcc-4.6 on armhf to get correct atomic operations in thumb-2 mode
+ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
+CC = $(DEB_HOST_GNU_TYPE)-gcc
+CXX = $(DEB_HOST_GNU_TYPE)-g++
+else
+CC = gcc-4.6
+CXX = g++-4.6
+endif
+
Reply to: