summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2010-06-14 16:26:20 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2010-06-14 16:26:20 +0200
commitb46d3768e1c3624fcd3c9bba8167f7c3451e7b73 (patch)
tree8fec4d9834583f96c6f7021b7bd86b10cab1b42a
parent56b1c8299399e8a4749697d8a73c603c9e8bbc9d (diff)
downloadOSELAS.Toolchain-b46d3768e1c3624fcd3c9bba8167f7c3451e7b73.tar.gz
glibc-2.3.6: make it compile with binutils > 2.20
recent ubuntu uses binutils-2.20.1 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--patches/glibc-2.3.6/generic/0001-Handle-future-binutils-versions-correctly.patch75
-rw-r--r--patches/glibc-2.3.6/generic/gentoo/1090_all_glibc-2.3.6-fix-pr631.patch16
-rw-r--r--patches/glibc-2.3.6/generic/series1
3 files changed, 84 insertions, 8 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
diff --git a/patches/glibc-2.3.6/generic/gentoo/1090_all_glibc-2.3.6-fix-pr631.patch b/patches/glibc-2.3.6/generic/gentoo/1090_all_glibc-2.3.6-fix-pr631.patch
index 2c26093..c004764 100644
--- a/patches/glibc-2.3.6/generic/gentoo/1090_all_glibc-2.3.6-fix-pr631.patch
+++ b/patches/glibc-2.3.6/generic/gentoo/1090_all_glibc-2.3.6-fix-pr631.patch
@@ -19,11 +19,11 @@ See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631
elf/Makefile | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
-Index: glibc-2.5/Makeconfig
+Index: glibc-2.3.6/Makeconfig
===================================================================
---- glibc-2.5.orig/Makeconfig
-+++ glibc-2.5/Makeconfig
-@@ -510,7 +510,7 @@ endif
+--- glibc-2.3.6.orig/Makeconfig 2010-06-14 16:14:07.198229159 +0200
++++ glibc-2.3.6/Makeconfig 2010-06-14 16:14:25.468230244 +0200
+@@ -487,7 +487,7 @@
# The static libraries.
ifeq (yes,$(build-static))
@@ -32,11 +32,11 @@ Index: glibc-2.5/Makeconfig
else
ifeq (yes,$(build-shared))
# We can try to link the programs with lib*_pic.a...
-Index: glibc-2.5/elf/Makefile
+Index: glibc-2.3.6/elf/Makefile
===================================================================
---- glibc-2.5.orig/elf/Makefile
-+++ glibc-2.5/elf/Makefile
-@@ -120,6 +120,13 @@ install-others = $(inst_slibdir)/$(rtld-
+--- glibc-2.3.6.orig/elf/Makefile 2010-06-14 16:14:07.208230159 +0200
++++ glibc-2.3.6/elf/Makefile 2010-06-14 16:14:25.673340602 +0200
+@@ -115,6 +115,13 @@
install-bin-script = ldd
endif
diff --git a/patches/glibc-2.3.6/generic/series b/patches/glibc-2.3.6/generic/series
index cddc32f..9a5b8e9 100644
--- a/patches/glibc-2.3.6/generic/series
+++ b/patches/glibc-2.3.6/generic/series
@@ -5,3 +5,4 @@ sysdeps_unix_sysv_linux_arm_socket_S-alias.diff
sysdeps_arm-fp-byteorder.diff
csu_Makefile-quotes.diff
gentoo/1090_all_glibc-2.3.6-fix-pr631.patch
+0001-Handle-future-binutils-versions-correctly.patch