r4121 - in glibc-package/branches/eglibc-2.11/debian: rules.d sysdeps testsuite-checking
Author: aurel32
Date: 2010-01-30 23:56:49 +0000 (Sat, 30 Jan 2010)
New Revision: 4121
Modified:
glibc-package/branches/eglibc-2.11/debian/rules.d/build.mk
glibc-package/branches/eglibc-2.11/debian/sysdeps/amd64.mk
glibc-package/branches/eglibc-2.11/debian/sysdeps/i386.mk
glibc-package/branches/eglibc-2.11/debian/testsuite-checking/expected-results-ia64-linux-gnu-libc
Log:
Only enable multiarch on amd64 and i386
Modified: glibc-package/branches/eglibc-2.11/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/rules.d/build.mk 2010-01-30 23:21:50 UTC (rev 4120)
+++ glibc-package/branches/eglibc-2.11/debian/rules.d/build.mk 2010-01-30 23:56:49 UTC (rev 4121)
@@ -79,7 +79,6 @@
--enable-stackguard-randomization \
--with-pkgversion="Debian EGLIBC $(DEB_VERSION)" \
--with-bugurl="http://www.debian.org/Bugs/"; \
- --enable-multi-arch \
$(call xx,with_headers) $(call xx,extra_config_options))
touch $@
Modified: glibc-package/branches/eglibc-2.11/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/sysdeps/amd64.mk 2010-01-30 23:21:50 UTC (rev 4120)
+++ glibc-package/branches/eglibc-2.11/debian/sysdeps/amd64.mk 2010-01-30 23:56:49 UTC (rev 4121)
@@ -1,4 +1,5 @@
libc_rtlddir = /lib64
+extra_config_options = --enable-multi-arch
# /lib64 and /usr/lib64 are provided by glibc instead base-files: #259302.
define libc6_extra_pkg_install
Modified: glibc-package/branches/eglibc-2.11/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/sysdeps/i386.mk 2010-01-30 23:21:50 UTC (rev 4120)
+++ glibc-package/branches/eglibc-2.11/debian/sysdeps/i386.mk 2010-01-30 23:56:49 UTC (rev 4121)
@@ -1,6 +1,8 @@
CC = gcc-4.3
CXX = g++-4.3
+extra_config_options = --enable-multi-arch
+
# 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!
Modified: glibc-package/branches/eglibc-2.11/debian/testsuite-checking/expected-results-ia64-linux-gnu-libc
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/testsuite-checking/expected-results-ia64-linux-gnu-libc 2010-01-30 23:21:50 UTC (rev 4120)
+++ glibc-package/branches/eglibc-2.11/debian/testsuite-checking/expected-results-ia64-linux-gnu-libc 2010-01-30 23:56:49 UTC (rev 4121)
@@ -5,30 +5,6 @@
#
annexc.out, Error 1 (ignored)
check-localplt.out, Error 1
-ifuncmain1.out, Error 139
-ifuncmain1pic.out, Error 139
-ifuncmain1picstatic.out, Error 134
-ifuncmain1static.out, Error 134
-ifuncmain1staticpic.out, Error 134
-ifuncmain1vis.out, Error 134
-ifuncmain1vispic.out, Error 134
-ifuncmain2.out, Error 134
-ifuncmain2pic.out, Error 134
-ifuncmain2picstatic.out, Error 134
-ifuncmain2static.out, Error 134
-ifuncmain3.out, Error 134
-ifuncmain4.out, Error 134
-ifuncmain4picstatic.out, Error 134
-ifuncmain4static.out, Error 134
-ifuncmain5.out, Error 134
-ifuncmain5pic.out, Error 134
-ifuncmain5picstatic.out, Error 134
-ifuncmain5static.out, Error 134
-ifuncmain5staticpic.out, Error 134
-ifuncmain7.out, Error 134
-ifuncmain7pic.out, Error 134
-ifuncmain7picstatic.out, Error 134
-ifuncmain7static.out, Error 134
tst-cpuclock2.out, Error 1
tst-getcpu.out, Error 1
tst-longjmp_chk2.out, Error 1
Reply to: