diff options
Diffstat (limited to 'patches/glibc-2.3.6/generic/0001-Handle-future-binutils-versions-correctly.patch')
| -rw-r--r-- | patches/glibc-2.3.6/generic/0001-Handle-future-binutils-versions-correctly.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/patches/glibc-2.3.6/generic/0001-Handle-future-binutils-versions-correctly.patch b/patches/glibc-2.3.6/generic/0001-Handle-future-binutils-versions-correctly.patch new file mode 100644 index 0000000..6705245 --- /dev/null +++ b/patches/glibc-2.3.6/generic/0001-Handle-future-binutils-versions-correctly.patch @@ -0,0 +1,75 @@ +From 02841776426c7cf82afd345b04433bbac0747628 Mon Sep 17 00:00:00 2001 +From: H.J. Lu <hongjiu.lu@intel.com> +Date: Sat, 5 Sep 2009 07:06:19 -0700 +Subject: [PATCH] Handle future binutils versions correctly. + +cherry picked and squashed from upstream git. + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> + +--- + ChangeLog | 13 +++++++++++++ + configure | 4 ++-- + configure.in | 4 ++-- + 3 files changed, 17 insertions(+), 4 deletions(-) + +Index: glibc-2.3.6/ChangeLog +=================================================================== +--- glibc-2.3.6.orig/ChangeLog 2010-06-14 16:14:07.198229159 +0200 ++++ glibc-2.3.6/ChangeLog 2010-06-14 16:14:31.465731765 +0200 +@@ -1,3 +1,16 @@ ++2009-09-10 H.J. Lu <hongjiu.lu@intel.com> ++ ++ * configure.in: Exclude binutils 2.X. Support binutils 2.100 ++ and XX. ++ ++2009-09-05 H.J. Lu <hongjiu.lu@intel.com> ++ ++ * configure.in: Support binutils 2.100 and 3.0. ++ ++2009-09-04 H.J. Lu <hongjiu.lu@intel.com> ++ ++ * configure.in: Support binutils 2.20. ++ + 2005-11-03 Roland McGrath <roland@redhat.com> + + * NEWS, version.h (VERSION): 2.3.6. +Index: glibc-2.3.6/configure +=================================================================== +--- glibc-2.3.6.orig/configure 2010-06-14 16:14:07.208230159 +0200 ++++ glibc-2.3.6/configure 2010-06-14 16:14:31.475734685 +0200 +@@ -3917,7 +3917,7 @@ + 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][0-9]*|[3-9].*|[1-9][0-9]*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +@@ -3978,7 +3978,7 @@ + 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][0-9]*|[3-9].*|[1-9][0-9]*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +Index: glibc-2.3.6/configure.in +=================================================================== +--- glibc-2.3.6.orig/configure.in 2010-06-14 16:14:07.208230159 +0200 ++++ glibc-2.3.6/configure.in 2010-06-14 16:14:31.618009326 +0200 +@@ -734,10 +734,10 @@ + # Accept binutils 2.13 or newer. + AC_CHECK_PROG_VER(AS, $AS, --version, + [GNU assembler.* \([0-9]*\.[0-9.]*\)], +- [2.1[3-9]*], AS=: critic_missing="$critic_missing as") ++ [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], AS=: critic_missing="$critic_missing as") + AC_CHECK_PROG_VER(LD, $LD, --version, + [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], +- [2.1[3-9]*], LD=: critic_missing="$critic_missing ld") ++ [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], LD=: critic_missing="$critic_missing ld") + + # We need the physical current working directory. We cannot use the + # "pwd -P" shell builtin since that's not portable. Instead we try to |