From 03eb04b72204568aeeb266d89d90c6c2bf96fd0e Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Fri, 9 Apr 2010 17:32:25 +0200 Subject: [PATCH] glibc/any-cc-as-ld-ok.patch.toolchain: rediffed for glibc 2.10 --- base/glibc/any-cc-as-ld-ok.patch.toolchain | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/base/glibc/any-cc-as-ld-ok.patch.toolchain b/base/glibc/any-cc-as-ld-ok.patch.toolchain index c9a0d50eb..f90bd50b3 100644 --- a/base/glibc/any-cc-as-ld-ok.patch.toolchain +++ b/base/glibc/any-cc-as-ld-ok.patch.toolchain @@ -18,34 +18,34 @@ At toolchain stage we only install glibc headers, so any version of gcc, as and ld are ok for us. -diff -ruN glibc-2.9-orig/configure glibc-2.9/configure ---- glibc-2.9-orig/configure 2009-02-26 22:28:17.000000000 +0100 -+++ glibc-2.9/configure 2010-03-31 10:49:08.000000000 +0200 -@@ -4531,9 +4531,9 @@ +diff -ruN glibc-2.10.1-orig/configure glibc-2.10.1/configure +--- glibc-2.10.1-orig/configure 2009-05-17 14:19:31.000000000 +0200 ++++ glibc-2.10.1/configure 2010-04-08 11:24:13.976339997 +0200 +@@ -4839,9 +4839,9 @@ ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 2.1[3-9]*) +- 2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9]*|[3-9].*) + *) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + XXX) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac - { echo "$as_me:$LINENO: result: $ac_prog_version" >&5 -@@ -4594,9 +4594,9 @@ + { $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5 +@@ -4902,9 +4902,9 @@ ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 2.1[3-9]*) +- 2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9]*|[3-9].*) + *) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + XXX) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac - { echo "$as_me:$LINENO: result: $ac_prog_version" >&5 -@@ -4712,9 +4712,9 @@ + { $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5 +@@ -5020,9 +5020,9 @@ ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -56,10 +56,10 @@ diff -ruN glibc-2.9-orig/configure glibc-2.9/configure + XXX) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac - { echo "$as_me:$LINENO: result: $ac_prog_version" >&5 -diff -ruN glibc-2.9-orig/nptl/sysdeps/pthread/configure glibc-2.9/nptl/sysdeps/pthread/configure ---- glibc-2.9-orig/nptl/sysdeps/pthread/configure 2009-02-26 22:28:17.000000000 +0100 -+++ glibc-2.9/nptl/sysdeps/pthread/configure 2010-03-31 10:46:03.000000000 +0200 + { $as_echo "$as_me:$LINENO: result: $ac_prog_version" >&5 +diff -ruN glibc-2.10.1-orig/nptl/sysdeps/pthread/configure glibc-2.10.1/nptl/sysdeps/pthread/configure +--- glibc-2.10.1-orig/nptl/sysdeps/pthread/configure 2009-05-17 14:19:31.000000000 +0200 ++++ glibc-2.10.1/nptl/sysdeps/pthread/configure 2010-04-08 11:27:38.816841823 +0200 @@ -3,14 +3,14 @@ if test "x$libc_cv_gcc___thread" != xyes; then { { echo "$as_me:$LINENO: error: compiler support for __thread is required" >&5