add lemote / loongson2f target support (no runtime tests yet)

- update glibc to latest version (GIT), tarball includes glibc-ports needed for MIPS architecture
- fix building of toolchain for mips64el glibc/uclibc
- use /lib instead of /lib64 (no biarch support)
- fix X11 dependencies in build system
- fix glibc build errors for openldap, libnl, mpd and rtorrent
- verified toolchain changes on alix1c

6 files changed, 62 insertions, 133 deletions

diff --git a/toolchain/glibc/patches/binutils.patch b/toolchain/glibc/patches/binutils.patch
deleted file mode 100644
index 5b1bd763e..000000000
--- a/toolchain/glibc/patches/binutils.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur glibc-2.7.orig/sysdeps/i386/fpu/ftestexcept.c glibc-2.7/sysdeps/i386/fpu/ftestexcept.c
---- glibc-2.7.orig/sysdeps/i386/fpu/ftestexcept.c	2004-03-05 11:14:48.000000000 +0100
-+++ glibc-2.7/sysdeps/i386/fpu/ftestexcept.c	2008-12-22 01:03:19.000000000 +0100
-@@ -26,7 +26,7 @@
- int
- fetestexcept (int excepts)
- {
--  int temp;
-+  short temp;
-   int xtemp = 0;
- 
-   /* Get current exceptions.  */
diff --git a/toolchain/glibc/patches/gcc43.patch b/toolchain/glibc/patches/gcc43.patch
deleted file mode 100644
index 8bd45ee8c..000000000
--- a/toolchain/glibc/patches/gcc43.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur glibc-2.7.orig/configure glibc-2.7/configure
---- glibc-2.7.orig/configure	2007-10-18 13:22:23.000000000 +0200
-+++ glibc-2.7/configure	2008-11-29 23:48:57.461566623 +0100
-@@ -5062,8 +5062,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/toolchain/glibc/patches/i586-chk.patch b/toolchain/glibc/patches/i586-chk.patch
deleted file mode 100644
index 8ebc182e0..000000000
--- a/toolchain/glibc/patches/i586-chk.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur glibc-2.7.orig/sysdeps/i386/i586/memcpy_chk.S glibc-2.7/sysdeps/i386/i586/memcpy_chk.S
---- glibc-2.7.orig/sysdeps/i386/i586/memcpy_chk.S	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.7/sysdeps/i386/i586/memcpy_chk.S	2008-09-17 12:22:02.000000000 +0200
-@@ -0,0 +1 @@
-+#include <sysdeps/i386/i686/memcpy_chk.S>
-diff -Nur glibc-2.7.orig/sysdeps/i386/i586/mempcpy_chk.S glibc-2.7/sysdeps/i386/i586/mempcpy_chk.S
---- glibc-2.7.orig/sysdeps/i386/i586/mempcpy_chk.S	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.7/sysdeps/i386/i586/mempcpy_chk.S	2008-09-17 12:22:02.000000000 +0200
-@@ -0,0 +1 @@
-+#include <sysdeps/i386/i686/mempcpy_chk.S>
-diff -Nur glibc-2.7.orig/sysdeps/i386/i586/memset_chk.S glibc-2.7/sysdeps/i386/i586/memset_chk.S
---- glibc-2.7.orig/sysdeps/i386/i586/memset_chk.S	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.7/sysdeps/i386/i586/memset_chk.S	2008-09-17 12:22:02.000000000 +0200
-@@ -0,0 +1 @@
-+#include <sysdeps/i386/i686/memset_chk.S>
diff --git a/toolchain/glibc/patches/install-extra.patch b/toolchain/glibc/patches/install-extra.patch
deleted file mode 100644
index 790bafc17..000000000
--- a/toolchain/glibc/patches/install-extra.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -Nur glibc-2.7.orig/elf/Makefile glibc-2.7/elf/Makefile
---- glibc-2.7.orig/elf/Makefile	2007-08-16 23:20:11.000000000 +0200
-+++ glibc-2.7/elf/Makefile	2008-09-17 08:57:12.000000000 +0200
-@@ -116,7 +116,7 @@
- ifeq (yes,$(build-shared))
- extra-objs	= $(all-rtld-routines:%=%.os) soinit.os sofini.os interp.os
- generated	+= librtld.os dl-allobjs.os ld.so ldd
--install-others	= $(inst_slibdir)/$(rtld-installed-name)
-+install-extra	= $(inst_slibdir)/$(rtld-installed-name)
- install-bin-script = ldd
- endif
- 
-diff -Nur glibc-2.7.orig/iconvdata/Makefile glibc-2.7/iconvdata/Makefile
---- glibc-2.7.orig/iconvdata/Makefile	2007-09-30 06:00:02.000000000 +0200
-+++ glibc-2.7/iconvdata/Makefile	2008-09-17 08:56:57.000000000 +0200
-@@ -211,7 +211,7 @@
- 
- 
- extra-objs	+= $(modules.so)
--install-others	= $(addprefix $(inst_gconvdir)/, $(modules.so))	\
-+install-extra	= $(addprefix $(inst_gconvdir)/, $(modules.so))	\
- 		  $(inst_gconvdir)/gconv-modules
- 
- # We can build the conversion tables for numerous charsets automatically.
-diff -Nur glibc-2.7.orig/intl/Makefile glibc-2.7/intl/Makefile
---- glibc-2.7.orig/intl/Makefile	2005-05-04 19:53:42.000000000 +0200
-+++ glibc-2.7/intl/Makefile	2008-09-17 08:55:58.000000000 +0200
-@@ -45,7 +45,7 @@
- 
- before-compile = $(objpfx)msgs.h
- 
--install-others = $(inst_msgcatdir)/locale.alias
-+install-extra = $(inst_msgcatdir)/locale.alias
- 
- generated = msgs.h mtrace-tst-gettext tst-gettext.mtrace
- generated-dirs := domaindir localedir
-diff -Nur glibc-2.7.orig/localedata/Makefile glibc-2.7/localedata/Makefile
---- glibc-2.7.orig/localedata/Makefile	2007-10-02 19:19:40.000000000 +0200
-+++ glibc-2.7/localedata/Makefile	2008-09-17 08:55:35.000000000 +0200
-@@ -102,7 +102,7 @@
- endif
- 
- # Files to install.
--install-others := $(addprefix $(inst_i18ndir)/, \
-+install-extra := $(addprefix $(inst_i18ndir)/, \
- 			      $(addsuffix .gz, $(charmaps)) \
- 			      $(locales))
- 
-diff -Nur glibc-2.7.orig/po/Makefile glibc-2.7/po/Makefile
---- glibc-2.7.orig/po/Makefile	2007-05-29 20:08:41.000000000 +0200
-+++ glibc-2.7/po/Makefile	2008-09-17 08:55:15.000000000 +0200
-@@ -46,7 +46,7 @@
- mo-installed = $(inst_msgcatdir)/%/LC_MESSAGES/$(domainname).mo
- 
- # Files to install: a $(domainname).mo file for each language.
--install-others = $(LINGUAS:%=$(mo-installed))
-+install-extra = $(LINGUAS:%=$(mo-installed))
- 
- # Files to distribute: all the source and compiled binary translation files.
- distribute = $(ALL_LINGUAS:=.po) $(BROKEN_LINGUAS:=.po) $(ALL_LINGUAS:=.mo) \
-diff -Nur glibc-2.7.orig/sunrpc/Makefile glibc-2.7/sunrpc/Makefile
---- glibc-2.7.orig/sunrpc/Makefile	2006-10-18 21:25:38.000000000 +0200
-+++ glibc-2.7/sunrpc/Makefile	2008-09-17 08:54:26.000000000 +0200
-@@ -52,7 +52,7 @@
- 			   svc_auth.h types.h xdr.h auth_des.h \
- 			   des_crypt.h key_prot.h rpc_des.h) \
- 	  $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
--install-others = $(inst_sysconfdir)/rpc
-+install-extra = $(inst_sysconfdir)/rpc
- generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
- 	    $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
- generated-dirs := rpcsvc
-diff -Nur glibc-2.7.orig/timezone/Makefile glibc-2.7/timezone/Makefile
---- glibc-2.7.orig/timezone/Makefile	2007-07-28 22:33:11.000000000 +0200
-+++ glibc-2.7/timezone/Makefile	2008-09-17 08:54:43.000000000 +0200
-@@ -71,7 +71,7 @@
- 
- ifeq ($(cross-compiling),no)
- # Don't try to install the zoneinfo files since we can't run zic.
--install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \
-+install-extra = $(addprefix $(inst_zonedir)/,$(zonenames) \
- 					      $(zonenames:%=posix/%) \
- 					      $(zonenames:%=right/%)) \
- 		 $(installed-localtime-file) $(installed-posixrules-file)
diff --git a/toolchain/glibc/patches/make-install-lib.patch b/toolchain/glibc/patches/install-lib.patch
index b5fb9295a..9be206def 100644
--- a/toolchain/glibc/patches/make-install-lib.patch
+++ b/toolchain/glibc/patches/install-lib.patch
@@ -1,7 +1,7 @@
-diff -Nur glibc-2.7.orig/Makerules glibc-2.7/Makerules
---- glibc-2.7.orig/Makerules	2007-08-26 04:18:03.000000000 +0200
-+++ glibc-2.7/Makerules	2008-09-12 11:35:40.000000000 +0200
-@@ -867,6 +867,13 @@
+diff -Nur glibc-2.9.orig/Makerules glibc-2.9/Makerules
+--- glibc-2.9.orig/Makerules	2008-02-07 01:39:18.000000000 +0100
++++ glibc-2.9/Makerules	2009-05-27 00:30:47.000000000 +0200
+@@ -853,6 +853,13 @@
  installed-libcs := $(foreach o,$(filter-out .os,$(object-suffixes-for-libc)),\
  			     $(inst_libdir)/$(patsubst %,$(libtype$o),\
  						     $(libprefix)$(libc-name)))
diff --git a/toolchain/glibc/patches/mips64.patch b/toolchain/glibc/patches/mips64.patch
new file mode 100644
index 000000000..04743e09d
--- /dev/null
+++ b/toolchain/glibc/patches/mips64.patch
@@ -0,0 +1,58 @@
+diff -Nur glibc-2.10-current.orig/ports/sysdeps/mips/mips64/n32/Makefile glibc-2.10-current/ports/sysdeps/mips/mips64/n32/Makefile
+--- glibc-2.10-current.orig/ports/sysdeps/mips/mips64/n32/Makefile	2009-05-26 22:53:27.000000000 +0200
++++ glibc-2.10-current/ports/sysdeps/mips/mips64/n32/Makefile	2009-05-27 02:23:06.000000000 +0200
+@@ -1,6 +1,2 @@
+ # `long double' is a distinct type we support.
+ long-double-fcts = yes
+-
+-ifeq ($(filter -mabi=n32,$(CC)),)
+-CC += -mabi=n32
+-endif
+diff -Nur glibc-2.10-current.orig/ports/sysdeps/mips/mips64/n64/Makefile glibc-2.10-current/ports/sysdeps/mips/mips64/n64/Makefile
+--- glibc-2.10-current.orig/ports/sysdeps/mips/mips64/n64/Makefile	2009-05-26 22:53:27.000000000 +0200
++++ glibc-2.10-current/ports/sysdeps/mips/mips64/n64/Makefile	2009-05-27 02:20:00.000000000 +0200
+@@ -1,6 +1,2 @@
+ # `long double' is a distinct type we support.
+ long-double-fcts = yes
+-
+-ifeq ($(filter -mabi=64,$(CC)),)
+-CC += -mabi=64
+-endif
+diff -Nur glibc-2.10-current.orig/ports/sysdeps/mips/preconfigure glibc-2.10-current/ports/sysdeps/mips/preconfigure
+--- glibc-2.10-current.orig/ports/sysdeps/mips/preconfigure	2009-05-26 22:53:27.000000000 +0200
++++ glibc-2.10-current/ports/sysdeps/mips/preconfigure	2009-05-27 02:20:14.000000000 +0200
+@@ -22,7 +22,7 @@
+ 		if test $mips_config_abi != $mips_cc_abi; then
+ 		  # This won't make it to config.make, but we want to
+ 		  # set this in case configure tests depend on it.
+-		  CPPFLAGS="$CPPFLAGS -mabi=$mips_config_abi"
++		  CPPFLAGS="$CPPFLAGS"
+ 		fi
+ 		;;
+ mips*)		base_machine=mips machine=mips/mips32/$machine ;;
+diff -Nur glibc-2.10-current.orig/ports/sysdeps/unix/sysv/linux/mips/configure glibc-2.10-current/ports/sysdeps/unix/sysv/linux/mips/configure
+--- glibc-2.10-current.orig/ports/sysdeps/unix/sysv/linux/mips/configure	2009-05-26 22:53:29.000000000 +0200
++++ glibc-2.10-current/ports/sysdeps/unix/sysv/linux/mips/configure	2009-05-27 20:34:25.000000000 +0200
+@@ -84,22 +84,6 @@
+   # and libc_cv_localedir.
+   test -n "$libc_cv_slibdir" || \
+   case $machine in
+-  mips/mips64/n64/* )
+-    libc_cv_slibdir="/lib64"
+-    if test "$libdir" = '${exec_prefix}/lib'; then
+-      libdir='${exec_prefix}/lib64';
+-      # Locale data can be shared between 32bit and 64bit libraries
+-      libc_cv_localedir='${exec_prefix}/lib/locale'
+-    fi
+-    ;;
+-  mips/mips64/n32/* )
+-    libc_cv_slibdir="/lib32"
+-    if test "$libdir" = '${exec_prefix}/lib'; then
+-      libdir='${exec_prefix}/lib32';
+-      # Locale data can be shared between 32bit and 64bit libraries
+-      libc_cv_localedir='${exec_prefix}/lib/locale'
+-    fi
+-    ;;
+   *)
+     libc_cv_slibdir="/lib"
+     ;;