r3787 - in glibc-package/branches/multiarch/debian: . patches patches/any patches/kfreebsd rules.d sysdeps
Author: aurel32
Date: 2009-08-31 11:14:46 +0000 (Mon, 31 Aug 2009)
New Revision: 3787
Added:
glibc-package/branches/multiarch/debian/patches/any/cvs-unsetenv.diff
glibc-package/branches/multiarch/debian/patches/any/local-linuxthreads-kill_other.diff
Modified:
glibc-package/branches/multiarch/debian/changelog
glibc-package/branches/multiarch/debian/patches/any/local-ld-multiarch.diff
glibc-package/branches/multiarch/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/branches/multiarch/debian/patches/series
glibc-package/branches/multiarch/debian/rules.d/build.mk
glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
glibc-package/branches/multiarch/debian/sysdeps/alpha.mk
glibc-package/branches/multiarch/debian/sysdeps/amd64.mk
glibc-package/branches/multiarch/debian/sysdeps/i386.mk
glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-amd64.mk
glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-i386.mk
glibc-package/branches/multiarch/debian/sysdeps/mips.mk
glibc-package/branches/multiarch/debian/sysdeps/mipsel.mk
glibc-package/branches/multiarch/debian/sysdeps/powerpc.mk
glibc-package/branches/multiarch/debian/sysdeps/ppc64.mk
glibc-package/branches/multiarch/debian/sysdeps/s390.mk
glibc-package/branches/multiarch/debian/sysdeps/sparc.mk
Log:
Merge from trunk, revisions 3768:3786
Modified: glibc-package/branches/multiarch/debian/changelog
===================================================================
--- glibc-package/branches/multiarch/debian/changelog 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/changelog 2009-08-31 11:14:46 UTC (rev 3787)
@@ -1,10 +1,21 @@
-eglibc (2.9-26) UNRELEASED; urgency=low
+eglibc (2.9-26) unstable; urgency=low
+ [ Aurelien Jarno ]
* alpha/submitted-sock_nonblock.diff, hppa/submitted-sock_nonblock.diff:
create the files at the correct location. Closes: bug#540871.
+ * Use the full triplet for optimized and biarch packages.
+ * cvs-unsetenv.diff: new patch to not segfault in unsetenv() if run after
+ clearenv().
- -- Aurelien Jarno <aurel32@debian.org> Mon, 17 Aug 2009 17:57:15 +0200
+ [ Samuel Thibault ]
+ * Convert config_os' gnu-gnu into gnu to fix multiarch paths.
+ [ Petr Salinger ]
+ * kfreebsd/local-sysdeps.diff: update to revision 2744 (from glibc-bsd).
+ * any/local-linuxthreads-kill_other.diff, fixes ruby 1.9 testsuite failure
+
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 31 Aug 2009 07:05:00 +0200
+
eglibc (2.9-25) unstable; urgency=low
* Remove Ben Collins <bcollins@debian.org> from the uploaders (Closes:
Added: glibc-package/branches/multiarch/debian/patches/any/cvs-unsetenv.diff
===================================================================
--- glibc-package/branches/multiarch/debian/patches/any/cvs-unsetenv.diff (rev 0)
+++ glibc-package/branches/multiarch/debian/patches/any/cvs-unsetenv.diff 2009-08-31 11:14:46 UTC (rev 3787)
@@ -0,0 +1,43 @@
+2008-12-01 Ulrich Drepper <drepper@redhat.com>
+
+ * stdlib/setenv.c (unsetenv): Don't search environment if it does
+ not exist.
+
+diff --git a/stdlib/setenv.c b/stdlib/setenv.c
+index 48aaecf..fe591b7 100644
+--- a/stdlib/setenv.c
++++ b/stdlib/setenv.c
+@@ -292,19 +292,20 @@ unsetenv (name)
+ LOCK;
+
+ ep = __environ;
+- while (*ep != NULL)
+- if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
+- {
+- /* Found it. Remove this pointer by moving later ones back. */
+- char **dp = ep;
+-
+- do
+- dp[0] = dp[1];
+- while (*dp++);
+- /* Continue the loop in case NAME appears again. */
+- }
+- else
+- ++ep;
++ if (ep != NULL)
++ while (*ep != NULL)
++ if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++ {
++ /* Found it. Remove this pointer by moving later ones back. */
++ char **dp = ep;
++
++ do
++ dp[0] = dp[1];
++ while (*dp++);
++ /* Continue the loop in case NAME appears again. */
++ }
++ else
++ ++ep;
+
+ UNLOCK;
+
Modified: glibc-package/branches/multiarch/debian/patches/any/local-ld-multiarch.diff
===================================================================
--- glibc-package/branches/multiarch/debian/patches/any/local-ld-multiarch.diff 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/patches/any/local-ld-multiarch.diff 2009-08-31 11:14:46 UTC (rev 3787)
@@ -1,3 +1,8 @@
+2009-08-23 Samuel Thibault <sthibault@debian.org>
+
+ * Makeconfig: convert back gnu-gnu into gnu.
+ Look for gnu-gnu in configure.in for the reason (easier matching).
+
2009-08-09 Aurelien Jarno <aurelien@aurel32.net>
* Makeconfig: convert i586 and i686 into i486.
@@ -8,7 +13,7 @@
--- a/Makeconfig
+++ b/Makeconfig
-@@ -191,6 +191,16 @@
+@@ -191,6 +191,21 @@
endif
inst_libdir = $(install_root)$(libdir)
@@ -19,8 +24,13 @@
+else
+multiarch-machine = $(config-machine)
+endif
-+extra_libdir = /lib/$(multiarch-machine)-$(config-os):$(exec_prefix)/lib/$(multiarch-machine)-$(config-os)
++ifeq ($(config-os),gnu-gnu)
++multiarch-os = gnu
++else
++multiarch-os = $(config-os)
+endif
++extra_libdir = /lib/$(multiarch-machine)-$(multiarch-os):$(exec_prefix)/lib/$(multiarch-machine)-$(multiarch-os)
++endif
+
# Where to install the shared library and dynamic linker.
ifndef slibdir
Added: glibc-package/branches/multiarch/debian/patches/any/local-linuxthreads-kill_other.diff
===================================================================
--- glibc-package/branches/multiarch/debian/patches/any/local-linuxthreads-kill_other.diff (rev 0)
+++ glibc-package/branches/multiarch/debian/patches/any/local-linuxthreads-kill_other.diff 2009-08-31 11:14:46 UTC (rev 3787)
@@ -0,0 +1,31 @@
+
+
+ fixes ruby 1.9 testsuite failure t916 from #542927
+
+
+--- a/linuxthreads/pthread.c
++++ b/linuxthreads/pthread.c
+@@ -1199,6 +1199,15 @@
+ /* Reset the signal handlers behaviour for the signals the
+ implementation uses since this would be passed to the new
+ process. */
++#if 1
++ /*
++ do not do it as it is wrong.
++ the __pthread_kill_other_threads_np() is used just before exec,
++ the successfull one resets signals with handler into DFL behaviour anyway (in kernel),
++ the failed one needs the signal handler as before to allow creating of new threads
++ as already noted above
++ */
++#else
+ sigemptyset(&sa.sa_mask);
+ sa.sa_flags = 0;
+ sa.sa_handler = SIG_DFL;
+@@ -1206,6 +1215,7 @@
+ __libc_sigaction(__pthread_sig_cancel, &sa, NULL);
+ if (__pthread_sig_debug > 0)
+ __libc_sigaction(__pthread_sig_debug, &sa, NULL);
++#endif
+ }
+ weak_alias (__pthread_kill_other_threads_np, pthread_kill_other_threads_np)
+
Modified: glibc-package/branches/multiarch/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/multiarch/debian/patches/kfreebsd/local-sysdeps.diff 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/patches/kfreebsd/local-sysdeps.diff 2009-08-31 11:14:46 UTC (rev 3787)
@@ -47,7 +47,7 @@
+gnu
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Makefile
-@@ -0,0 +1,133 @@
+@@ -0,0 +1,136 @@
+# Use bash, not /bin/sh, for executing scripts, because the native
+# FreeBSD /bin/sh does not interpret the IFS="<tab>" read ... command
+# in localedata/tst-fmon.sh correctly.
@@ -57,6 +57,7 @@
+
+ifeq ($(subdir),misc)
+sysdep_headers += \
++ kenv.h \
+ sys/mount.h \
+ sys/kd.h \
+ sys/rfork.h
@@ -102,6 +103,8 @@
+endif
+
+ifeq ($(subdir),misc)
++# For <kenv.h>.
++sysdep_routines += kenv
+# For <sched.h>.
+sysdep_routines += clone start_thread
+# For <unistd.h>.
@@ -7134,7 +7137,7 @@
+#include <sysdeps/unix/clock_settime.c>
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/clone.c
-@@ -0,0 +1,105 @@
+@@ -0,0 +1,108 @@
+/* Create a thread.
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -7199,14 +7202,17 @@
+ return -1;
+ }
+
-+ if ((flags & CSIGNAL) != 0 && (flags & CSIGNAL) != SIGCHLD)
++ if ((flags & CSIGNAL) != SIGCHLD)
+ {
+ if ((flags & CSIGNAL) & ~RFTHPNMASK)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
-+ rfork_flags |= (RFLINUXTHPN | ((flags & CSIGNAL) << RFTHPNSHIFT));
++ if ((flags & CSIGNAL) == 0)
++ rfork_flags |= (RFLINUXTHPN | ((SIGCHLD) << RFTHPNSHIFT));
++ else
++ rfork_flags |= (RFLINUXTHPN | ((flags & CSIGNAL) << RFTHPNSHIFT));
+ }
+
+ if (flags & CLONE_VM)
@@ -14441,6 +14447,48 @@
+ abort ();
+}
--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/kenv.h
+@@ -0,0 +1,39 @@
++/*-
++ * Copyright (c) 2002 Maxime Henrion <mux@FreeBSD.org>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ *
++ * $FreeBSD: src/include/kenv.h,v 1.2.8.1 2009/04/15 03:14:26 kensmith Exp $
++ */
++
++#ifndef _KENV_H_
++#define _KENV_H 1
++
++#include <sys/cdefs.h>
++#include <sys/kenv.h>
++
++__BEGIN_DECLS
++int kenv(int action, const char *name, char *value, int len);
++__END_DECLS
++
++#endif /* !_KENV_H */
+--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/kernel-features.h
@@ -0,0 +1,92 @@
+/* Set flags signalling availability of kernel features based on given
@@ -22291,7 +22339,7 @@
+#endif
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list
-@@ -0,0 +1,183 @@
+@@ -0,0 +1,184 @@
+# File name Caller Syscall name # args Strong name Weak names
+sys_access - access i:si __syscall_access
+acl_aclcheck_fd - acl_aclcheck_fd i:iip __acl_aclcheck_fd
@@ -22341,6 +22389,7 @@
+getsid - getsid i:i getsid
+issetugid - issetugid i: issetugid
+jail - jail i:p jail
++kenv - kenv i:issi kenv
+kldfind - kldfind i:s kldfind
+kldfirstmod - kldfirstmod i:i kldfirstmod
+kldload - kldload i:s kldload
Modified: glibc-package/branches/multiarch/debian/patches/series
===================================================================
--- glibc-package/branches/multiarch/debian/patches/series 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/patches/series 2009-08-31 11:14:46 UTC (rev 3787)
@@ -165,6 +165,7 @@
any/local-linuxthreads-defines.diff
any/local-linuxthreads-fd.diff
any/local-linuxthreads-gscope.diff
+any/local-linuxthreads-kill_other.diff
any/local-linuxthreads-lowlevellock.diff
any/local-linuxthreads-fatalprepare.diff
any/local-linuxthreads-ptw.diff
@@ -218,3 +219,4 @@
any/submitted-tst-cpucount.diff
any/cvs-getaddrinfo-nss-notfound.diff
any/cvs-signalfd-eventfd.diff
+any/cvs-unsetenv.diff
Modified: glibc-package/branches/multiarch/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/build.mk 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/rules.d/build.mk 2009-08-31 11:14:46 UTC (rev 3787)
@@ -142,7 +142,7 @@
if [ $(curpass) = libc ]; then \
mkdir -p debian/tmp-$(curpass)/etc/ld.so.conf.d; \
machine=`sed '/^ *config-machine *=/!d;s/.*= *//g' $(DEB_BUILDDIR)/config.make`; \
- os=`sed '/^ *config-os *=/!d;s/.*= *//g' $(DEB_BUILDDIR)/config.make`; \
+ os=`sed '/^ *config-os *=/!d;s/.*= *//g;s/gnu-gnu/gnu/' $(DEB_BUILDDIR)/config.make`; \
triplet="$$machine-$$os"; \
conffile="debian/tmp-$(curpass)/etc/ld.so.conf.d/$$triplet.conf"; \
echo "# Multiarch support" > $$conffile; \
Modified: glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/debhelper.mk 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/rules.d/debhelper.mk 2009-08-31 11:14:46 UTC (rev 3787)
@@ -142,7 +142,7 @@
$(stamp)debhelper:
for x in `find debian/debhelper.in -maxdepth 1 -type f`; do \
y=debian/`basename $$x`; \
- z=`echo $$y | sed -e 's#libc\(\|-alt\|-dev\|-dev-alt\|-otherbuild\|-pic\|-proc\|-udeb\)\.#$(libc)\1.#g'`; \
+ z=`echo $$y | sed -e 's#libc\(\|-alt\|-dev\|-dev-alt\|-otherbuild\|-pic\|-prof\|-udeb\)\.#$(libc)\1.#g'`; \
cp $$x $$z; \
sed -e "s#BUILD-TREE#$(build-tree)#" -i $$z; \
sed -e "/NSS_CHECK/r debian/script.in/nsscheck.sh" -i $$z; \
Modified: glibc-package/branches/multiarch/debian/sysdeps/alpha.mk
===================================================================
--- glibc-package/branches/multiarch/debian/sysdeps/alpha.mk 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/sysdeps/alpha.mk 2009-08-31 11:14:46 UTC (rev 3787)
@@ -5,7 +5,7 @@
DEB_ARCH_REGULAR_PACKAGES += libc6.1-alphaev67
alphaev67_MIN_KERNEL_SUPPORTED = 2.6.9
alphaev67_add-ons = nptl $(add-ons)
-alphaev67_configure_target = alphaev67-linux
+alphaev67_configure_target = alphaev67-linux-gnu
alphaev67_extra_cflags = -mcpu=ev67 -mtune=ev67 -O2
alphaev67_extra_config_options = $(extra_config_options) --disable-profile
alphaev67_rtlddir = /lib
Modified: glibc-package/branches/multiarch/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/multiarch/debian/sysdeps/amd64.mk 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/sysdeps/amd64.mk 2009-08-31 11:14:46 UTC (rev 3787)
@@ -11,7 +11,7 @@
DEB_ARCH_REGULAR_PACKAGES += libc6-i386 libc6-dev-i386
libc6-i386_shlib_dep = libc6-i386 (>= $(shlib_dep_ver))
i386_add-ons = nptl $(add-ons)
-i386_configure_target = i686-linux
+i386_configure_target = i686-linux-gnu
i386_CC = $(CC) -m32
i386_CXX = $(CC) -m32
i386_extra_cflags = -march=pentium4 -O3
Modified: glibc-package/branches/multiarch/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/multiarch/debian/sysdeps/i386.mk 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/sysdeps/i386.mk 2009-08-31 11:14:46 UTC (rev 3787)
@@ -4,7 +4,7 @@
EGLIBC_PASSES += i686
DEB_ARCH_REGULAR_PACKAGES += libc6-i686
i686_add-ons = nptl $(add-ons)
-i686_configure_target=i686-linux
+i686_configure_target=i686-linux-gnu
i686_extra_cflags = -march=i686 -mtune=i686 -O3
i686_rtlddir = /lib
i686_slibdir = /lib/i686/cmov
@@ -15,7 +15,7 @@
EGLIBC_PASSES += xen
DEB_ARCH_REGULAR_PACKAGES += libc6-xen
xen_add-ons = nptl $(add-ons)
-xen_configure_target=i686-linux
+xen_configure_target=i686-linux-gnu
xen_extra_cflags = -march=i686 -mtune=i686 -O3 -mno-tls-direct-seg-refs
xen_rtlddir = /lib
xen_slibdir = /lib/i686/nosegneg
Modified: glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-amd64.mk 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-amd64.mk 2009-08-31 11:14:46 UTC (rev 3787)
@@ -13,7 +13,7 @@
DEB_ARCH_REGULAR_PACKAGES += libc0.1-i386 libc0.1-dev-i386
libc0.1-i386_shlib_dep = libc0.1-i386 (>= $(shlib_dep_ver))
-i386_configure_target = i686-kfreebsd
+i386_configure_target = i686-kfreebsd-gnu
i386_CC = $(CC) -m32
i386_CXX = $(CXX) -m32
i386_add-ons = ports linuxthreads $(add-ons)
Modified: glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-i386.mk
===================================================================
--- glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-i386.mk 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/sysdeps/kfreebsd-i386.mk 2009-08-31 11:14:46 UTC (rev 3787)
@@ -4,7 +4,7 @@
# 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.
i686_add-ons = ports linuxthreads $(add-ons)
-i686_configure_target=i686-kfreebsd
+i686_configure_target=i686-kfreebsd-gnu
i686_extra_cflags = -march=i686 -mtune=i686 -O3
i686_rtlddir = /lib
i686_slibdir = /lib/i686/cmov
Modified: glibc-package/branches/multiarch/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/branches/multiarch/debian/sysdeps/mips.mk 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/sysdeps/mips.mk 2009-08-31 11:14:46 UTC (rev 3787)
@@ -22,7 +22,7 @@
EGLIBC_PASSES += mipsn32
DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
mipsn32_add-ons = ports nptl $(add-ons)
-mipsn32_configure_target = mips32-linux
+mipsn32_configure_target = mips32-linux-gnu
mipsn32_CC = $(CC) -mabi=n32
mipsn32_CXX = $(CXX) -mabi=n32
libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
@@ -35,7 +35,7 @@
EGLIBC_PASSES += mips64
DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
mips64_add-ons = ports nptl $(add-ons)
-mips64_configure_target = mips64-linux
+mips64_configure_target = mips64-linux-gnu
mips64_CC = $(CC) -mabi=64
mips64_CXX = $(CXX) -mabi=64
libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
Modified: glibc-package/branches/multiarch/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/branches/multiarch/debian/sysdeps/mipsel.mk 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/sysdeps/mipsel.mk 2009-08-31 11:14:46 UTC (rev 3787)
@@ -22,7 +22,7 @@
EGLIBC_PASSES += mipsn32
DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
mipsn32_add-ons = ports nptl $(add-ons)
-mipsn32_configure_target = mips32el-linux
+mipsn32_configure_target = mips32el-linux-gnu
mipsn32_CC = $(CC) -mabi=n32
mipsn32_CXX = $(CXX) -mabi=n32
libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
@@ -35,7 +35,7 @@
EGLIBC_PASSES += mips64
DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
mips64_add-ons = ports nptl $(add-ons)
-mips64_configure_target = mips64el-linux
+mips64_configure_target = mips64el-linux-gnu
mips64_CC = $(CC) -mabi=64
mips64_CXX = $(CXX) -mabi=64
libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
Modified: glibc-package/branches/multiarch/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/branches/multiarch/debian/sysdeps/powerpc.mk 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/sysdeps/powerpc.mk 2009-08-31 11:14:46 UTC (rev 3787)
@@ -2,7 +2,7 @@
EGLIBC_PASSES += ppc64
DEB_ARCH_REGULAR_PACKAGES += libc6-ppc64 libc6-dev-ppc64
ppc64_add-ons = nptl $(add-ons)
-ppc64_configure_target = powerpc64-linux
+ppc64_configure_target = powerpc64-linux-gnu
ppc64_CC = $(CC) -m64
ppc64_CXX = $(CXX) -m64
libc6-ppc64_shlib_dep = libc6-ppc64 (>= $(shlib_dep_ver))
Modified: glibc-package/branches/multiarch/debian/sysdeps/ppc64.mk
===================================================================
--- glibc-package/branches/multiarch/debian/sysdeps/ppc64.mk 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/sysdeps/ppc64.mk 2009-08-31 11:14:46 UTC (rev 3787)
@@ -13,7 +13,7 @@
DEB_ARCH_REGULAR_PACKAGES += libc6-powerpc libc6-dev-powerpc
libc6-powerpc_shlib_dep = libc6-powerpc (>= $(shlib_dep_ver))
powerpc_add-ons = nptl $(add-ons)
-powerpc_configure_target = powerpc-linux
+powerpc_configure_target = powerpc-linux-gnu
powerpc_CC = $(CC) -m32
powerpc_CXX = $(CXX) -m32
powerpc_extra_cflags = -O3
Modified: glibc-package/branches/multiarch/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/branches/multiarch/debian/sysdeps/s390.mk 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/sysdeps/s390.mk 2009-08-31 11:14:46 UTC (rev 3787)
@@ -2,7 +2,7 @@
EGLIBC_PASSES += s390x
DEB_ARCH_REGULAR_PACKAGES += libc6-s390x libc6-dev-s390x
s390x_add-ons = nptl $(add-ons)
-s390x_configure_target = s390x-linux
+s390x_configure_target = s390x-linux-gnu
s390x_CC = $(CC) -m64
s390x_CXX = $(CXX) -m64
libc6-s390x_shlib_dep = libc6-s390x (>= $(shlib_dep_ver))
Modified: glibc-package/branches/multiarch/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/branches/multiarch/debian/sysdeps/sparc.mk 2009-08-31 09:47:51 UTC (rev 3786)
+++ glibc-package/branches/multiarch/debian/sysdeps/sparc.mk 2009-08-31 11:14:46 UTC (rev 3787)
@@ -2,8 +2,8 @@
EGLIBC_PASSES += sparcv9b
DEB_ARCH_REGULAR_PACKAGES += libc6-sparcv9b
sparcv9b_add-ons = nptl $(add-ons)
-sparcv9b_configure_target=sparcv9b-linux
-sparcv9b_configure_build=sparcv9b-linux
+sparcv9b_configure_target=sparcv9b-linux-gnu
+sparcv9b_configure_build=sparcv9b-linux-gnu
sparcv9b_extra_cflags = -mtune=ultrasparc3 -O3
sparcv9b_extra_config_options = $(extra_config_options) --disable-profile
sparcv9b_rtlddir = /lib
@@ -13,7 +13,7 @@
EGLIBC_PASSES += sparc64
DEB_ARCH_REGULAR_PACKAGES += libc6-sparc64 libc6-dev-sparc64
sparc64_add-ons = nptl $(add-ons)
-sparc64_configure_target=sparc64-linux
+sparc64_configure_target=sparc64-linux-gnu
sparc64_CC = $(CC) -m64
sparc64_CXX = $(CXX) -m64
libc6-sparc64_shlib_dep = libc6-sparc64 (>= $(shlib_dep_ver))
Reply to: