diff options
Diffstat (limited to 'patches/glibc-2.3.6/generic')
9 files changed, 0 insertions, 540 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 deleted file mode 100644 index 6705245..0000000 --- a/patches/glibc-2.3.6/generic/0001-Handle-future-binutils-versions-correctly.patch +++ /dev/null @@ -1,75 +0,0 @@ -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/csu_Makefile-quotes.diff b/patches/glibc-2.3.6/generic/csu_Makefile-quotes.diff deleted file mode 100644 index 5ff7d39..0000000 --- a/patches/glibc-2.3.6/generic/csu_Makefile-quotes.diff +++ /dev/null @@ -1,22 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Subject: works now on ubuntu, where bin dash in /bin/sh - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> - ---- - csu/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: glibc-2.3.6/csu/Makefile -=================================================================== ---- glibc-2.3.6.orig/csu/Makefile -+++ glibc-2.3.6/csu/Makefile -@@ -241,7 +241,7 @@ $(objpfx)version-info.h: $(common-objpfx - esac; \ - files="$(all-Banner-files)"; \ - if test -n "$$files"; then \ -- echo "\"Available extensions:\\n\""; \ -+ echo '"Available extensions:\\n"'; \ - sed -e '/^#/d' -e 's/^[[:space:]]*/ /' \ - -e 's/^\(.*\)$$/\"\1\\n\"/' $$files; \ - fi) > $@T 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 deleted file mode 100644 index c004764..0000000 --- a/patches/glibc-2.3.6/generic/gentoo/1090_all_glibc-2.3.6-fix-pr631.patch +++ /dev/null @@ -1,52 +0,0 @@ -From dank@kegel.com -Wed Jun 15 09:12:43 PDT 2005 - -Fixes - -build-glibc/libc.a(nsswitch.o)(.data+0x64): undefined reference to `_nss_files_getaliasent_r' -build-glibc/libc.a(nsswitch.o)(.data+0x6c): undefined reference to `_nss_files_endaliasent' -... 53 lines deleted ... -build-glibc/libc.a(nsswitch.o)(.data+0x21c): undefined reference to `_nss_files_getspnam_r' -collect2: ld returned 1 exit status -make[2]: *** [/build/gcc-3.4.3-glibc-2.3.5-hdrs-2.6.11.2/i686-unknown-linux-gnu/build-glibc/elf/ldconfig] Error 1 - -when building glibc with --enable-static-nss. - -See http://sources.redhat.com/bugzilla/show_bug.cgi?id=631 - ---- - Makeconfig | 2 +- - elf/Makefile | 7 +++++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -Index: glibc-2.3.6/Makeconfig -=================================================================== ---- 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)) --link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a -+link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(otherlibs) $(common-objpfx)libc.a - else - ifeq (yes,$(build-shared)) - # We can try to link the programs with lib*_pic.a... -Index: glibc-2.3.6/elf/Makefile -=================================================================== ---- 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 - -+ifeq (yes,$(build-static-nss)) -+nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss) -+resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv) -+otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \ -+ $(resolvobjdir)/libresolv.a -+endif -+ - others = sprof sln - install-bin = sprof - others-static = sln diff --git a/patches/glibc-2.3.6/generic/make-install-lib-all.patch b/patches/glibc-2.3.6/generic/make-install-lib-all.patch deleted file mode 100644 index 1e69bb2..0000000 --- a/patches/glibc-2.3.6/generic/make-install-lib-all.patch +++ /dev/null @@ -1,26 +0,0 @@ -From http://svn.exactcode.de/t2/trunk/package/base/glibc32/make-install-lib-all.patch -Rule to install all needed libraries, not just the ones installed by install-lib, -yet not install programs. -Needed because we can't use the main install target, as we can't build programs before -we have the final gcc installed; linking fails because libeh.a is not present, -and glibc insists on linking programs with that library. - -diff -Naur glibc-2.3.4.orig/Makerules glibc-2.3.4/Makerules ---- glibc-2.3.4.orig/Makerules 2004-12-15 20:52:39.000000000 +0200 -+++ glibc-2.3.4/Makerules 2005-02-19 15:16:31.415125176 +0200 -@@ -844,6 +844,13 @@ - installed-libcs := $(foreach o,$(filter-out .os,$(object-suffixes-for-libc)),\ - $(inst_libdir)/$(patsubst %,$(libtype$o),\ - $(libprefix)$(libc-name))) -+ -+install-lib-all: $(inst_slibdir)/libc.so$(libc.so-version) \ -+ $(inst_slibdir)/libc-$(version).so \ -+ $(inst_libdir)/libc.so \ -+ $(inst_libdir)/libc.a \ -+ install-lib -+ - install: $(installed-libcs) - $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force) - $(make-target-directory) - -Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> diff --git a/patches/glibc-2.3.6/generic/series b/patches/glibc-2.3.6/generic/series deleted file mode 100644 index 9a5b8e9..0000000 --- a/patches/glibc-2.3.6/generic/series +++ /dev/null @@ -1,8 +0,0 @@ -make-install-lib-all.patch -sysdeps_arm_dl-machine_h-fix_bad_pc24.diff -sysdeps_unix_sysv_linux_arm_ioperm_c-BUS_ISA.diff -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 diff --git a/patches/glibc-2.3.6/generic/sysdeps_arm-fp-byteorder.diff b/patches/glibc-2.3.6/generic/sysdeps_arm-fp-byteorder.diff deleted file mode 100644 index d45cdbc..0000000 --- a/patches/glibc-2.3.6/generic/sysdeps_arm-fp-byteorder.diff +++ /dev/null @@ -1,205 +0,0 @@ -Taken from http://sources.redhat.com/ml/crossgcc/2004-02/msg00104.html -Author: addsub@eyou.com -Target: ARM - -Fixes http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/testsuite/gcc.c-torture/execute/920501-8.c -and makes printf("%f", 1.0) work. - -Lennert Buytenhek wrote in http://sources.redhat.com/ml/crossgcc/2004-09/msg00115.html : - It ... fixes the 'printf("%f\n", 0.5); prints 0.000000' and general 'floating point - is broken' on my big-endian hardfloat FPA ARM platform. ... - It's definitely needed for hardfloat. So I'd think it's needed for - big-endian systems in any case, and for VFP on little-endian systems - too. Someone would have to verify that though. - -Lennert Buytenhek wrote in http://sources.redhat.com/ml/crossgcc/2004-09/msg00123.html - I just had a look at glibc-20040830, and [this patch] is still needed and useful - for this version. glibc-20040830 out-of-the-box still contains the - following wrong assumptions: - - sysdeps/arm/bits/endian.h: float word order is big endian (which it is - not on vfp systems) - - sysdeps/arm/gmp-mparam.h: IEEE doubles are mixed endian (which they - are not on big endian systems, neither on vfp systems) - - sysdeps/arm/ieee754.h: IEEE doubles are in little endian byte order - (which they are not on big endian systems) - [This patch] seems the right solution for all of these issues. - -Dimitry Andric wrote in http://sources.redhat.com/ml/crossgcc/2004-09/msg00132.html : - It's even needed for glibc CVS, AFAICS. - The patch hunk which modifies glibc.new/sysdeps/arm/bits/endian.h - (currently at version 1.4) is only needed for proper VFP operation. - But the hunk which modifies sysdeps/arm/gmp-mparam.h, and the hunk - that deletes sysdeps/arm/ieee754.h (yes, this IS correct), are needed - for proper operation of *any* FP model on big endian ARM. - -See also discussion in followups to -http://sources.redhat.com/ml/crossgcc/2004-05/msg00245.html) - -Message-ID: <276985760.37584@eyou.com> -Received: from unknown (HELO eyou.com) (172.16.2.2) - by 0.0.0.0 with SMTP; Tue, 17 Feb 2004 10:42:40 +0800 -Received: (qmail 8238 invoked by uid 65534); 17 Feb 2004 10:42:38 +0800 -Date: 17 Feb 2004 10:42:38 +0800 -Message-ID: <20040217104238.8237.qmail@eyou.com> -From: "add" <addsub@eyou.com> -To: dank@kegel.com -Reply-To: "add" <addsub@eyou.com> -Subject: Re: problem while building arm vfp softfloat gcc ` - -Hi, Dan, This is a patch I applied to my glibc-2.3.2, then my softfloat -toolchain can printf("%f\n",1.0). So you may have a try of this - - -diff -uNrp glibc.old/sysdeps/arm/bits/endian.h glibc.new/sysdeps/arm/bits/endian.h ---- glibc.old/sysdeps/arm/bits/endian.h 1999-04-12 11:59:13.000000000 -0400 -+++ glibc.new/sysdeps/arm/bits/endian.h 2004-02-12 09:15:13.000000000 -0500 -@@ -9,4 +9,9 @@ - #else - #define __BYTE_ORDER __LITTLE_ENDIAN - #endif -+ -+#ifdef __VFP_FP__ -+#define __FLOAT_WORD_ORDER __BYTE_ORDER -+#else - #define __FLOAT_WORD_ORDER __BIG_ENDIAN -+#endif -diff -uNrp glibc.old/sysdeps/arm/gmp-mparam.h glibc.new/sysdeps/arm/gmp-mparam.h ---- glibc.old/sysdeps/arm/gmp-mparam.h 2001-07-07 15:21:19.000000000 -0400 -+++ glibc.new/sysdeps/arm/gmp-mparam.h 2004-02-12 09:15:13.000000000 -0500 -@@ -26,5 +26,13 @@ MA 02111-1307, USA. */ - #define BITS_PER_SHORTINT 16 - #define BITS_PER_CHAR 8 - --#define IEEE_DOUBLE_BIG_ENDIAN 0 --#define IEEE_DOUBLE_MIXED_ENDIAN 1 -+#if defined(__ARMEB__) -+# define IEEE_DOUBLE_MIXED_ENDIAN 0 -+# define IEEE_DOUBLE_BIG_ENDIAN 1 -+#elif defined(__VFP_FP__) -+# define IEEE_DOUBLE_MIXED_ENDIAN 0 -+# define IEEE_DOUBLE_BIG_ENDIAN 0 -+#else -+# define IEEE_DOUBLE_BIG_ENDIAN 0 -+# define IEEE_DOUBLE_MIXED_ENDIAN 1 -+#endif -diff -uNrp glibc.old/sysdeps/arm/ieee754.h glibc.new/sysdeps/arm/ieee754.h ---- glibc.old/sysdeps/arm/ieee754.h 2001-07-07 15:21:19.000000000 -0400 -+++ glibc.new/sysdeps/arm/ieee754.h 1969-12-31 19:00:00.000000000 -0500 -@@ -1,115 +0,0 @@ --/* Copyright (C) 1992, 1995, 1996, 1998 Free Software Foundation, Inc. -- This file is part of the GNU C Library. -- -- The GNU C Library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public -- License as published by the Free Software Foundation; either -- version 2.1 of the License, or (at your option) any later version. -- -- The GNU C Library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -- -- You should have received a copy of the GNU Lesser General Public -- License along with the GNU C Library; if not, write to the Free -- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -- 02111-1307 USA. */ -- --#ifndef _IEEE754_H -- --#define _IEEE754_H 1 --#include <features.h> -- --#include <endian.h> -- --__BEGIN_DECLS -- --union ieee754_float -- { -- float f; -- -- /* This is the IEEE 754 single-precision format. */ -- struct -- { -- unsigned int mantissa:23; -- unsigned int exponent:8; -- unsigned int negative:1; -- } ieee; -- -- /* This format makes it easier to see if a NaN is a signalling NaN. */ -- struct -- { -- unsigned int mantissa:22; -- unsigned int quiet_nan:1; -- unsigned int exponent:8; -- unsigned int negative:1; -- } ieee_nan; -- }; -- --#define IEEE754_FLOAT_BIAS 0x7f /* Added to exponent. */ -- -- --union ieee754_double -- { -- double d; -- -- /* This is the IEEE 754 double-precision format. */ -- struct -- { -- unsigned int mantissa0:20; -- unsigned int exponent:11; -- unsigned int negative:1; -- unsigned int mantissa1:32; -- } ieee; -- -- /* This format makes it easier to see if a NaN is a signalling NaN. */ -- struct -- { -- unsigned int mantissa0:19; -- unsigned int quiet_nan:1; -- unsigned int exponent:11; -- unsigned int negative:1; -- unsigned int mantissa1:32; -- } ieee_nan; -- }; -- --#define IEEE754_DOUBLE_BIAS 0x3ff /* Added to exponent. */ -- -- --/* The following two structures are correct for `new' floating point systems but -- wrong for the old FPPC. The only solution seems to be to avoid their use on -- old hardware. */ -- --union ieee854_long_double -- { -- long double d; -- -- /* This is the IEEE 854 double-extended-precision format. */ -- struct -- { -- unsigned int exponent:15; -- unsigned int empty:16; -- unsigned int negative:1; -- unsigned int mantissa1:32; -- unsigned int mantissa0:32; -- } ieee; -- -- /* This is for NaNs in the IEEE 854 double-extended-precision format. */ -- struct -- { -- unsigned int exponent:15; -- unsigned int empty:16; -- unsigned int negative:1; -- unsigned int mantissa1:32; -- unsigned int mantissa0:30; -- unsigned int quiet_nan:1; -- unsigned int one:1; -- } ieee_nan; -- }; -- --#define IEEE854_LONG_DOUBLE_BIAS 0x3fff -- --__END_DECLS -- --#endif /* ieee754.h */ - -Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> diff --git a/patches/glibc-2.3.6/generic/sysdeps_arm_dl-machine_h-fix_bad_pc24.diff b/patches/glibc-2.3.6/generic/sysdeps_arm_dl-machine_h-fix_bad_pc24.diff deleted file mode 100644 index 9506e45..0000000 --- a/patches/glibc-2.3.6/generic/sysdeps_arm_dl-machine_h-fix_bad_pc24.diff +++ /dev/null @@ -1,35 +0,0 @@ -Fixes -In file included from dynamic-link.h:22, - from dl-reloc.c:265: -../sysdeps/arm/dl-machine.h: In function '_dl_relocate_object': -../sysdeps/arm/dl-machine.h:371: error: invalid storage class for function 'fix_bad_pc24' -make[2]: Leaving directory `/home/dank/queue/jobdir.k8/crosstool-dev/build/arm-unknown-linux-gnu/gcc-4.0-20050305-glibc-2.3.6/glibc-2.3.6/elf' - -when building glibc-2.3.6 with gcc-4.0 - -Like -http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/arm/dl-machine.h.diff?r1=1.51&r2=1.52&cvsroot=glibc -but fixes fix_bad_pc24. - - ---- a/sysdeps/arm/dl-machine.h Sun Mar 20 17:54:37 2005 -+++ b/sysdeps/arm/dl-machine.h Sun Mar 20 17:57:32 2005 -@@ -357,7 +357,14 @@ - #ifdef RESOLVE - - /* Deal with an out-of-range PC24 reloc. */ --static Elf32_Addr -+#if __GNUC__ >= 4 -+ auto inline Elf32_Addr -+#else -+ static inline Elf32_Addr -+#endif -+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) -+ __attribute ((always_inline)) -+#endif - fix_bad_pc24 (Elf32_Addr *const reloc_addr, Elf32_Addr value) - { - static void *fix_page; - -Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> -with a little editing by dank@kegel.com diff --git a/patches/glibc-2.3.6/generic/sysdeps_unix_sysv_linux_arm_ioperm_c-BUS_ISA.diff b/patches/glibc-2.3.6/generic/sysdeps_unix_sysv_linux_arm_ioperm_c-BUS_ISA.diff deleted file mode 100644 index 413c685..0000000 --- a/patches/glibc-2.3.6/generic/sysdeps_unix_sysv_linux_arm_ioperm_c-BUS_ISA.diff +++ /dev/null @@ -1,53 +0,0 @@ -Applies to both glibc-2.2.5 and glibc-2.3.2, and probably glibc cvs as of Aug 2004. -Needed to build glibc with linux kernels 2.4.23 or higher on ARM, -Fixes following error: - -../sysdeps/unix/sysv/linux/arm/ioperm.c: In function `init_iosys': -../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: `BUS_ISA' undeclared (first use in this function) -../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: (Each undeclared identifier is reported only once -../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: for each function it appears in.) -../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: initializer element is not constant -../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: (near initialization for `iobase_name[1]') -../sysdeps/unix/sysv/linux/arm/ioperm.c:104: error: initializer element is not constant -../sysdeps/unix/sysv/linux/arm/ioperm.c:104: error: (near initialization for `ioshift_name[1]') -make[2]: *** [/home/dank/crosstool-0.28/build/arm-softfloat-linux-gnu/gcc-3.3.4-glibc-2.2.5/build-glibc/misc/ioperm.o] Error 1 - -cf. "[SYSCTL] BUS_ISA -> CTL_BUS_ISA", http://www.ussg.iu.edu/hypermail/linux/kernel/0311.0/0529.html - ---- glibc-2.3.2/sysdeps/unix/sysv/linux/arm/ioperm.c.old 2003-02-20 14:22:24.000000000 -0800 -+++ glibc-2.3.2/sysdeps/unix/sysv/linux/arm/ioperm.c 2004-01-31 16:01:50.000000000 -0800 -@@ -47,6 +47,12 @@ - #include <asm/page.h> - #include <sys/sysctl.h> - -+/* see http://www.ussg.iu.edu/hypermail/linux/kernel/0311.0/0529.html */ -+#include <linux/version.h> -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)) -+#define CTL_BUS_ISA BUS_ISA /* and hope it's not the one from linux/input.h */ -+#endif -+ - #define PATH_ARM_SYSTYPE "/etc/arm_systype" - #define PATH_CPUINFO "/proc/cpuinfo" - -@@ -80,7 +86,7 @@ - * Initialize I/O system. There are several ways to get the information - * we need. Each is tried in turn until one succeeds. - * -- * 1. Sysctl (CTL_BUS, BUS_ISA, ISA_*). This is the preferred method -+ * 1. Sysctl (CTL_BUS, CTL_BUS_ISA, ISA_*). This is the preferred method - * but not all kernels support it. - * - * 2. Read the value (not the contents) of symlink PATH_ARM_SYSTYPE. -@@ -100,8 +106,8 @@ - { - char systype[256]; - int i, n; -- static int iobase_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_BASE }; -- static int ioshift_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_SHIFT }; -+ static int iobase_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_BASE }; -+ static int ioshift_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_SHIFT }; - size_t len = sizeof(io.base); - - if (! sysctl (iobase_name, 3, &io.io_base, &len, NULL, 0) - -Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> diff --git a/patches/glibc-2.3.6/generic/sysdeps_unix_sysv_linux_arm_socket_S-alias.diff b/patches/glibc-2.3.6/generic/sysdeps_unix_sysv_linux_arm_socket_S-alias.diff deleted file mode 100644 index 1819990..0000000 --- a/patches/glibc-2.3.6/generic/sysdeps_unix_sysv_linux_arm_socket_S-alias.diff +++ /dev/null @@ -1,64 +0,0 @@ -# -# Submitted-By: Marc Kleine-Budde, 2006-08-13 -# Committed-By: Marc Kleine-Budde -# -# Error: -# -# armeb-xscale-linux-gnu-gcc ../sysdeps/unix/sysv/linux/bind.S -c -#-I../include -#-I. -I/home/frogger/pengutronix/ptxdist/build/toolchain-armv5b-softfloat-linux-gnu/build-target/glibc-2.3.6-build/socket -#-I.. -I../libio -#-I/home/frogger/pengutronix/ptxdist/build/toolchain-armv5b-softfloat-linux-gnu/build-target/glibc-2.3.6-build -#-I../sysdeps/arm/elf -I../linuxthreads/sysdeps/unix/sysv/linux/arm -#-I../linuxthreads/sysdeps/unix/sysv/linux -#-I../linuxthreads/sysdeps/pthread -I../sysdeps/pthread -#-I../linuxthreads/sysdeps/unix/sysv -I../linuxthreads/sysdeps/unix -#-I../linuxthreads/sysdeps/arm -I../sysdeps/unix/sysv/linux/arm -#-I../sysdeps/unix/sysv/linux -I../sysdeps/gnu -#-I../sysdeps/unix/common -I../sysdeps/unix/mman -#-I../sysdeps/unix/inet -I../sysdeps/unix/sysv -I../sysdeps/unix/arm -#-I../sysdeps/unix -I../sysdeps/posix -I../sysdeps/arm -#-I../sysdeps/wordsize-32 -I../sysdeps/ieee754/flt-32 -#-I../sysdeps/ieee754/dbl-64 -I../sysdeps/ieee754 -#-I../sysdeps/generic/elf -I../sysdeps/generic -nostdinc -isystem -#/usr/opt/ptxdist-0.10.svn/armeb-xscale-linux-gnu/gcc-4.1.1-glibc-2.3.6/bin/../lib/gcc/armeb-xscale-linux-gnu/4.1.1/include -#-isystem -#/opt/ptxdist-0.10.svn/armeb-xscale-linux-gnu/gcc-4.1.1-glibc-2.3.6/sysroot-armeb-xscale-linux-gnu/usr/include -#-D_LIBC_REENTRANT -include ../include/libc-symbols.h -DASSEMBLER -g -#-o -#/home/frogger/pengutronix/ptxdist/build/toolchain-armv5b-softfloat-linux-gnu/build-target/glibc-2.3.6-build/socket/bind.o -#-MD -MP -MF -#/home/frogger/pengutronix/ptxdist/build/toolchain-armv5b-softfloat-linux-gnu/build-target/glibc-2.3.6-build/socket/bind.o.dt -#-MT -#/home/frogger/pengutronix/ptxdist/build/toolchain-armv5b-softfloat-linux-gnu/build-target/glibc-2.3.6-build/socket/bind.o -#../sysdeps/unix/sysv/linux/bind.S: Assembler messages: -#../sysdeps/unix/sysv/linux/bind.S:5: Error: symbol `__bind' is already defined -# -# State: -# -# fixed in glibc-ports-2.4 -# -Index: sysdeps/unix/sysv/linux/arm/socket.S -=================================================================== ---- a/sysdeps/unix/sysv/linux/arm/socket.S.orig -+++ b/sysdeps/unix/sysv/linux/arm/socket.S -@@ -32,7 +32,11 @@ - The .S files for the other calls just #define socket and #include this. */ - - #ifndef __socket --#define __socket P(__,socket) -+# ifndef NO_WEAK_ALIAS -+# define __socket P(__,socket) -+# else -+# define __socket socket -+# endif - #endif - - #define PUSHARGS_1 str a1, [sp, $-4]! -@@ -120,4 +124,6 @@ ENTRY (__socket) - - PSEUDO_END (__socket) - -+#ifndef NO_WEAK_ALIAS - weak_alias (__socket, socket) -+#endif |