patches: remove obsolete glibc patches

Glibc prior to 2.18, linuxthreads and ports are not supported.

Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov@gmail.com>

13 files changed, 0 insertions, 1017 deletions

diff --git a/patches/glibc/2.6.1/100-cygwin.patch b/patches/glibc/2.6.1/100-cygwin.patch
deleted file mode 100644
index 3c0cd7d..0000000
--- a/patches/glibc/2.6.1/100-cygwin.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-Fixes
-elf/librtld.os: In function `process_envvars': : undefined reference to `__access'
-...
-when building glibc-2.3.x on cygwin
-
-Idea from
-http://sources.redhat.com/ml/bug-glibc/2002-01/msg00071/glibc-2.2-cygin-shared.patch
-Basically, make glibc use .oST as suffix for 'object static'
-instead of .oS, since cygwin has trouble distinguishing .os from .oS
-(Original patch had .on, but .oST is more mnemonic for 'object static')
-
-glibc-linuxthreads-2.3.5 also requires a patch, see 
-../glibc-linuxthreads-2.3.5/glibc-linuxthreads-2.3.5-cygwin.patch
-
-[ forward ported to glibc-2.3.5 by Petr Cvachoucek:
-
-Message-ID: <4282FCBA.3040000@unicontrols.cz>
-Date: Thu, 12 May 2005 08:50:34 +0200
-From: Petr Cvachoucek <cvachoucek@unicontrols.cz>
-To: Dan Kegel <dank@kegel.com>
-CC:  crossgcc@sources.redhat.com
-Subject: Patches to build gcc 3.4.3 / glibc 2.3.5 on cygwin
-
-Hi Dan,
-following patches are needed to build gcc-3.4.3/glibc-2.3.5 toolchain
-on cygwin. Tested to build toolchains for powerpc 604 and 750 targets.
-
--- 
-                     Petr Cvachoucek
-                     Unicontrols a.s.
-                     http://www.unicontrols.cz
-]
-
-diff -aur glibc-2.3.5/Makeconfig glibc-2.3.5-cygwin/Makeconfig
---- glibc-2.3.5/Makeconfig	2005-02-16 11:50:19.000000000 +0100
-+++ glibc-2.3.5-cygwin/Makeconfig	2005-05-11 08:24:51.046875000 +0200
-@@ -472,7 +472,7 @@
- # run the linked programs.
- link-libc = -Wl,-rpath-link=$(rpath-link) \
- 	    $(common-objpfx)libc.so$(libc.so-version) \
--	    $(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib)
-+	    $(common-objpfx)$(patsubst %,$(libtype.oST),c) $(gnulib)
- # This is how to find at build-time things that will be installed there.
- rpath-dirs = math elf dlfcn nss nis rt resolv crypt
- endif
-@@ -693,7 +693,7 @@
- # The compilation rules use $(CPPFLAGS-${SUFFIX}) and $(CFLAGS-${SUFFIX})
- # to pass different flags for each flavor.
- libtypes = $(foreach o,$(object-suffixes-for-libc),$(libtype$o))
--all-object-suffixes := .o .os .op .og .ob .oS
-+all-object-suffixes := .o .os .op .og .ob .oST
- object-suffixes :=
- CPPFLAGS-.o = $(pic-default)
- CFLAGS-.o = $(filter %frame-pointer,$(+cflags))
-@@ -749,14 +749,14 @@
- 
- ifeq (yes,$(build-shared))
- # Build special library that contains the static-only routines for libc.
--object-suffixes-for-libc += .oS
-+object-suffixes-for-libc += .oST
- 
- # Must build the routines as PIC, though, because they can end up in (users')
- # shared objects.  We don't want to use CFLAGS-os because users may, for
- # example, make that processor-specific.
--CFLAGS-.oS = $(CFLAGS-.o) $(PIC-ccflag)
--CPPFLAGS-.oS = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1
--libtype.oS = lib%_nonshared.a
-+CFLAGS-.oST = $(CFLAGS-.o) $(PIC-ccflag)
-+CPPFLAGS-.oST = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1
-+libtype.oST = lib%_nonshared.a
- endif
- 
- # The assembler can generate debug information too.
-diff -aur glibc-2.3.5/Makerules glibc-2.3.5-cygwin/Makerules
---- glibc-2.3.5/Makerules	2004-12-15 19:52:39.000000000 +0100
-+++ glibc-2.3.5-cygwin/Makerules	2005-05-11 08:25:33.578125000 +0200
-@@ -417,7 +417,7 @@
- # Bounded pointer thunks are only built for *.ob
- elide-bp-thunks = $(addprefix $(bppfx),$(bp-thunks))
- 
--elide-routines.oS += $(filter-out $(static-only-routines),\
-+elide-routines.oST += $(filter-out $(static-only-routines),\
- 				  $(routines) $(aux) $(sysdep_routines)) \
- 		     $(elide-bp-thunks)
- elide-routines.os += $(static-only-routines) $(elide-bp-thunks)
-@@ -981,7 +981,7 @@
- install: $(inst_libdir)/libc.so
- $(inst_libdir)/libc.so: $(common-objpfx)format.lds \
- 			$(common-objpfx)libc.so$(libc.so-version) \
--			$(inst_libdir)/$(patsubst %,$(libtype.oS),\
-+			$(inst_libdir)/$(patsubst %,$(libtype.oST),\
- 						  $(libprefix)$(libc-name)) \
- 			$(+force)
- 	(echo '/* GNU ld script';\
-@@ -989,7 +989,7 @@
- 	 echo '   the static library, so try that secondarily.  */';\
- 	 cat $<; \
- 	 echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
--	      '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
-+	      '$(libdir)/$(patsubst %,$(libtype.oST),$(libprefix)$(libc-name))'\
-	      ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \
- 	) > $@.new
-	mv -f $@.new $@
-diff -aur glibc-2.3.5/extra-lib.mk glibc-2.3.5-cygwin/extra-lib.mk
---- glibc-2.3.5/extra-lib.mk	2004-12-02 23:54:47.000000000 +0100
-+++ glibc-2.3.5-cygwin/extra-lib.mk	2005-05-11 08:27:28.156250000 +0200
-@@ -13,7 +13,7 @@
- 
- ifneq (,$($(lib)-static-only-routines))
- ifneq (,$(filter yesyes%,$(build-shared)$(elf)$($(lib).so-version)))
--object-suffixes-$(lib) += $(filter-out $($(lib)-inhibit-o),.oS)
-+object-suffixes-$(lib) += $(filter-out $($(lib)-inhibit-o),.oST)
- endif
- endif
- 
-@@ -29,7 +29,7 @@
- 
- # Add each flavor of library to the lists of things to build and install.
- install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o)))
--extra-objs += $(foreach o,$(filter-out .os .oS,$(object-suffixes-$(lib))),\
-+extra-objs += $(foreach o,$(filter-out .os .oST,$(object-suffixes-$(lib))),\
- 			$(patsubst %,%$o,$(filter-out \
- 					   $($(lib)-shared-only-routines),\
- 					   $(all-$(lib)-routines))))
-@@ -57,7 +57,7 @@
- 
- 
- # Use o-iterator.mk to generate a rule for each flavor of library.
--ifneq (,$(filter-out .os .oS,$(object-suffixes-$(lib))))
-+ifneq (,$(filter-out .os .oST,$(object-suffixes-$(lib))))
- define o-iterator-doit
- $(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
-   $(patsubst %,$(objpfx)%$o,\
-@@ -65,7 +65,7 @@
- 			  $(all-$(lib)-routines))); \
- 	$$(build-extra-lib)
- endef
--object-suffixes-left = $(filter-out .os .oS,$(object-suffixes-$(lib)))
-+object-suffixes-left = $(filter-out .os .oST,$(object-suffixes-$(lib)))
- include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-left))
- endif
- 
-@@ -77,9 +77,9 @@
- 	$(build-extra-lib)
- endif
- 
--ifneq (,$(filter .oS,$(object-suffixes-$(lib))))
--$(objpfx)$(patsubst %,$(libtype.oS),$(lib:lib%=%)): \
--  $(patsubst %,$(objpfx)%.oS,\
-+ifneq (,$(filter .oST,$(object-suffixes-$(lib))))
-+$(objpfx)$(patsubst %,$(libtype.oST),$(lib:lib%=%)): \
-+  $(patsubst %,$(objpfx)%.oST,\
- 	     $(filter $($(lib)-static-only-routines),\
- 		      $(all-$(lib)-routines)))
- 	$(build-extra-lib)
-diff -aur glibc-2.3.5/nptl/Makefile glibc-2.3.5-cygwin/nptl/Makefile
---- glibc-2.3.5/nptl/Makefile	2005-02-16 09:45:56.000000000 +0100
-+++ glibc-2.3.5-cygwin/nptl/Makefile	2005-05-11 08:26:01.812500000 +0200
-@@ -375,7 +375,7 @@
- 
- $(inst_libdir)/libpthread.so: $(common-objpfx)format.lds \
- 			      $(objpfx)libpthread.so$(libpthread.so-version) \
--			      $(inst_libdir)/$(patsubst %,$(libtype.oS),\
-+			      $(inst_libdir)/$(patsubst %,$(libtype.oST),\
- 							$(libprefix)pthread) \
- 			      $(+force)
- 	(echo '/* GNU ld script';\
-@@ -383,7 +383,7 @@
- 	 echo '   the static library, so try that secondarily.  */';\
- 	 cat $<; \
- 	 echo 'GROUP ( $(slibdir)/libpthread.so$(libpthread.so-version)' \
--	      '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)pthread)'\
-+	      '$(libdir)/$(patsubst %,$(libtype.oST),$(libprefix)pthread)'\
- 	      ')' \
- 	) > $@.new
- 	mv -f $@.new $@
-diff -aur glibc-2.3.5/sysdeps/sparc/sparc32/sparcv9/Makefile glibc-2.3.5-cygwin/sysdeps/sparc/sparc32/sparcv9/Makefile
---- glibc-2.3.5/sysdeps/sparc/sparc32/sparcv9/Makefile	2004-08-16 08:46:14.000000000 +0200
-+++ glibc-2.3.5-cygwin/sysdeps/sparc/sparc32/sparcv9/Makefile	2005-05-11 08:26:25.937500000 +0200
-@@ -10,4 +10,4 @@
- ASFLAGS-.op += -Wa,-Av9a
- ASFLAGS-.og += -Wa,-Av9a
- ASFLAGS-.ob += -Wa,-Av9a
--ASFLAGS-.oS += -Wa,-Av9a
-+ASFLAGS-.oST += -Wa,-Av9a
-
-Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
diff --git a/patches/glibc/2.6.1/110-configure-apple-as.patch b/patches/glibc/2.6.1/110-configure-apple-as.patch
deleted file mode 100644
index 78a1324..0000000
--- a/patches/glibc/2.6.1/110-configure-apple-as.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://in3www.epfl.ch/~schaffne/glibc-configure-apple-as.patch
-http://sources.redhat.com/ml/crossgcc/2004-02/msg00151.html
-
-The following makes it possible to configure glibc-2.3.2 on Mac OS X,
-where the assembler but doesn't understand the --version flag.
-
-Fixes the symptom
-checking whether ld is GNU ld... no
-checking for /usr/libexec/gcc/darwin/ppc/as... /usr/libexec/gcc/darwin/ppc/as
-checking version of /usr/libexec/gcc/darwin/ppc/as... 
-<PAUSES HERE AND JUST SITS THERE DOING NOTHING>
-
---- glibc-2.3.2/configure~	Wed Feb 26 09:20:48 2003
-+++ glibc-2.3.2/configure	Fri Feb 27 13:12:53 2004
-@@ -4039,7 +4039,7 @@
-   # Found it, now check the version.
-   echo "$as_me:$LINENO: checking version of $AS" >&5
- echo $ECHO_N "checking version of $AS... $ECHO_C" >&6
--  ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-+  ac_prog_version=`$AS -v </dev/null 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]*)
-
-Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
diff --git a/patches/glibc/2.6.1/120-fix-pr631.patch b/patches/glibc/2.6.1/120-fix-pr631.patch
deleted file mode 100644
index 13688df..0000000
--- a/patches/glibc/2.6.1/120-fix-pr631.patch
+++ /dev/null
@@ -1,45 +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
-
---- glibc-2.3.5/Makeconfig.old	Wed Jun 15 08:13:12 2005
-+++ glibc-2.3.5/Makeconfig	Wed Jun 15 08:13:14 2005
-@@ -510,7 +510,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...
---- glibc-2.3.5/elf/Makefile.old	Wed Jun 15 07:46:49 2005
-+++ glibc-2.3.5/elf/Makefile	Wed Jun 15 08:14:00 2005
-@@ -120,6 +120,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
-
-Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
diff --git a/patches/glibc/2.6.1/130-i686-assembler.patch b/patches/glibc/2.6.1/130-i686-assembler.patch
deleted file mode 100644
index 9904efb..0000000
--- a/patches/glibc/2.6.1/130-i686-assembler.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>
-
-       * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
-       * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
-
-
-
-Index: glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h
-===================================================================
---- glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h	(revision 1469)
-+++ glibc-2.4/sysdeps/unix/sysv/linux/i386/sysdep.h	(working copy)
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
- 
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
- 
- /* For Linux we can use the system call table in the header file
- 	/usr/include/asm/unistd.h
-Index: glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c
-===================================================================
---- glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c	(revision 1469)
-+++ glibc-2.4/nptl/sysdeps/pthread/pt-initfini.c	(working copy)
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
- 
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
- 
diff --git a/patches/glibc/2.6.1/140-i386-preferred-stack-boundary.patch b/patches/glibc/2.6.1/140-i386-preferred-stack-boundary.patch
deleted file mode 100644
index 449821d..0000000
--- a/patches/glibc/2.6.1/140-i386-preferred-stack-boundary.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-(C) 2007 Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
-License: LGPL v2.1
-
-Shut off a stupid warning: preffered-stack-boundary must be between 4 ad 12,
-and 2 is not.
-
-diff -dur glibc-2.5.orig/sysdeps/i386/Makefile glibc-2.5/sysdeps/i386/Makefile
---- glibc-2.5.orig/sysdeps/i386/Makefile	2005-03-06 01:18:16.000000000 +0100
-+++ glibc-2.5/sysdeps/i386/Makefile	2007-05-27 17:49:37.000000000 +0200
-@@ -36,7 +36,7 @@
- ifeq ($(subdir),csu)
- sysdep-CFLAGS += -mpreferred-stack-boundary=4
- else
--sysdep-CFLAGS += -mpreferred-stack-boundary=2
-+sysdep-CFLAGS += -mpreferred-stack-boundary=4
- # Likewise, any function which calls user callbacks
- uses-callbacks += -mpreferred-stack-boundary=4
- # Likewise, any stack alignment tests
diff --git a/patches/glibc/2.6.1/150-alpha-asm_page.patch b/patches/glibc/2.6.1/150-alpha-asm_page.patch
deleted file mode 100644
index b198b36..0000000
--- a/patches/glibc/2.6.1/150-alpha-asm_page.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-2008-06-07  Mike Frysinger  <vapier@gentoo.org>
-
-	* sysdeps/unix/sysv/linux/alpha/sys/user.h: Copy page.h definitions
-	from the kernel header to sys/user.h and remove the #include of
-	sys/user.h.
-
---- a/sysdeps/unix/sysv/linux/alpha/sys/user.h
-+++ b/sysdeps/unix/sysv/linux/alpha/sys/user.h
-@@ -23,7 +23,6 @@
-    only. Don't read too much into it. Don't use it for anything other
-    than gdb/strace unless you know what you are doing. */
- 
--#include <asm/page.h>
- #include <asm/reg.h>
- 
- struct user
-@@ -41,6 +40,9 @@ struct user
-   char u_comm[32];				/* user command name */
- };
- 
-+#define PAGE_SHIFT		13
-+#define PAGE_SIZE		(1 << PAGE_SHIFT)
-+#define PAGE_MASK		(~(PAGE_SIZE-1))
- #define NBPG			PAGE_SIZE
- #define UPAGES			1
- #define HOST_TEXT_START_ADDR	(u.start_code)
diff --git a/patches/glibc/2.6.1/160-use_short_for_fnstsw.patch b/patches/glibc/2.6.1/160-use_short_for_fnstsw.patch
deleted file mode 100644
index 0e849fa..0000000
--- a/patches/glibc/2.6.1/160-use_short_for_fnstsw.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Original patch from H.J. Lu, as reported there:
-http://www.nabble.com/PATCH:-Use-short-for-fnstsw-td14775171.html
-
-fnstsw stores 16bit into %ax. The upper 16bit of %eax is unchanged.
-The new assembler (binutils-2.18.50.0.4 and up) will disallow "fnstsw %eax".
-
-diff -dur glibc-2.6.1.orig/sysdeps/i386/fpu/ftestexcept.c glibc-2.6.1/sysdeps/i386/fpu/ftestexcept.c
---- glibc-2.6.1.orig/sysdeps/i386/fpu/ftestexcept.c	2004-03-05 11:14:48.000000000 +0100
-+++ glibc-2.6.1/sysdeps/i386/fpu/ftestexcept.c	2008-06-24 10:56:14.000000000 +0200
-@@ -26,7 +26,7 @@
- int
- fetestexcept (int excepts)
- {
--  int temp;
-+  short temp;
-   int xtemp = 0;
- 
-   /* Get current exceptions.  */
diff --git a/patches/glibc/2.6.1/170-alpha-asm_elf.patch b/patches/glibc/2.6.1/170-alpha-asm_elf.patch
deleted file mode 100644
index 3da5c8e..0000000
--- a/patches/glibc/2.6.1/170-alpha-asm_elf.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-since the kernel no longer provides asm/elf.h, the sys/procfs.h from the 
-common code, alpha, and sh fail when used.  this should things up.
--mike
-
-2008-06-07  Mike Frysinger  <vapier@gentoo.org>
-
-	* sysdeps/unix/sysv/linux/sys/procfs.h: Replace with #error stub.
-	* sysdeps/unix/sysv/linux/alpha/sys/procfs.h: Copy some asm/elf.h
-	definitions from the kernel header to sys/procfs.h and remove the
-	#include of asm/elf.h.
-	* sysdeps/unix/sysv/linux/sh/sys/procfs.h: Likewise.
-
-*Attachment: signature.asc <msg00012/signature.asc>*
-/Description:/ This is a digitally signed message part.
-
-2008-06-07  Mike Frysinger  <vapier@gentoo.org>
-
-	* sysdeps/unix/sysv/linux/sys/procfs.h: Replace with #error stub.
-	* sysdeps/unix/sysv/linux/alpha/sys/procfs.h: Copy some asm/elf.h
-	definitions from the kernel header to sys/procfs.h and remove the
-	#include of asm/elf.h.
-	* sysdeps/unix/sysv/linux/sh/sys/procfs.h: Likewise.
-
---- a/sysdeps/unix/sysv/linux/alpha/sys/procfs.h
-+++ b/sysdeps/unix/sysv/linux/alpha/sys/procfs.h
-@@ -29,10 +29,23 @@
- #include <sys/types.h>
- #include <sys/ucontext.h>
- #include <sys/user.h>
--#include <asm/elf.h>
- 
- __BEGIN_DECLS
- 
-+/*
-+ * The OSF/1 version of <sys/procfs.h> makes gregset_t 46 entries long.
-+ * I have no idea why that is so.  For now, we just leave it at 33
-+ * (32 general regs + processor status word).
-+ */
-+#define ELF_NGREG  33
-+#define ELF_NFPREG 32
-+
-+typedef unsigned long elf_greg_t;
-+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-+
-+typedef double elf_fpreg_t;
-+typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
-+
- struct elf_siginfo
-   {
-     int si_signo;			/* Signal number.  */
---- a/sysdeps/unix/sysv/linux/sh/sys/procfs.h
-+++ b/sysdeps/unix/sysv/linux/sh/sys/procfs.h
-@@ -29,10 +29,19 @@
- #include <sys/types.h>
- #include <sys/ucontext.h>
- #include <sys/user.h>
--#include <asm/elf.h>
- 
- __BEGIN_DECLS
- 
-+/*
-+ * ELF register definitions...
-+ */
-+typedef unsigned long elf_greg_t;
-+
-+#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))
-+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-+
-+typedef struct user_fpu_struct elf_fpregset_t;
-+
- struct elf_siginfo
-   {
-     int si_signo;			/* Signal number.  */
---- a/sysdeps/unix/sysv/linux/sys/procfs.h
-+++ b/sysdeps/unix/sysv/linux/sys/procfs.h
-@@ -1,115 +1,2 @@
--/* Copyright (C) 1996, 1997, 1999 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 _SYS_PROCFS_H
--#define _SYS_PROCFS_H	1
--
--/* This is somehow modelled after the file of the same name on SysVr4
--   systems.  It provides a definition of the core file format for ELF
--   used on Linux.  */
--
--#include <features.h>
--#include <signal.h>
--#include <sys/time.h>
--#include <sys/types.h>
--#include <sys/ucontext.h>
--#include <sys/user.h>
--#include <asm/elf.h>
--
--__BEGIN_DECLS
--
--struct elf_siginfo
--  {
--    int si_signo;			/* Signal number.  */
--    int si_code;			/* Extra code.  */
--    int si_errno;			/* Errno.  */
--  };
--
--/* Definitions to generate Intel SVR4-like core files.  These mostly
--   have the same names as the SVR4 types with "elf_" tacked on the
--   front to prevent clashes with linux definitions, and the typedef
--   forms have been avoided.  This is mostly like the SVR4 structure,
--   but more Linuxy, with things that Linux does not support and which
--   gdb doesn't really use excluded.  Fields present but not used are
--   marked with "XXX".  */
--struct elf_prstatus
--  {
--#if 0
--    long int pr_flags;			/* XXX Process flags.  */
--    short int pr_why;			/* XXX Reason for process halt.  */
--    short int pr_what;			/* XXX More detailed reason.  */
--#endif
--    struct elf_siginfo pr_info;		/* Info associated with signal.  */
--    short int pr_cursig;		/* Current signal.  */
--    unsigned long int pr_sigpend;	/* Set of pending signals.  */
--    unsigned long int pr_sighold;	/* Set of held signals.  */
--#if 0
--    struct sigaltstack pr_altstack;	/* Alternate stack info.  */
--    struct sigaction pr_action;		/* Signal action for current sig.  */
--#endif
--    __pid_t pr_pid;
--    __pid_t pr_ppid;
--    __pid_t pr_pgrp;
--    __pid_t pr_sid;
--    struct timeval pr_utime;		/* User time.  */
--    struct timeval pr_stime;		/* System time.  */
--    struct timeval pr_cutime;		/* Cumulative user time.  */
--    struct timeval pr_cstime;		/* Cumulative system time.  */
--#if 0
--    long int pr_instr;			/* Current instruction.  */
--#endif
--    elf_gregset_t pr_reg;		/* GP registers.  */
--    int pr_fpvalid;			/* True if math copro being used.  */
--  };
--
--
--#define ELF_PRARGSZ     (80)    /* Number of chars for args */
--
--struct elf_prpsinfo
--  {
--    char pr_state;			/* Numeric process state.  */
--    char pr_sname;			/* Char for pr_state.  */
--    char pr_zomb;			/* Zombie.  */
--    char pr_nice;			/* Nice val.  */
--    unsigned long int pr_flag;		/* Flags.  */
--    unsigned short int pr_uid;
--    unsigned short int pr_gid;
--    int pr_pid, pr_ppid, pr_pgrp, pr_sid;
--    /* Lots missing */
--    char pr_fname[16];			/* Filename of executable.  */
--    char pr_psargs[ELF_PRARGSZ];	/* Initial part of arg list.  */
--  };
--
--/* Addresses.  */
--typedef void *psaddr_t;
--
--/* Register sets.  Linux has different names.  */
--typedef gregset_t prgregset_t;
--typedef fpregset_t prfpregset_t;
--
--/* We don't have any differences between processes and threads,
--   therefore habe only ine PID type.  */
--typedef __pid_t lwpid_t;
--
--
--typedef struct elf_prstatus prstatus_t;
--typedef struct elf_prpsinfo prpsinfo_t;
--
--__END_DECLS
--
--#endif	/* sys/procfs.h */
-+/* sys/procfs.h is architecture specific.  */
-+#error "This file must be supplied by every Linux architecture."
-
diff --git a/patches/glibc/2.6.1/180-gcc-4.3-sysinclude-path.patch b/patches/glibc/2.6.1/180-gcc-4.3-sysinclude-path.patch
deleted file mode 100644
index 66650a8..0000000
--- a/patches/glibc/2.6.1/180-gcc-4.3-sysinclude-path.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Patch pointed to by Ryan ARNOLD on the libc-help ML.
-See: http://sourceware.org/ml/libc-help/2008-06/msg00063.html
-
-Forwarded to crosstool-NG by Ioannis E. VENETIS:
-See: http://sourceware.org/ml/libc-help/2008-06/msg00063.html
-
-GCC 4.3 changed the location of some of the header files.  I don't
-understand why you'd be getting these errors while building GCC since
-it provides them.
-
-With regard to GLIBC, Roland checked in some changes so that the GLIBC
-build system could find the new locations of the GCC provided header
-files.
-
-diff -durN glibc-2.6.1.orig/configure.in glibc-2.6.1/configure.in
---- glibc-2.6.1.orig/configure.in	2007-06-08 05:16:36.000000000 +0200
-+++ glibc-2.6.1/configure.in	2008-06-24 18:38:46.000000000 +0200
-@@ -911,8 +911,12 @@
- # header directory and add that to the list.  NOTE: Only does the right
- # thing on a system that doesn't need fixincludes.  (Not presently a problem.)
- if test -n "$sysheaders"; then
--  ccheaders=`$CC -print-file-name=include`
--  SYSINCLUDES="-nostdinc -isystem $ccheaders \
-+  SYSINCLUDES=-nostdinc
-+  for d in include include-fixed; do
-+    i=`$CC -print-file-name="$d"` && test "x$i" != x && test "x$i" != "x$d" &&
-+    SYSINCLUDES="$SYSINCLUDES -isystem $i"
-+  done
-+  SYSINCLUDES="$SYSINCLUDES \
- -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
-   if test -n "$CXX"; then
-     cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
-diff -durN glibc-2.6.1.orig/configure glibc-2.6.1/configure
---- glibc-2.6.1.orig/configure	2008-06-24 18:35:34.000000000 +0200
-+++ glibc-2.6.1/configure	2008-06-24 18:38:46.000000000 +0200
-@@ -4562,8 +4562,12 @@
- # header directory and add that to the list.  NOTE: Only does the right
- # thing on a system that doesn't need fixincludes.  (Not presently a problem.)
- if test -n "$sysheaders"; then
--  ccheaders=`$CC -print-file-name=include`
--  SYSINCLUDES="-nostdinc -isystem $ccheaders \
-+  SYSINCLUDES=-nostdinc
-+  for d in include include-fixed; do
-+    i=`$CC -print-file-name="$d"` && test "x$i" != "x$d" &&
-+    SYSINCLUDES="$SYSINCLUDES -isystem $i"
-+  done
-+  SYSINCLUDES="$SYSINCLUDES \
- -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
-   if test -n "$CXX"; then
-     cxxversion=`$CXX -dumpversion 2>&5` &&
diff --git a/patches/glibc/2.6.1/190-alpha-atfcts.patch b/patches/glibc/2.6.1/190-alpha-atfcts.patch
deleted file mode 100644
index 73a2474..0000000
--- a/patches/glibc/2.6.1/190-alpha-atfcts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glibc-2.6.1/sysdeps/unix/sysv/linux/kernel-features.h	2006-07-29 07:43:27.000000000 +0300
-+++ glibc-2.6.1/sysdeps/unix/sysv/linux/kernel-features.h.new	2008-07-26 08:45:06.000000000 +0300
-@@ -445,7 +445,7 @@
- /* The *at syscalls were introduced just after 2.6.16-rc1.  Due to the way the
-    kernel versions are advertised we can only rely on 2.6.17 to have
-    the code.  */
--#if __LINUX_KERNEL_VERSION >= 0x020611
-+#if __LINUX_KERNEL_VERSION >= 0x020611 && !defined __alpha__
- # define __ASSUME_ATFCTS	1
- #endif
- 
diff --git a/patches/glibc/2.6.1/200-alpha-ptr_mangle.patch b/patches/glibc/2.6.1/200-alpha-ptr_mangle.patch
deleted file mode 100644
index 1417562..0000000
--- a/patches/glibc/2.6.1/200-alpha-ptr_mangle.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- glibc-2.6.1.orig/sysdeps/unix/alpha/sysdep.h
-+++ glibc-2.6.1/sysdeps/unix/alpha/sysdep.h
-@@ -397,42 +397,4 @@
- 	_sc_ret = _sc_0, _sc_err = _sc_19;			\
- }
- 
--/* Pointer mangling support.  Note that tls access is slow enough that
--   we don't deoptimize things by placing the pointer check value there.  */
--
--#include <stdint.h>
--
--#if defined NOT_IN_libc && defined IS_IN_rtld
--# ifdef __ASSEMBLER__
--#  define PTR_MANGLE(dst, src, tmp)				\
--	ldah	tmp, __pointer_chk_guard_local($29) !gprelhigh;	\
--	ldq	tmp, __pointer_chk_guard_local(tmp) !gprellow;	\
--	xor	src, tmp, dst
--#  define PTR_MANGLE2(dst, src, tmp)				\
--	xor	src, tmp, dst
--#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
--#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
--# else
--extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
--#  define PTR_MANGLE(var)	\
--  (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
--#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
--# endif
--#elif defined PIC
--# ifdef __ASSEMBLER__
--#  define PTR_MANGLE(dst, src, tmp)		\
--	ldq	tmp, __pointer_chk_guard;	\
--	xor	src, tmp, dst
--#  define PTR_MANGLE2(dst, src, tmp)		\
--	xor	src, tmp, dst
--#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
--#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
--# else
--extern uintptr_t __pointer_chk_guard attribute_relro;
--#  define PTR_MANGLE(var)	\
--	(var) = (void *) ((uintptr_t) (var) ^ __pointer_chk_guard)
--#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
--# endif
--#endif
--
- #endif /* ASSEMBLER */
---- glibc-2.6.1.orig/sysdeps/unix/sysv/linux/alpha/sysdep.h
-+++ glibc-2.6.1/sysdeps/unix/sysv/linux/alpha/sysdep.h
-@@ -29,6 +29,8 @@
- /* There is some commonality.  */
- #include <sysdeps/unix/alpha/sysdep.h>
- 
-+#include <tls.h>
-+
- /* For Linux we can use the system call table in the header file
- 	/usr/include/asm/unistd.h
-    of the kernel.  But these symbols do not follow the SYS_* syntax
-@@ -96,4 +96,46 @@
- 	INTERNAL_SYSCALL1(name, err_out, nr, args);			\
- })
- 
-+/* Pointer mangling support.  Note that tls access is slow enough that
-+   we don't deoptimize things by placing the pointer check value there.  */
-+
-+#if defined NOT_IN_libc && defined IS_IN_rtld
-+# ifdef __ASSEMBLER__
-+#  define PTR_MANGLE(dst, src, tmp)				\
-+	ldah	tmp, __pointer_chk_guard_local($29) !gprelhigh;	\
-+	ldq	tmp, __pointer_chk_guard_local(tmp) !gprellow;	\
-+	xor	src, tmp, dst
-+#  define PTR_MANGLE2(dst, src, tmp)				\
-+	xor	src, tmp, dst
-+#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
-+#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
-+# else
-+extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
-+#  define PTR_MANGLE(var)	\
-+  (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
-+#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
-+# endif
-+#elif defined PIC
-+# ifdef __ASSEMBLER__
-+#  define PTR_MANGLE(dst, src, tmp)		\
-+	ldq	tmp, __pointer_chk_guard;	\
-+	xor	src, tmp, dst
-+#  define PTR_MANGLE2(dst, src, tmp)		\
-+	xor	src, tmp, dst
-+#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
-+#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
-+# else
-+extern uintptr_t __pointer_chk_guard attribute_relro;
-+#  define PTR_MANGLE(var)	\
-+	(var) = (void *) ((uintptr_t) (var) ^ __pointer_chk_guard)
-+#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
-+# endif
-+#else
-+/* Pointer mangling is not yet supported for static libc on alpha.  */
-+# ifndef __ASSEMBLER__
-+#  define PTR_MANGLE(var)   (void) (var)
-+#  define PTR_DEMANGLE(var) (void) (var)
-+# endif
-+#endif
-+
- #endif /* _LINUX_ALPHA_SYSDEP_H */
diff --git a/patches/glibc/2.6.1/210-lll_lock_t.patch b/patches/glibc/2.6.1/210-lll_lock_t.patch
deleted file mode 100644
index 9459731..0000000
--- a/patches/glibc/2.6.1/210-lll_lock_t.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-Patch provided bu Ioannis E. VENETIS
-
-Using:
-
-typedef int lll_lock_t;
-
-creates problems during compilation. Since glibc 2.7 got rid of the 'typedef' and
-uses directly 'int', we do the same here.
-
-diff -Naur glibc-2.6.1/nptl/allocatestack.c glibc-2.6.1.new/nptl/allocatestack.c
---- glibc-2.6.1/nptl/allocatestack.c	2006-08-23 20:39:47.000000000 +0300
-+++ glibc-2.6.1.new/nptl/allocatestack.c	2008-07-27 20:56:19.000000000 +0300
-@@ -103,7 +103,7 @@
- static size_t stack_cache_actsize;
- 
- /* Mutex protecting this variable.  */
--static lll_lock_t stack_cache_lock = LLL_LOCK_INITIALIZER;
-+static int stack_cache_lock = LLL_LOCK_INITIALIZER;
- 
- /* List of queued stack frames.  */
- static LIST_HEAD (stack_cache);
-diff -Naur glibc-2.6.1/nptl/descr.h glibc-2.6.1.new/nptl/descr.h
---- glibc-2.6.1/nptl/descr.h	2006-09-24 20:10:55.000000000 +0300
-+++ glibc-2.6.1.new/nptl/descr.h	2008-07-27 20:54:41.000000000 +0300
-@@ -305,10 +305,10 @@
-   int parent_cancelhandling;
- 
-   /* Lock to synchronize access to the descriptor.  */
--  lll_lock_t lock;
-+  int lock;
- 
-   /* Lock for synchronizing setxid calls.  */
--  lll_lock_t setxid_futex;
-+  int setxid_futex;
- 
- #if HP_TIMING_AVAIL
-   /* Offset of the CPU clock at start thread start time.  */
-diff -Naur glibc-2.6.1/nptl/pthread_attr_init.c glibc-2.6.1.new/nptl/pthread_attr_init.c
---- glibc-2.6.1/nptl/pthread_attr_init.c	2004-03-19 01:56:31.000000000 +0200
-+++ glibc-2.6.1.new/nptl/pthread_attr_init.c	2008-07-27 20:55:03.000000000 +0300
-@@ -27,7 +27,7 @@
- 
- 
- struct pthread_attr *__attr_list;
--lll_lock_t __attr_list_lock = LLL_LOCK_INITIALIZER;
-+int __attr_list_lock = LLL_LOCK_INITIALIZER;
- 
- 
- int
-diff -Naur glibc-2.6.1/nptl/pthreadP.h glibc-2.6.1.new/nptl/pthreadP.h
---- glibc-2.6.1/nptl/pthreadP.h	2006-08-23 20:42:52.000000000 +0300
-+++ glibc-2.6.1.new/nptl/pthreadP.h	2008-07-27 20:56:40.000000000 +0300
-@@ -143,7 +143,7 @@
- 
- /* Attribute handling.  */
- extern struct pthread_attr *__attr_list attribute_hidden;
--extern lll_lock_t __attr_list_lock attribute_hidden;
-+extern int __attr_list_lock attribute_hidden;
- 
- /* First available RT signal.  */
- extern int __current_sigrtmin attribute_hidden;
-diff -Naur glibc-2.6.1/nptl/semaphoreP.h glibc-2.6.1.new/nptl/semaphoreP.h
---- glibc-2.6.1/nptl/semaphoreP.h	2006-05-11 20:08:37.000000000 +0300
-+++ glibc-2.6.1.new/nptl/semaphoreP.h	2008-07-27 20:55:42.000000000 +0300
-@@ -48,7 +48,7 @@
- extern void *__sem_mappings attribute_hidden;
- 
- /* Lock to protect the search tree.  */
--extern lll_lock_t __sem_mappings_lock attribute_hidden;
-+extern int __sem_mappings_lock attribute_hidden;
- 
- 
- /* Initializer for mountpoint.  */
-diff -Naur glibc-2.6.1/nptl/sem_open.c glibc-2.6.1.new/nptl/sem_open.c
---- glibc-2.6.1/nptl/sem_open.c	2006-05-11 20:09:43.000000000 +0300
-+++ glibc-2.6.1.new/nptl/sem_open.c	2008-07-27 20:55:22.000000000 +0300
-@@ -147,7 +147,7 @@
- void *__sem_mappings attribute_hidden;
- 
- /* Lock to protect the search tree.  */
--lll_lock_t __sem_mappings_lock attribute_hidden = LLL_LOCK_INITIALIZER;
-+int __sem_mappings_lock attribute_hidden = LLL_LOCK_INITIALIZER;
- 
- 
- /* Search for existing mapping and if possible add the one provided.  */
-diff -Naur glibc-2.6.1/nptl/pthread_once.c glibc-2.6.1.new/nptl/pthread_once.c
---- glibc-2.6.1/nptl/pthread_once.c	2002-11-27 00:50:31.000000000 +0200
-+++ glibc-2.6.1.new/nptl/pthread_once.c	2008-07-27 20:57:12.000000000 +0300
-@@ -22,7 +22,7 @@
- 
- 
- 
--static lll_lock_t once_lock = LLL_LOCK_INITIALIZER;
-+static int once_lock = LLL_LOCK_INITIALIZER;
- 
- 
- int
-diff -Naur glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h
---- glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h	2006-07-29 08:06:07.000000000 +0300
-+++ glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h	2008-07-27 20:59:15.000000000 +0300
-@@ -230,9 +230,6 @@
- /* Our internal lock implementation is identical to the binary-compatible
-    mutex implementation. */
- 
--/* Type for lock object.  */
--typedef int lll_lock_t;
--
- /* Initializers for lock.  */
- #define LLL_LOCK_INITIALIZER		(0)
- #define LLL_LOCK_INITIALIZER_LOCKED	(1)
-diff -Naur glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/fork.c glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/fork.c
---- glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/fork.c	2003-12-21 01:37:13.000000000 +0200
-+++ glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/fork.c	2008-07-27 21:00:01.000000000 +0300
-@@ -183,7 +183,7 @@
- 	}
- 
-       /* Initialize the fork lock.  */
--      __fork_lock = (lll_lock_t) LLL_LOCK_INITIALIZER;
-+      __fork_lock = (int) LLL_LOCK_INITIALIZER;
-     }
-   else
-     {
-diff -Naur glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/fork.h glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/fork.h
---- glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/fork.h	2006-05-15 23:19:43.000000000 +0300
-+++ glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/fork.h	2008-07-27 20:58:49.000000000 +0300
-@@ -26,7 +26,7 @@
- extern unsigned long int *__fork_generation_pointer attribute_hidden;
- 
- /* Lock to protect allocation and deallocation of fork handlers.  */
--extern lll_lock_t __fork_lock attribute_hidden;
-+extern int __fork_lock attribute_hidden;
- 
- /* Elements of the fork handler lists.  */
- struct fork_handler
-diff -Naur glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
---- glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	2006-09-05 17:44:25.000000000 +0300
-+++ glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	2008-07-27 21:00:19.000000000 +0300
-@@ -436,9 +436,6 @@
- /* We have a separate internal lock implementation which is not tied
-    to binary compatibility.  */
- 
--/* Type for lock object.  */
--typedef int lll_lock_t;
--
- /* Initializers for lock.  */
- #define LLL_LOCK_INITIALIZER		(0)
- #define LLL_LOCK_INITIALIZER_LOCKED	(1)
-diff -Naur glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
---- glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h	2006-07-29 08:06:07.000000000 +0300
-+++ glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h	2008-07-27 20:58:16.000000000 +0300
-@@ -223,9 +223,6 @@
- /* We have a separate internal lock implementation which is not tied
-    to binary compatibility.  We can use the lll_mutex_*.  */
- 
--/* Type for lock object.  */
--typedef int lll_lock_t;
--
- extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;
- 
- /* Initializers for lock.  */
-diff -Naur glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
---- glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h	2006-07-29 08:06:07.000000000 +0300
-+++ glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h	2008-07-27 21:00:36.000000000 +0300
-@@ -254,9 +254,6 @@
- /* Our internal lock implementation is identical to the binary-compatible
-    mutex implementation. */
- 
--/* Type for lock object.  */
--typedef int lll_lock_t;
--
- /* Initializers for lock.  */
- #define LLL_LOCK_INITIALIZER		(0)
- #define LLL_LOCK_INITIALIZER_LOCKED	(1)
-diff -Naur glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/register-atfork.c glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/register-atfork.c
---- glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/register-atfork.c	2005-12-22 00:17:21.000000000 +0200
-+++ glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/register-atfork.c	2008-07-27 21:00:55.000000000 +0300
-@@ -24,7 +24,7 @@
- 
- 
- /* Lock to protect allocation and deallocation of fork handlers.  */
--lll_lock_t __fork_lock = LLL_LOCK_INITIALIZER;
-+int __fork_lock = LLL_LOCK_INITIALIZER;
- 
- 
- /* Number of pre-allocated handler entries.  */
-diff -Naur glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
---- glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h	2006-07-29 08:06:07.000000000 +0300
-+++ glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h	2008-07-27 21:01:14.000000000 +0300
-@@ -309,9 +309,6 @@
- /* We have a separate internal lock implementation which is not tied
-    to binary compatibility.  We can use the lll_mutex_*.  */
- 
--/* Type for lock object.  */
--typedef int lll_lock_t;
--
- /* Initializers for lock.  */
- #define LLL_LOCK_INITIALIZER		(0)
- #define LLL_LOCK_INITIALIZER_LOCKED	(1)
-diff -Naur glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
---- glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h	2006-07-29 08:06:06.000000000 +0300
-+++ glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h	2008-07-27 20:58:00.000000000 +0300
-@@ -278,9 +278,6 @@
- /* We have a separate internal lock implementation which is not tied
-    to binary compatibility.  */
- 
--/* Type for lock object.  */
--typedef int lll_lock_t;
--
- /* Initializers for lock.  */
- #define LLL_LOCK_INITIALIZER		(0)
- #define LLL_LOCK_INITIALIZER_LOCKED	(1)
-diff -Naur glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
---- glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h	2006-07-29 08:06:06.000000000 +0300
-+++ glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h	2008-07-27 20:59:39.000000000 +0300
-@@ -237,9 +237,6 @@
- /* We have a separate internal lock implementation which is not tied
-    to binary compatibility.  We can use the lll_mutex_*.  */
- 
--/* Type for lock object.  */
--typedef int lll_lock_t;
--
- extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;
- 
- /* Initializers for lock.  */
-diff -Naur glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
---- glibc-2.6.1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	2006-09-05 17:45:34.000000000 +0300
-+++ glibc-2.6.1.new/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	2008-07-27 20:58:33.000000000 +0300
-@@ -446,9 +446,6 @@
- /* We have a separate internal lock implementation which is not tied
-    to binary compatibility.  */
- 
--/* Type for lock object.  */
--typedef int lll_lock_t;
--
- /* Initializers for lock.  */
- #define LLL_LOCK_INITIALIZER		(0)
- #define LLL_LOCK_INITIALIZER_LOCKED	(1)
diff --git a/patches/glibc/2.6.1/220-cross-posix_makefile.patch b/patches/glibc/2.6.1/220-cross-posix_makefile.patch
deleted file mode 100644
index ae623db..0000000
--- a/patches/glibc/2.6.1/220-cross-posix_makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-On 20090111.1151+0100, Thomas Jourdan <tjourdan@neuf.fr> wrote:
-
-  I'm still working on the solaris port an I have the same issue here.
-  While trying to build the i686-nptl-linux-gnu toolchain under
-  OpenSolaris, the problems appears during the make install rule of the
-  libc function.
-
-  The problem is that solaris tries to execute ld-linux.so.2, which is an
-  elf 32 bits dyn lib, and it fails with a memory fault, not a "cannot
-  execute binary file". Hence the build stops on this error.
-
-And on 20090111.1339+0100, he replied with:
-
-  After digging a little, the problem comes from the
-  glibc-2.6.1/posix/Makefile. It has been solved starting from glibc 2.7
-  so I extracted a patch for glibc 2.6.1.
-
---- glibc-2.6.1/posix/Makefile	2007-04-04 01:28:20.000000000 +0200
-+++ glibc-2.7/posix/Makefile	2007-09-12 01:57:22.000000000 +0200
-@@ -98,7 +98,7 @@
- endif
- others		:= getconf
- install-bin	:= getconf
--install-others	:= $(inst_libexecdir)/getconf
-+install-others-programs	:= $(inst_libexecdir)/getconf
- 
- before-compile	:= testcases.h ptestcases.h
- 
-@@ -110,7 +110,7 @@
- 	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
- 	     tst-pcre-mem tst-pcre.mtrace tst-boost-mem tst-boost.mtrace \
- 	     bug-ga2.mtrace bug-ga2-mem bug-glob2.mtrace bug-glob2-mem \
--	     tst-vfork3-mem tst-vfork3.mtrace
-+	     tst-vfork3-mem tst-vfork3.mtrace getconf.speclist
- 
- include ../Rules
- 
-@@ -291,12 +291,20 @@
- $(objpfx)bug-glob2-mem: $(objpfx)bug-glob2.out
- 	$(common-objpfx)malloc/mtrace $(objpfx)bug-glob2.mtrace > $@
- 
--$(inst_libexecdir)/getconf: $(objpfx)getconf FORCE
-+$(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
-+			    $(objpfx)getconf.speclist FORCE
- 	$(addprefix $(..)./scripts/mkinstalldirs ,\
- 		    $(filter-out $(wildcard $@),$@))
--	for spec in `LC_ALL=C GETCONF_DIR=/dev/null \
--		     $(run-program-prefix) $< \
--		     _POSIX_V6_WIDTH_RESTRICTED_ENVS`; do \
--		$(INSTALL_PROGRAM) $< $@/$$spec.new; \
--		mv -f $@/$$spec.new $@/$$spec; \
--	done
-+	while read spec; do \
-+	  ln -f $< $@/$$spec.new || $(INSTALL_PROGRAM) $< $@/$$spec.new; \
-+	  mv -f $@/$$spec.new $@/$$spec; \
-+	done < $(objpfx)getconf.speclist
-+
-+$(objpfx)getconf.speclist: $(objpfx)getconf
-+ifeq (no,$(cross-compiling))
-+	LC_ALL=C GETCONF_DIR=/dev/null \
-+	$(run-program-prefix) $< _POSIX_V6_WIDTH_RESTRICTED_ENVS > $@.new
-+else
-+	> $@.new
-+endif
-+	mv -f $@.new $@