Author: aurel32
Date: 2008-03-23 23:09:04 +0000 (Sun, 23 Mar 2008)
New Revision: 2887
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/sysdeps/amd64.mk
glibc-package/trunk/debian/sysdeps/i386.mk
Log:
Switch back amd64 and i386 to gcc-4.2
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-03-23 09:04:13 UTC (rev
2886)
+++ glibc-package/trunk/debian/changelog 2008-03-23 23:09:04 UTC (rev
2887)
@@ -25,8 +25,8 @@
* control.in/main, sysdeps/*.mk, rules: build with gcc-4.3 by default,
except on alpha, arm, hppa, s390 and hurd-i386.
* rules, rules.d/build.mk: fix parallel build.
- * control.in/main: build-depends on gcc-4.3 (>= 4.3.0-2) to make sure a cld
- instruction is emitted in the prologue of functions using stringops.
+ * control.in/main: build witch gcc-4.2 on i386 and amd64, as gcc-4.3 does
+ not emit cld instructions in the prologue of the functions anymore.
Closes: #469568.
* debian/rules.d/build.mk: disable testsuite on ARM machines running a
2.6.21 to 2.6.24 kernel.
@@ -58,7 +58,7 @@
stubs from libpthread-stubs. Add libpthread-stubs0-dev dependency on
hurd-i386.
- -- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 20 Mar 2008 23:04:28 +0100
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Mon, 24 Mar 2008 00:07:16 +0100
glibc (2.7-9) unstable; urgency=low
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2008-03-23 09:04:13 UTC (rev 2886)
+++ glibc-package/trunk/debian/control 2008-03-23 23:09:04 UTC (rev 2887)
@@ -7,8 +7,8 @@
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev
[hurd-i386], libpthread-stubs0-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
binutils (>= 2.17cvs20070426-1),
- g++-4.2 (>= 4.2.1) [alpha arm hppa s390 hurd-i386], g++-4.2-multilib [s390],
- g++-4.3 (>= 4.3.0-2) [!alpha !arm !hppa !s390 !hurd-i386], g++-4.3-multilib
[amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 sparc]
+ g++-4.2 (>= 4.2.1) [alpha amd64 arm hppa i386 s390 hurd-i386],
g++-4.2-multilib [amd64 i386 s390],
+ g++-4.3 (>= 4.3.0) [!alpha !amd64 !arm !hppa !i386 !s390 !hurd-i386],
g++-4.3-multilib [kfreebsd-amd64 mips mipsel powerpc ppc64 sparc]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Ben Collins <[EMAIL PROTECTED]>, GOTO Masanori <[EMAIL PROTECTED]>,
Philip Blundell <[EMAIL PROTECTED]>, Jeff Bailey <[EMAIL PROTECTED]>, Daniel
Jacobowitz <[EMAIL PROTECTED]>, Clint Adams <[EMAIL PROTECTED]>, Aurelien Jarno
<[EMAIL PROTECTED]>, Pierre Habouzit <[EMAIL PROTECTED]>
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2008-03-23 09:04:13 UTC (rev
2886)
+++ glibc-package/trunk/debian/control.in/main 2008-03-23 23:09:04 UTC (rev
2887)
@@ -7,8 +7,8 @@
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev
[hurd-i386], libpthread-stubs0-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
binutils (>= 2.17cvs20070426-1),
- g++-4.2 (>= 4.2.1) [alpha arm hppa s390 hurd-i386], g++-4.2-multilib [s390],
- g++-4.3 (>= 4.3.0-2) [!alpha !arm !hppa !s390 !hurd-i386], g++-4.3-multilib
[amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 sparc]
+ g++-4.2 (>= 4.2.1) [alpha amd64 arm hppa i386 s390 hurd-i386],
g++-4.2-multilib [amd64 i386 s390],
+ g++-4.3 (>= 4.3.0) [!alpha !amd64 !arm !hppa !i386 !s390 !hurd-i386],
g++-4.3-multilib [kfreebsd-amd64 mips mipsel powerpc ppc64 sparc]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Ben Collins <[EMAIL PROTECTED]>, GOTO Masanori <[EMAIL PROTECTED]>,
Philip Blundell <[EMAIL PROTECTED]>, Jeff Bailey <[EMAIL PROTECTED]>, Daniel
Jacobowitz <[EMAIL PROTECTED]>, Clint Adams <[EMAIL PROTECTED]>, Aurelien Jarno
<[EMAIL PROTECTED]>, Pierre Habouzit <[EMAIL PROTECTED]>
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2008-03-23 09:04:13 UTC (rev
2886)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2008-03-23 23:09:04 UTC (rev
2887)
@@ -1,3 +1,8 @@
+ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
+CC = gcc-4.2
+CXX = g++-4.2
+endif
+
libc_slibdir = /lib
libc_libdir = /usr/lib
libc_rtlddir = /lib64
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2008-03-23 09:04:13 UTC (rev
2886)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2008-03-23 23:09:04 UTC (rev
2887)
@@ -1,3 +1,8 @@
+ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
+CC = gcc-4.2
+CXX = g++-4.2
+endif
+
# We use -march=i686 and glibc's i686 routines use cmov, so require it.
# A Debian-local glibc patch adds cmov to the search path.
# The optimized libraries also use NPTL!
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
