From a934246178d7c686bf28c3dbed57b06120cb48d0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 19 Nov 2009 09:53:00 +0100
Subject: rename DEVICE to ADK_TARGET

- the name is better, because qemu f.e. is no hardware device
- use make TARGET=alix1c to start with a configuration for this target
- use make TARGET=alix1c allmodconfig to generate a mostly complete config
  to build all available packages for this platform as a package

The all.config and .defconfig files needed to get this working are
dynamically generated.
---
 toolchain/glibc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toolchain/glibc')

diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 36d6f1214..448d41606 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -39,7 +39,7 @@ GLIBC_ENV:=		PATH='${TARGET_PATH}' \
 			libc_cv_gnu99_inline=yes \
 			libc_cv_slibdir="/lib"
 
-ifeq ($(ADK_DEVICE_NO_FPU),y)
+ifeq ($(ADK_TARGET_NO_FPU),y)
 GLIBC_CONFOPTS+=	--without-fp
 endif
 
-- 
cgit v1.2.3


From 25631be7315cdddc0cf2ea273f3e06332128d36d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 19 Dec 2009 18:33:02 +0100
Subject: update eglic and glibc

---
 package/glibc/Makefile         |  4 +--
 scripts/scan-pkgs.sh           | 13 +++++++-
 target/Config.in               | 38 -----------------------
 toolchain/eglibc/Makefile      |  2 +-
 toolchain/eglibc/Makefile.inc  |  2 +-
 toolchain/eglibc/eglibc.config | 68 ++++++++++++++++++++++++++----------------
 toolchain/glibc/Makefile.inc   |  6 ++--
 7 files changed, 60 insertions(+), 73 deletions(-)

(limited to 'toolchain/glibc')

diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 3cd49f64b..7173ab83f 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -28,6 +28,7 @@ GLIBC_CONFOPTS:=          \
 			--enable-add-ons
 
 $(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,GLIBC_DEV,glibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 do-extract:
 
@@ -36,9 +37,6 @@ do-install:
 	${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc
 	# install /etc/localtime from host system (FIXME)
 	${CP} /etc/localtime $(IDIR_GLIBC)/etc
-ifeq ($(ADK_SSP),y)
-	$(CP) $(STAGING_DIR)/lib/libssp.so* $(IDIR_GLIBC)/lib/
-endif
 	$(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_GLIBC)/lib/
 	$(CP) $(STAGING_DIR)/lib/ld-*.so* $(IDIR_GLIBC)/lib/
 	-for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index fe94d8317..894bb3a57 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -18,7 +18,7 @@ test -z "$BASH_VERSION$KSH_VERSION" && exec $BASH $0 "$@"
 
 [[ -n $BASH_VERSION ]] && shopt -s extglob
 topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-OStype=$(env NOFAKE=yes uname)
+OStype=$(uname)
 out=0
 
 . $topdir/.config
@@ -88,6 +88,10 @@ if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
 	NEED_XMLTO="$NEED_XMLTO libXfont"
 fi
 
+if [[ -n $ADK_PACKAGE_EGLIBC ]]; then
+	NEED_GPERF="$NEED_GPERF eglibc"
+fi
+
 if [[ -n $NEED_GETTEXT ]]; then
 	if ! which xgettext >/dev/null 2>&1; then
 		echo >&2 You need gettext to build $NEED_GETTEXT
@@ -141,6 +145,13 @@ if [[ -n $NEED_BISON ]]; then
 	fi
 fi
 
+if [[ -n $NEED_GPERF ]]; then
+	if ! which gperf >/dev/null 2>&1; then
+		echo >&2 You need gperf to build $NEED_GPERF
+		out=1
+	fi
+fi
+
 if [[ -n $NEED_GXX ]]; then
 	if ! which g++ >/dev/null 2>&1; then
 		echo >&2 You need GNU c++ compiler to build $NEED_GXX
diff --git a/target/Config.in b/target/Config.in
index 64c517ac5..a5a570148 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -676,44 +676,6 @@ config ADK_COMPRESSION_TOOL
 	default "lzma -9" if ADK_TARGET_INITRAMFS_COMPRESSION_LZMA
 	help
 
-choice
-prompt "Root filesystem type"
-	depends on ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
-	default ADK_TARGET_ROOT_XFS
-
-config ADK_TARGET_ROOT_XFS_MOD
-	boolean
-	prompt "XFS filesystem"
-	select ADK_KPACKAGE_KMOD_XFS_FS
-	select ADK_PACKAGE_XFSPROGS
-	help
-	  Select XFS filesystem kernel module and filesystem utilities.
-
-config ADK_TARGET_ROOT_EXT2_MOD
-	boolean
-	prompt "EXT2 filesystem"
-	select ADK_KPACKAGE_KMOD_EXT2_FS
-	select ADK_PACKAGE_E2FSPROGS
-	help
-	  Select EXT2 filesystem kernel module and filesystem utilities.
-
-config ADK_TARGET_ROOT_EXT3_MOD
-	boolean
-	prompt "EXT3 filesystem"
-	select ADK_KPACKAGE_KMOD_EXT3_FS
-	select ADK_PACKAGE_E2FSPROGS
-	help
-	  Select EXT3 filesystem kernel module and filesystem utilities.
-
-config ADK_TARGET_ROOT_EXT4_MOD
-	boolean
-	prompt "EXT4 filesystem"
-	select ADK_KPACKAGE_KMOD_EXT4_FS
-	select ADK_PACKAGE_E2FSPROGS
-	help
-	  Select EXT4 filesystem kernel module and filesystem utilities.
-
-endchoice
 
 choice
 prompt "Root filesystem type"
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index ec0f4f639..d6cf99e27 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -44,7 +44,7 @@ $(WRKBUILD)/.headers_configure:
 	mkdir -p $(EGLIBC_BUILD_DIR_INITIAL)
 	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \
 		ln -sf ../ports ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc);
-	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc; autoconf --force);
+	#(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc; autoconf --force);
 	$(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \
 		$(EGLIBC_BUILD_DIR_INITIAL)
 	(cd $(EGLIBC_BUILD_DIR_INITIAL); \
diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc
index 4f11fba45..0e8b1dc20 100644
--- a/toolchain/eglibc/Makefile.inc
+++ b/toolchain/eglibc/Makefile.inc
@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		eglibc
-PKG_VERSION:=		2.10.1
+PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1b5d08c87de09018dcabd9974ba754d4
 PKG_SITES:=		http://www.openadk.org/distfiles/
diff --git a/toolchain/eglibc/eglibc.config b/toolchain/eglibc/eglibc.config
index 198741139..b7f5f96e1 100644
--- a/toolchain/eglibc/eglibc.config
+++ b/toolchain/eglibc/eglibc.config
@@ -1,26 +1,42 @@
-OPTION_EGLIBC_ADVANCED_INET6=y
-OPTION_EGLIBC_BACKTRACE=n
-OPTION_EGLIBC_BSD=y
-OPTION_EGLIBC_CXX_TESTS=n
-OPTION_EGLIBC_CATGETS=y
-OPTION_EGLIBC_CHARSETS=y
-OPTION_EGLIBC_DB_ALIASES=y
-OPTION_EGLIBC_ENVZ=y
-OPTION_EGLIBC_FSTAB=y
-OPTION_EGLIBC_GETLOGIN=y
-OPTION_EGLIBC_INET=y
-OPTION_EGLIBC_LIBM=y
-OPTION_EGLIBC_LOCALES=n
-OPTION_EGLIBC_LOCALE_CODE=y
-OPTION_EGLIBC_NIS=n
-OPTION_EGLIBC_NSSWITCH=y
-OPTION_EGLIBC_RCMD=y
-OPTION_EGLIBC_SPAWN=y
-OPTION_EGLIBC_STREAMS=y
-OPTION_EGLIBC_SUNRPC=y
-OPTION_EGLIBC_UTMP=y
-OPTION_EGLIBC_UTMPX=y
-OPTION_EGLIBC_WORDEXP=y
-OPTION_POSIX_C_LANG_WIDE_CHAR=y
-OPTION_POSIX_REGEXP=y
-OPTION_POSIX_WIDE_CHAR_DEVICE_IO=y
+# This file sets default values for all option group variables
+# mentioned in option-groups.def; see that file for a description of
+# each option group.
+#
+# Subdirectory makefiles include this file before including the user's
+# settings from option-groups.config at the top of the build tree;
+# that file need only refer to those options whose default settings
+# are to be changed.
+#
+# By default, all option groups are enabled.
+OPTION_EGLIBC_ADVANCED_INET6 = y
+OPTION_EGLIBC_BACKTRACE = n
+OPTION_EGLIBC_BIG_MACROS = y
+OPTION_EGLIBC_BSD = y
+OPTION_EGLIBC_CXX_TESTS = n
+OPTION_EGLIBC_CATGETS = n
+OPTION_EGLIBC_CHARSETS = n
+OPTION_EGLIBC_DB_ALIASES = n
+OPTION_EGLIBC_ENVZ = y
+OPTION_EGLIBC_FCVT = y
+OPTION_EGLIBC_FMTMSG = y
+OPTION_EGLIBC_FSTAB = y
+OPTION_EGLIBC_FTRAVERSE = y
+OPTION_EGLIBC_GETLOGIN = y
+OPTION_EGLIBC_INET = y
+OPTION_EGLIBC_LIBM = y
+OPTION_EGLIBC_LOCALES = n
+OPTION_EGLIBC_LOCALE_CODE = n
+OPTION_EGLIBC_MEMUSAGE = y
+OPTION_EGLIBC_NIS = n
+OPTION_EGLIBC_NSSWITCH = n
+OPTION_EGLIBC_RCMD = y
+OPTION_EGLIBC_SPAWN = y
+OPTION_EGLIBC_STREAMS = y
+OPTION_EGLIBC_SUNRPC = y
+OPTION_EGLIBC_UTMP = y
+OPTION_EGLIBC_UTMPX = y
+OPTION_EGLIBC_WORDEXP = y
+OPTION_POSIX_C_LANG_WIDE_CHAR = y
+OPTION_POSIX_REGEXP = y
+OPTION_POSIX_REGEXP_GLIBC = n
+OPTION_POSIX_WIDE_CHAR_DEVICE_IO = y
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index 3ba08efa3..596c71955 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		glibc
-PKG_VERSION:=		2.10.1
+PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		adfbd93cada84dc16259f4dffa60dc34
-PKG_SITES:=		http://www.openadk.org/distfiles
+PKG_MD5SUM:=		55d50abb2d7c366bde6fb5e35e681f9b
+PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
-- 
cgit v1.2.3


From afb0d4c43cb9844542dab9f53e43ba53a2ac6921 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Dec 2009 00:59:09 +0100
Subject: install stdio_lim.h via install-headers

---
 toolchain/glibc/Makefile                |  1 -
 toolchain/glibc/patches/stdio_lim.patch | 31 +++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 toolchain/glibc/patches/stdio_lim.patch

(limited to 'toolchain/glibc')

diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 448d41606..2b3fc252f 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -62,7 +62,6 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 		install_root=$(TOOLCHAIN_SYSROOT) \
 		install-headers
 	touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h
-	touch $(TOOLCHAIN_SYSROOT)/usr/include/bits/stdio_lim.h
 	touch $@
 
 $(WRKBUILD)/.configured: 
diff --git a/toolchain/glibc/patches/stdio_lim.patch b/toolchain/glibc/patches/stdio_lim.patch
new file mode 100644
index 000000000..41f8447dc
--- /dev/null
+++ b/toolchain/glibc/patches/stdio_lim.patch
@@ -0,0 +1,31 @@
+diff -Nur glibc-2.11.orig/stdio-common/Makefile glibc-2.11/stdio-common/Makefile
+--- glibc-2.11.orig/stdio-common/Makefile	2009-10-30 18:17:08.000000000 +0100
++++ glibc-2.11/stdio-common/Makefile	2009-12-30 23:52:08.000000000 +0100
+@@ -21,7 +21,7 @@
+ #
+ subdir	:= stdio-common
+ 
+-headers	:= stdio_ext.h printf.h bits/printf-ldbl.h
++headers	:= stdio_ext.h printf.h bits/printf-ldbl.h bits/stdio_lim.h
+ 
+ routines	:=							      \
+ 	ctermid cuserid							      \
+@@ -40,8 +40,6 @@
+ 	isoc99_vsscanf							      \
+ 	psiginfo
+ 
+-install-others = $(inst_includedir)/bits/stdio_lim.h
+-
+ include ../Makeconfig
+ 
+ aux	:= errlist siglist printf-parsemb printf-parsewc fxprintf
+@@ -66,9 +64,6 @@
+ 
+ include ../Rules
+ 
+-$(inst_includedir)/bits/stdio_lim.h: $(common-objpfx)bits/stdio_lim.h $(+force)
+-	$(do-install)
+-
+ ifeq ($(cross-compiling),no)
+ .PHONY: do-tst-unbputc do-tst-printf
+ tests: do-tst-unbputc do-tst-printf
-- 
cgit v1.2.3


From aa4ab58940fe84dfd79b230407b0eac2fd10a80b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 19 Feb 2010 00:36:11 +0100
Subject: first try to get eglibc/glibc based toolchain working

when HOST == TARGET eglibc/glibc toolchain does not compile
correctly. With this patches at least eglibc compiles fine.
There still exist a problem with glibc. Someone should check
what diff in eglibc make the build work :}
---
 toolchain/eglibc/Makefile |  1 -
 toolchain/gcc/Makefile    |  9 ++++++---
 toolchain/glibc/Makefile  | 11 +++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'toolchain/glibc')

diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index d6cf99e27..aeec91c90 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -44,7 +44,6 @@ $(WRKBUILD)/.headers_configure:
 	mkdir -p $(EGLIBC_BUILD_DIR_INITIAL)
 	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \
 		ln -sf ../ports ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc);
-	#(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)/libc; autoconf --force);
 	$(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \
 		$(EGLIBC_BUILD_DIR_INITIAL)
 	(cd $(EGLIBC_BUILD_DIR_INITIAL); \
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 619ddf47c..0fc5edc1d 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -17,6 +17,7 @@ GCC_CONFOPTS=		--prefix=$(STAGING_TOOLS) \
 			--disable-libmudflap \
 			--disable-libgomp \
 			--disable-biarch \
+			--disable-decimal-float \
 			--disable-multilib \
 			--disable-sjlj-exceptions \
 			--disable-libssp \
@@ -56,7 +57,7 @@ $(GCC_BUILD_DIR_MINIMAL)/.configured:
 
 $(GCC_BUILD_DIR_MINIMAL)/.compiled: $(GCC_BUILD_DIR_MINIMAL)/.configured
 	PATH=$(TARGET_PATH) \
-	$(MAKE) -C $(GCC_BUILD_DIR_MINIMAL) all-gcc 
+	$(MAKE) -C $(GCC_BUILD_DIR_MINIMAL) all-gcc
 	touch $@
 
 $(WRKBUILD)/.headers: $(GCC_BUILD_DIR_MINIMAL)/.compiled
@@ -76,6 +77,8 @@ $(GCC_BUILD_DIR_INITIAL)/.configured:
 			${GCC_CONFOPTS} \
 			--enable-languages=c \
 			--disable-shared \
+			--disable-threads \
+			--with-newlib \
 			--with-sysroot=$(TOOLCHAIN_SYSROOT) \
 	);
 	touch $@
@@ -83,12 +86,12 @@ $(GCC_BUILD_DIR_INITIAL)/.configured:
 
 $(GCC_BUILD_DIR_INITIAL)/.compiled: $(GCC_BUILD_DIR_INITIAL)/.configured
 	PATH=$(TARGET_PATH) \
-	$(MAKE) -C $(GCC_BUILD_DIR_INITIAL) all
+	$(MAKE) -C $(GCC_BUILD_DIR_INITIAL) all-gcc all-target-libgcc
 	touch $@
 
 $(WRKBUILD)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled
 	PATH=$(TARGET_PATH) \
-	$(MAKE) -C $(GCC_BUILD_DIR_INITIAL) install
+	$(MAKE) -C $(GCC_BUILD_DIR_INITIAL) install-gcc install-target-libgcc
 	touch $@
 
 $(GCC_BUILD_DIR_FINAL)/.configured:
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 2b3fc252f..978794dc9 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -57,11 +57,22 @@ $(WRKBUILD)/.headers_configure:
 	touch $@
 
 $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
+	mkdir -p $(TOOLCHAIN_SYSROOT)/usr/lib
 	$(MAKE) -C $(GLIBC_BUILD_DIR_INITIAL) \
 		cross-compiling=yes \
 		install_root=$(TOOLCHAIN_SYSROOT) \
 		install-headers
 	touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h
+	PATH='${TARGET_PATH}' \
+	$(MAKE) -C $(GLIBC_BUILD_DIR_INITIAL) \
+		csu/subdir_lib
+	( cd $(GLIBC_BUILD_DIR_INITIAL); \
+		$(CP) csu/crt1.o csu/crti.o csu/crtn.o \
+		$(TOOLCHAIN_SYSROOT)/usr/lib \
+	);
+	PATH='${TARGET_PATH}' \
+	$(TARGET_CC) -nostdlib -nostartfiles -shared -x c /dev/null \
+		-o $(TOOLCHAIN_SYSROOT)/usr/lib/libc.so
 	touch $@
 
 $(WRKBUILD)/.configured: 
-- 
cgit v1.2.3


From 0097a8249ca2d1a498b457019db15d3540a259f3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 20 Feb 2010 17:19:15 +0100
Subject: add vendor string "openadk" to toolchain triplet

With this change you can compile toolchains even
when host cpu arch is identical to target cpu arch.
---
 mk/vars.mk                                |  8 ++---
 toolchain/eglibc/Makefile                 | 10 ------
 toolchain/glibc/Makefile                  | 13 ++-----
 toolchain/glibc/Makefile.inc              |  2 +-
 toolchain/glibc/patches/longjmp_chk.patch | 56 +++++++++++++++++++++++++++++++
 5 files changed, 63 insertions(+), 26 deletions(-)
 create mode 100644 toolchain/glibc/patches/longjmp_chk.patch

(limited to 'toolchain/glibc')

diff --git a/mk/vars.mk b/mk/vars.mk
index 2151348b0..345531b3f 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -37,15 +37,15 @@ PACKAGE_DIR:=		$(BIN_DIR)/packages
 TARGET_DIR:=		$(BASE_DIR)/root_${ADK_TARGET}_${ADK_LIBC}
 TARGET_DIR_PFX:=	$(BASE_DIR)/root_*
 TARGET_PATH=		${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH}
-REAL_GNU_TARGET_NAME=	$(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)
-GNU_TARGET_NAME=	$(CPU_ARCH)-linux
+REAL_GNU_TARGET_NAME=	$(CPU_ARCH)-openadk-linux-$(ADK_TARGET_SUFFIX)
+GNU_TARGET_NAME=	$(CPU_ARCH)-openadk-linux
 TOOLCHAIN_SYSROOT:=	$(TOOLCHAIN_BUILD_DIR)/libc_dev
 ifeq ($(ADK_NATIVE),y) 
-TARGET_COMPILER_PREFIX?=
 TARGET_CROSS:=		
+TARGET_COMPILER_PREFIX?=
 else
+TARGET_CROSS:=		$(STAGING_TOOLS)/bin/$(REAL_GNU_TARGET_NAME)-
 TARGET_COMPILER_PREFIX?=${TARGET_CROSS}
-TARGET_CROSS:=		$(STAGING_TOOLS)/bin/$(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)-
 endif
 TARGET_CC:=		${TARGET_COMPILER_PREFIX}gcc
 TARGET_CXX:=		${TARGET_COMPILER_PREFIX}g++
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index aeec91c90..1605113c6 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -60,16 +60,6 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 	PATH='${TARGET_PATH}' \
 	$(MAKE) -C $(EGLIBC_BUILD_DIR_INITIAL) \
 		install-headers install-bootstrap-headers=yes
-	PATH='${TARGET_PATH}' \
-	$(MAKE) -C $(EGLIBC_BUILD_DIR_INITIAL) \
-		csu/subdir_lib
-	( cd $(EGLIBC_BUILD_DIR_INITIAL); \
-		$(CP) csu/crt1.o csu/crti.o csu/crtn.o \
-		$(TOOLCHAIN_SYSROOT)/usr/lib \
-	);
-	PATH='${TARGET_PATH}' \
-	$(TARGET_CC) -nostdlib -nostartfiles -shared -x c /dev/null \
-		-o $(TOOLCHAIN_SYSROOT)/usr/lib/libc.so
 	touch $@
 
 $(WRKBUILD)/.configured: 
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 978794dc9..2058c41d4 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -63,16 +63,6 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 		install_root=$(TOOLCHAIN_SYSROOT) \
 		install-headers
 	touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h
-	PATH='${TARGET_PATH}' \
-	$(MAKE) -C $(GLIBC_BUILD_DIR_INITIAL) \
-		csu/subdir_lib
-	( cd $(GLIBC_BUILD_DIR_INITIAL); \
-		$(CP) csu/crt1.o csu/crti.o csu/crtn.o \
-		$(TOOLCHAIN_SYSROOT)/usr/lib \
-	);
-	PATH='${TARGET_PATH}' \
-	$(TARGET_CC) -nostdlib -nostartfiles -shared -x c /dev/null \
-		-o $(TOOLCHAIN_SYSROOT)/usr/lib/libc.so
 	touch $@
 
 $(WRKBUILD)/.configured: 
@@ -92,7 +82,8 @@ $(WRKBUILD)/.compiled:
 	touch $@
 
 $(WRKBUILD)/.installed:
-	${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) install_root=$(STAGING_DIR) install
+	${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) \
+		install_root=$(STAGING_DIR) install
 	touch $(STAGING_DIR)/usr/include/gnu/stubs.h
 	touch $@
 
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index 596c71955..23659af5d 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -2,7 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		glibc
-PKG_VERSION:=		2.11
+PKG_VERSION:=		2.11.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		55d50abb2d7c366bde6fb5e35e681f9b
 PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
diff --git a/toolchain/glibc/patches/longjmp_chk.patch b/toolchain/glibc/patches/longjmp_chk.patch
new file mode 100644
index 000000000..b2590460c
--- /dev/null
+++ b/toolchain/glibc/patches/longjmp_chk.patch
@@ -0,0 +1,56 @@
+diff -Nur glibc-2.11.orig/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S glibc-2.11/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
+--- glibc-2.11.orig/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S	2009-10-30 18:17:08.000000000 +0100
++++ glibc-2.11/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S	2010-02-19 08:06:22.000000000 +0100
+@@ -33,10 +33,10 @@
+ 			cfi_register(%ebx,%ecx);			      \
+ 			LOAD_PIC_REG (bx);				      \
+ 			leal	longjmp_msg@GOTOFF(%ebx), %eax;		      \
+-			call	__GI___fortify_fail@PLT
++			call	HIDDEN_JUMPTARGET(__fortify_fail)
+ #else
+ # define CALL_FAIL	movl	$longjmp_msg, %eax;			      \
+-			call	__fortify_fail
++			call	HIDDEN_JUMPTARGET(__fortify_fail)
+ #endif
+ 
+ 
+diff -Nur glibc-2.11.orig/sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S glibc-2.11/sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S
+--- glibc-2.11.orig/sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S	2009-10-30 18:17:08.000000000 +0100
++++ glibc-2.11/sysdeps/unix/sysv/linux/ia64/____longjmp_chk.S	2010-02-19 08:06:22.000000000 +0100
+@@ -30,19 +30,13 @@
+ 
+ #define __longjmp ____longjmp_chk
+ 
+-#ifdef PIC
+-#  define CALL_FAIL	__GI___fortify_fail
+-#else
+-#  define CALL_FAIL	__fortify_fail
+-#endif
+-
+ #define CHECK_RSP(reg) \
+ 	cmp.ltu p0, p8 = reg, r12;				\
+ (p8)	br.cond.dpnt .Lok;;					\
+ 	addl r28 = @ltoffx(longjmp_msg#), r1;;			\
+ 	ld8.mov r28 = [r28], longjmp_msg#;;			\
+ 	ld8 out0 = [r28];					\
+-	br.call.sptk.many b0 = CALL_FAIL#;;			\
++	br.call.sptk.many b0 = HIDDEN_JUMPTARGET(__fortify_fail)#;; \
+ .Lok:
+ 
+ #include "__longjmp.S"
+diff -Nur glibc-2.11.orig/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S glibc-2.11/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
+--- glibc-2.11.orig/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S	2009-10-30 18:17:08.000000000 +0100
++++ glibc-2.11/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S	2010-02-19 08:06:22.000000000 +0100
+@@ -31,10 +31,10 @@
+ 
+ #ifdef PIC
+ # define CALL_FAIL	leaq	longjmp_msg(%rip), %rdi;		      \
+-			call	__GI___fortify_fail
++			call	HIDDEN_JUMPTARGET(__fortify_fail)
+ #else
+ # define CALL_FAIL	movq	$longjmp_msg, %rdi;			      \
+-			call	__fortify_fail
++			call	HIDDEN_JUMPTARGET(__fortify_fail)
+ #endif
+ 
+ #define CHECK_RSP(reg) \
-- 
cgit v1.2.3


From b96814ed6f6bbc7ec650c513f2b27f8b1dcb8ac7 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Wed, 24 Feb 2010 01:05:45 +0100
Subject: toolchain: enable parallel building for gcc, glibc, binutils, gmp and
 mpfr

---
 toolchain/binutils/Makefile |  6 +++++-
 toolchain/gcc/Makefile      | 10 +++++++---
 toolchain/gdb/Makefile      |  6 +++++-
 toolchain/glibc/Makefile    |  8 ++++++--
 toolchain/gmp/Makefile      |  6 +++++-
 toolchain/mpfr/Makefile     |  6 +++++-
 6 files changed, 33 insertions(+), 9 deletions(-)

(limited to 'toolchain/glibc')

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index fb6beccab..c3dc45b07 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -10,6 +10,10 @@ ifeq ($(ADK_LINUX_64),y)
 CONFOPTS+=		--enable-64-bit-bfd
 endif
 
+ifeq (${ADK_MAKE_PARALLEL},y)
+BINUTILS_MAKEOPTS+=	-j${ADK_MAKE_JOBS}
+endif
+
 $(WRKBUILD)/.headers: 
 $(WRKBUILD)/.configured: 
 	(cd $(WRKBUILD); \
@@ -31,7 +35,7 @@ $(WRKBUILD)/.configured:
 	touch $@
 
 $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
-	$(MAKE) -C $(WRKBUILD) all
+	$(MAKE) ${BINUTILS_MAKEOPTS} -C $(WRKBUILD) all
 	touch $@
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 0fc5edc1d..1cf762810 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -36,6 +36,10 @@ ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 GCC_CONFOPTS+=		--disable-tls
 endif
 
+ifeq (${ADK_MAKE_PARALLEL},y)
+GCC_MAKEOPTS+=		-j${ADK_MAKE_JOBS}
+endif
+
 include ${TOPDIR}/mk/buildhlp.mk
 
 GCC_BUILD_DIR_MINIMAL:=	$(WRKBUILD)-minimal
@@ -57,7 +61,7 @@ $(GCC_BUILD_DIR_MINIMAL)/.configured:
 
 $(GCC_BUILD_DIR_MINIMAL)/.compiled: $(GCC_BUILD_DIR_MINIMAL)/.configured
 	PATH=$(TARGET_PATH) \
-	$(MAKE) -C $(GCC_BUILD_DIR_MINIMAL) all-gcc
+	$(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_MINIMAL) all-gcc
 	touch $@
 
 $(WRKBUILD)/.headers: $(GCC_BUILD_DIR_MINIMAL)/.compiled
@@ -86,7 +90,7 @@ $(GCC_BUILD_DIR_INITIAL)/.configured:
 
 $(GCC_BUILD_DIR_INITIAL)/.compiled: $(GCC_BUILD_DIR_INITIAL)/.configured
 	PATH=$(TARGET_PATH) \
-	$(MAKE) -C $(GCC_BUILD_DIR_INITIAL) all-gcc all-target-libgcc
+	$(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_INITIAL) all-gcc all-target-libgcc
 	touch $@
 
 $(WRKBUILD)/.configured: $(GCC_BUILD_DIR_INITIAL)/.compiled
@@ -109,7 +113,7 @@ $(GCC_BUILD_DIR_FINAL)/.configured:
 
 $(WRKBUILD)/.compiled: $(GCC_BUILD_DIR_FINAL)/.configured
 	PATH=$(TARGET_PATH) \
-	$(MAKE) -C $(GCC_BUILD_DIR_FINAL) all
+	$(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_FINAL) all
 	touch $@
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile
index 0d6b7cb48..9571f2a9f 100644
--- a/toolchain/gdb/Makefile
+++ b/toolchain/gdb/Makefile
@@ -7,6 +7,10 @@ include Makefile.inc
 
 include ${TOPDIR}/mk/buildhlp.mk
 
+ifeq (${ADK_MAKE_PARALLEL},y)
+GDB_MAKEOPTS+=		-j${ADK_MAKE_JOBS}
+endif
+
 $(WRKBUILD)/.headers:
 $(WRKBUILD)/.configured:
 	(cd $(WRKBUILD); \
@@ -33,7 +37,7 @@ $(WRKBUILD)/.configured:
 	touch $@
 
 $(WRKBUILD)/.compiled: 
-	$(MAKE) -C $(WRKBUILD) CFLAGS="-fPIC ${HOSTCFLAGS}"
+	$(MAKE) ${GDB_MAKEOPTS} -C $(WRKBUILD) CFLAGS="-fPIC ${HOSTCFLAGS}"
 	touch $@
 
 $(WRKBUILD)/.installed: 
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 2058c41d4..a45fe6fb6 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -43,6 +43,10 @@ ifeq ($(ADK_TARGET_NO_FPU),y)
 GLIBC_CONFOPTS+=	--without-fp
 endif
 
+ifeq (${ADK_MAKE_PARALLEL},y)
+GLIBC_MAKEOPTS+=	PARALLELMFLAGS="-j${ADK_MAKE_JOBS}"
+endif
+
 GLIBC_BUILD_DIR_INITIAL:=	${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers
 GLIBC_BUILD_DIR_FINAL:=		${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final
 
@@ -58,7 +62,7 @@ $(WRKBUILD)/.headers_configure:
 
 $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 	mkdir -p $(TOOLCHAIN_SYSROOT)/usr/lib
-	$(MAKE) -C $(GLIBC_BUILD_DIR_INITIAL) \
+	$(MAKE) ${GLIBC_MAKEOPTS} -C $(GLIBC_BUILD_DIR_INITIAL) \
 		cross-compiling=yes \
 		install_root=$(TOOLCHAIN_SYSROOT) \
 		install-headers
@@ -78,7 +82,7 @@ $(WRKBUILD)/.configured:
 	touch $@
 
 $(WRKBUILD)/.compiled:
-	${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL) all
+	${GLIBC_ENV} $(MAKE) ${GLIBC_MAKEOPTS} -C $(GLIBC_BUILD_DIR_FINAL) all
 	touch $@
 
 $(WRKBUILD)/.installed:
diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile
index bbe26f14d..c31e76483 100644
--- a/toolchain/gmp/Makefile
+++ b/toolchain/gmp/Makefile
@@ -6,6 +6,10 @@ include ../rules.mk
 include Makefile.inc
 include ${TOPDIR}/mk/buildhlp.mk
 
+ifeq (${ADK_MAKE_PARALLEL},y)
+GMP_MAKEOPTS+=		-j${ADK_MAKE_JOBS}
+endif
+
 $(WRKBUILD)/.headers: 
 $(WRKBUILD)/.configured: 
 	(cd $(WRKBUILD); \
@@ -20,7 +24,7 @@ $(WRKBUILD)/.configured:
 	touch $@
 
 $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
-	$(MAKE) -C $(WRKBUILD) all
+	$(MAKE) ${GMP_MAKEOPTS} -C $(WRKBUILD) all
 	touch $@
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
diff --git a/toolchain/mpfr/Makefile b/toolchain/mpfr/Makefile
index f74f0199f..d16729a70 100644
--- a/toolchain/mpfr/Makefile
+++ b/toolchain/mpfr/Makefile
@@ -7,6 +7,10 @@ include $(TOPDIR)/toolchain/gmp/Makefile.inc
 include Makefile.inc
 include ${TOPDIR}/mk/buildhlp.mk
 
+ifeq (${ADK_MAKE_PARALLEL},y)
+MPFR_MAKEOPTS+=		-j${ADK_MAKE_JOBS}
+endif
+
 $(WRKBUILD)/.headers: 
 $(WRKBUILD)/.configured: 
 	(cd $(WRKBUILD); \
@@ -21,7 +25,7 @@ $(WRKBUILD)/.configured:
 	touch $@
 
 $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
-	$(MAKE) -C $(WRKBUILD) all
+	$(MAKE) ${MPFR_MAKEOPTS} -C $(WRKBUILD) all
 	touch $@
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
-- 
cgit v1.2.3


From 65e5e3f6209a4d72be094393ff2d7df871e36184 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Wed, 24 Feb 2010 01:05:46 +0100
Subject: toolchain: trailing whitespaces cleanup (just cosmetics!)

---
 toolchain/Makefile          | 4 ++--
 toolchain/binutils/Makefile | 4 ++--
 toolchain/eglibc/Makefile   | 4 ++--
 toolchain/gcc/Makefile      | 4 ++--
 toolchain/gdb/Makefile      | 4 ++--
 toolchain/glibc/Makefile    | 2 +-
 toolchain/gmp/Makefile      | 4 ++--
 toolchain/mpfr/Makefile     | 4 ++--
 toolchain/uClibc/Makefile   | 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'toolchain/glibc')

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 2c424ed7d..a66791df0 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -7,7 +7,7 @@
 # 3) build and install gcc c compiler
 # 4) install kernel-headers
 # 5) install libc headers
-# 6) build and install full gcc 
+# 6) build and install full gcc
 # 7) build and install full libc
 # 8) build and install gdb debugger
 
@@ -38,7 +38,7 @@ clean: $(TARGETS_CLEAN)
 download: $(DOWNLOAD)
 
 gcc-prepare: binutils-install gmp-install mpfr-install
-$(LIBC)-prepare: gcc-prepare kernel-headers-prepare 
+$(LIBC)-prepare: gcc-prepare kernel-headers-prepare
 gcc-configure: $(LIBC)-prepare
 $(LIBC)-compile: gcc-configure
 gcc-compile: $(LIBC)-install
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index c3dc45b07..53ddb5dde 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -14,8 +14,8 @@ ifeq (${ADK_MAKE_PARALLEL},y)
 BINUTILS_MAKEOPTS+=	-j${ADK_MAKE_JOBS}
 endif
 
-$(WRKBUILD)/.headers: 
-$(WRKBUILD)/.configured: 
+$(WRKBUILD)/.headers:
+$(WRKBUILD)/.configured:
 	(cd $(WRKBUILD); \
 		$(WRKBUILD)/configure \
 		--prefix=$(STAGING_TOOLS) \
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index 1605113c6..f52cf0717 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -31,7 +31,7 @@ EGLIBC_ENV:=		PATH='${TARGET_PATH}' \
 			libc_cv_forced_unwind=yes \
 			libc_cv_c_cleanup=yes \
 			libc_cv_gnu99_inline=yes \
-			libc_cv_slibdir="/lib" 
+			libc_cv_slibdir="/lib"
 
 ifeq ($(ADK_TARGET_NO_FPU),y)
 EGLIBC_CONFOPTS+=       --without-fp
@@ -62,7 +62,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 		install-headers install-bootstrap-headers=yes
 	touch $@
 
-$(WRKBUILD)/.configured: 
+$(WRKBUILD)/.configured:
 	mkdir -p $(EGLIBC_BUILD_DIR_FINAL)
 	$(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \
 		$(EGLIBC_BUILD_DIR_FINAL)
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 1cf762810..0b033cd91 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -22,7 +22,7 @@ GCC_CONFOPTS=		--prefix=$(STAGING_TOOLS) \
 			--disable-sjlj-exceptions \
 			--disable-libssp \
 			--disable-libstdcxx-pch \
-			--disable-nls 
+			--disable-nls
 
 ifeq ($(ADK_TARGET_NO_FPU),y)
 GCC_CONFOPTS+=		--with-float=soft
@@ -128,7 +128,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 		cd bin; \
 		for app in $(REAL_GNU_TARGET_NAME)-* ; do \
 			ln -sf $${app} \
-		   	$(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
+				$(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
 		done; \
 	)
 	touch $@
diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile
index 9571f2a9f..52a40fb0d 100644
--- a/toolchain/gdb/Makefile
+++ b/toolchain/gdb/Makefile
@@ -36,11 +36,11 @@ $(WRKBUILD)/.configured:
 	);
 	touch $@
 
-$(WRKBUILD)/.compiled: 
+$(WRKBUILD)/.compiled:
 	$(MAKE) ${GDB_MAKEOPTS} -C $(WRKBUILD) CFLAGS="-fPIC ${HOSTCFLAGS}"
 	touch $@
 
-$(WRKBUILD)/.installed: 
+$(WRKBUILD)/.installed:
 	install -c $(WRKBUILD)/gdb/gdb $(TARGET_CROSS)gdb
 	cd $(STAGING_TOOLS)/bin && \
 	ln -fs $(TARGET_CROSS)gdb $(GNU_TARGET_NAME)-gdb
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index a45fe6fb6..51059709e 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -69,7 +69,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 	touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h
 	touch $@
 
-$(WRKBUILD)/.configured: 
+$(WRKBUILD)/.configured:
 	mkdir -p $(GLIBC_BUILD_DIR_FINAL)
 	(cd $(GLIBC_BUILD_DIR_FINAL); \
 		${GLIBC_ENV} \
diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile
index c31e76483..1a6a77d26 100644
--- a/toolchain/gmp/Makefile
+++ b/toolchain/gmp/Makefile
@@ -10,8 +10,8 @@ ifeq (${ADK_MAKE_PARALLEL},y)
 GMP_MAKEOPTS+=		-j${ADK_MAKE_JOBS}
 endif
 
-$(WRKBUILD)/.headers: 
-$(WRKBUILD)/.configured: 
+$(WRKBUILD)/.headers:
+$(WRKBUILD)/.configured:
 	(cd $(WRKBUILD); \
 		$(WRKBUILD)/configure \
 		--prefix=$(STAGING_TOOLS) \
diff --git a/toolchain/mpfr/Makefile b/toolchain/mpfr/Makefile
index d16729a70..67753db9b 100644
--- a/toolchain/mpfr/Makefile
+++ b/toolchain/mpfr/Makefile
@@ -11,8 +11,8 @@ ifeq (${ADK_MAKE_PARALLEL},y)
 MPFR_MAKEOPTS+=		-j${ADK_MAKE_JOBS}
 endif
 
-$(WRKBUILD)/.headers: 
-$(WRKBUILD)/.configured: 
+$(WRKBUILD)/.headers:
+$(WRKBUILD)/.configured:
 	(cd $(WRKBUILD); \
 		$(WRKBUILD)/configure \
 		--prefix=$(STAGING_TOOLS) \
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 8ccc2ac98..8d956f4b1 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -25,7 +25,7 @@ endif
 	touch $(WRKBUILD)/.configured
 	touch $@
 
-$(WRKBUILD)/.compiled: 
+$(WRKBUILD)/.compiled:
 	$(MAKE) -C $(WRKBUILD) \
 		PREFIX= \
 		DEVEL_PREFIX=/ \
-- 
cgit v1.2.3


From e473446ff8a93fb8cdc52494b4d6ee15bc15bf61 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 25 Feb 2010 20:16:31 +0100
Subject: first try to get glibc working for mips/arm (not working yet)

---
 target/Config.in                                 |   1 +
 toolchain/Makefile                               |   8 +-
 toolchain/gcc/Makefile                           |   2 +
 toolchain/glibc-ports/Makefile                   |  22 +
 toolchain/glibc-ports/Makefile.inc               |   8 +
 toolchain/glibc-ports/patches/mips.patch         |  41 ++
 toolchain/glibc/Makefile                         |   3 +-
 toolchain/glibc/patches/mips-compile-error.patch | 577 -----------------------
 toolchain/glibc/patches/mips32.patch             |   7 -
 toolchain/glibc/patches/mips64.patch             |  32 --
 10 files changed, 82 insertions(+), 619 deletions(-)
 create mode 100644 toolchain/glibc-ports/Makefile
 create mode 100644 toolchain/glibc-ports/Makefile.inc
 create mode 100644 toolchain/glibc-ports/patches/mips.patch
 delete mode 100644 toolchain/glibc/patches/mips-compile-error.patch
 delete mode 100644 toolchain/glibc/patches/mips32.patch
 delete mode 100644 toolchain/glibc/patches/mips64.patch

(limited to 'toolchain/glibc')

diff --git a/target/Config.in b/target/Config.in
index 249a76605..1716a5c59 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -780,6 +780,7 @@ config ADK_TARGET_LIB_GLIBC
 		ADK_LINUX_X86_WRAP || \
 		ADK_LINUX_MIPS_RB411 || \
 		ADK_LINUX_MIPS_RB433 || \
+		ADK_LINUX_MIPS_RB532 || \
 		ADK_LINUX_RESCUE || \
 		ADK_LINUX_X86_64_SHUTTLE || \
 		ADK_LINUX_ARM_TOMTOM || \
diff --git a/toolchain/Makefile b/toolchain/Makefile
index 2c424ed7d..1555d7637 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -15,7 +15,7 @@ include $(TOPDIR)/rules.mk
 
 TARGETS:=binutils gmp mpfr gcc
 ifeq ($(ADK_TARGET_LIB_GLIBC),y)
-TARGETS+=glibc
+TARGETS+=glibc-ports glibc
 LIBC:=glibc
 endif
 ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
@@ -38,7 +38,11 @@ clean: $(TARGETS_CLEAN)
 download: $(DOWNLOAD)
 
 gcc-prepare: binutils-install gmp-install mpfr-install
-$(LIBC)-prepare: gcc-prepare kernel-headers-prepare 
+ifeq ($(ADK_TARGET_LIB_GLIBC),y)
+$(LIBC)-prepare: gcc-prepare kernel-headers-prepare glibc-ports-prepare
+else
+$(LIBC)-prepare: gcc-prepare kernel-headers-prepare
+endif
 gcc-configure: $(LIBC)-prepare
 $(LIBC)-compile: gcc-configure
 gcc-compile: $(LIBC)-install
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 0fc5edc1d..5d4dc706b 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -34,6 +34,8 @@ endif
 
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 GCC_CONFOPTS+=		--disable-tls
+else
+GCC_CONFOPTS+=		--enable-tls
 endif
 
 include ${TOPDIR}/mk/buildhlp.mk
diff --git a/toolchain/glibc-ports/Makefile b/toolchain/glibc-ports/Makefile
new file mode 100644
index 000000000..be4a39e65
--- /dev/null
+++ b/toolchain/glibc-ports/Makefile
@@ -0,0 +1,22 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+include ../rules.mk
+include Makefile.inc
+
+include ${TOPDIR}/mk/buildhlp.mk
+
+$(WRKBUILD)/.headers: 
+	touch $@
+
+$(WRKBUILD)/.configured:
+	touch $@
+
+$(WRKBUILD)/.compiled:
+	touch $@
+
+$(WRKBUILD)/.installed:
+	touch $@
+
+include ${TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/glibc-ports/Makefile.inc b/toolchain/glibc-ports/Makefile.inc
new file mode 100644
index 000000000..20e50b577
--- /dev/null
+++ b/toolchain/glibc-ports/Makefile.inc
@@ -0,0 +1,8 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+PKG_NAME:=		glibc-ports
+PKG_VERSION:=		2.11
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		55d50abb2d7c366bde6fb5e35e681f9b
+PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
diff --git a/toolchain/glibc-ports/patches/mips.patch b/toolchain/glibc-ports/patches/mips.patch
new file mode 100644
index 000000000..2176a0a7e
--- /dev/null
+++ b/toolchain/glibc-ports/patches/mips.patch
@@ -0,0 +1,41 @@
+diff -Nur glibc-ports-2.11.orig/sysdeps/mips/mips32/Makefile glibc-ports-2.11/sysdeps/mips/mips32/Makefile
+--- glibc-ports-2.11.orig/sysdeps/mips/mips32/Makefile	2009-11-15 21:53:20.000000000 +0100
++++ glibc-ports-2.11/sysdeps/mips/mips32/Makefile	2010-02-25 05:06:53.093359450 +0100
+@@ -1,3 +1,3 @@
+-ifeq ($(filter -mabi=32,$(CC)),)
+-CC += -mabi=32
+-endif
++#ifeq ($(filter -mabi=32,$(CC)),)
++#CC += -mabi=32
++#endif
+diff -Nur glibc-ports-2.11.orig/sysdeps/mips/nptl/tls.h glibc-ports-2.11/sysdeps/mips/nptl/tls.h
+--- glibc-ports-2.11.orig/sysdeps/mips/nptl/tls.h	2009-11-15 21:53:20.000000000 +0100
++++ glibc-ports-2.11/sysdeps/mips/nptl/tls.h	2010-02-25 19:16:31.338162548 +0100
+@@ -55,12 +55,6 @@
+ 	.set	pop
+ #endif /* __ASSEMBLER__ */
+ 
+-
+-/* We require TLS support in the tools.  */
+-#ifndef HAVE_TLS_SUPPORT
+-# error "TLS support is required."
+-#endif
+-
+ /* Signal that TLS support is available.  */
+ #define USE_TLS	1
+ 
+diff -Nur glibc-ports-2.11.orig/sysdeps/mips/preconfigure glibc-ports-2.11/sysdeps/mips/preconfigure
+--- glibc-ports-2.11.orig/sysdeps/mips/preconfigure	2009-11-15 21:53:20.000000000 +0100
++++ glibc-ports-2.11/sysdeps/mips/preconfigure	2010-02-25 05:07:40.565358364 +0100
+@@ -19,11 +19,6 @@
+ 		32) machine=mips/mips32/kern64 ;;
+ 		esac
+ 		machine=$machine/$config_machine
+-		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"
+-		fi
+ 		;;
+ mips*)		base_machine=mips machine=mips/mips32/$machine ;;
+ esac
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 2058c41d4..7e472831c 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -47,6 +47,7 @@ GLIBC_BUILD_DIR_INITIAL:=	${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers
 GLIBC_BUILD_DIR_FINAL:=		${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final
 
 $(WRKBUILD)/.headers_configure:
+	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); ln -sf ../glibc-ports-2.11/ ports);
 	mkdir -p $(GLIBC_BUILD_DIR_INITIAL)
 	(cd $(GLIBC_BUILD_DIR_INITIAL); \
 		$(WRKBUILD)/configure \
@@ -58,7 +59,7 @@ $(WRKBUILD)/.headers_configure:
 
 $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 	mkdir -p $(TOOLCHAIN_SYSROOT)/usr/lib
-	$(MAKE) -C $(GLIBC_BUILD_DIR_INITIAL) \
+	-$(MAKE) -C $(GLIBC_BUILD_DIR_INITIAL) \
 		cross-compiling=yes \
 		install_root=$(TOOLCHAIN_SYSROOT) \
 		install-headers
diff --git a/toolchain/glibc/patches/mips-compile-error.patch b/toolchain/glibc/patches/mips-compile-error.patch
deleted file mode 100644
index a07aab16a..000000000
--- a/toolchain/glibc/patches/mips-compile-error.patch
+++ /dev/null
@@ -1,577 +0,0 @@
-diff -Nur glibc-2.10.1/ports/sysdeps/mips/dl-lookup.c glibc-2.10.90/ports/sysdeps/mips/dl-lookup.c
---- glibc-2.10.1/ports/sysdeps/mips/dl-lookup.c	2009-08-20 08:59:52.000000000 +0200
-+++ glibc-2.10.90/ports/sysdeps/mips/dl-lookup.c	2009-05-26 22:53:27.000000000 +0200
-@@ -1,6 +1,9 @@
- /* Look up a symbol in the loaded objects.
--   MIPS/Linux version - special handling of non-PIC undefined symbol rules.
--   Copyright (C) 1995-2005, 2006, 2007, 2009 Free Software Foundation, Inc.
-+   MIPS/Linux version - this is identical to the common version, but
-+   because it is in sysdeps/mips, it gets sysdeps/mips/do-lookup.h.
-+   Using <do-lookup.h> instead of "do-lookup.h" would work too.
-+
-+   Copyright (C) 1995-2005, 2006, 2007 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
-@@ -70,387 +73,8 @@
- #endif
- 
- 
--/* Inner part of the lookup functions.  We return a value > 0 if we
--   found the symbol, the value 0 if nothing is found and < 0 if
--   something bad happened.  */
--static int
--__attribute_noinline__
--do_lookup_x (const char *undef_name, uint_fast32_t new_hash,
--	     unsigned long int *old_hash, const ElfW(Sym) *ref,
--	     struct sym_val *result, struct r_scope_elem *scope, size_t i,
--	     const struct r_found_version *const version, int flags,
--	     struct link_map *skip, int type_class, struct link_map *undef_map)
--{
--  size_t n = scope->r_nlist;
--  /* Make sure we read the value before proceeding.  Otherwise we
--     might use r_list pointing to the initial scope and r_nlist being
--     the value after a resize.  That is the only path in dl-open.c not
--     protected by GSCOPE.  A read barrier here might be to expensive.  */
--  __asm volatile ("" : "+r" (n), "+m" (scope->r_list));
--  struct link_map **list = scope->r_list;
--
--  do
--    {
--      /* These variables are used in the nested function.  */
--      Elf_Symndx symidx;
--      int num_versions = 0;
--      const ElfW(Sym) *versioned_sym = NULL;
--
--      const struct link_map *map = list[i]->l_real;
--
--      /* Here come the extra test needed for `_dl_lookup_symbol_skip'.  */
--      if (map == skip)
--	continue;
--
--      /* Don't search the executable when resolving a copy reloc.  */
--      if ((type_class & ELF_RTYPE_CLASS_COPY) && map->l_type == lt_executable)
--	continue;
--
--      /* Do not look into objects which are going to be removed.  */
--      if (map->l_removed)
--	continue;
--
--      /* Print some debugging info if wanted.  */
--      if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SYMBOLS, 0))
--	_dl_debug_printf ("symbol=%s;  lookup in file=%s [%lu]\n",
--			  undef_name,
--			  map->l_name[0] ? map->l_name : rtld_progname,
--			  map->l_ns);
--
--      /* If the hash table is empty there is nothing to do here.  */
--      if (map->l_nbuckets == 0)
--	continue;
--
--      /* The tables for this map.  */
--      const ElfW(Sym) *symtab = (const void *) D_PTR (map, l_info[DT_SYMTAB]);
--      const char *strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
--
--
--      /* Nested routine to check whether the symbol matches.  */
--      const ElfW(Sym) *
--      __attribute_noinline__
--      check_match (const ElfW(Sym) *sym)
--      {
--	unsigned int stt = ELFW(ST_TYPE) (sym->st_info);
--	assert (ELF_RTYPE_CLASS_PLT == 1);
--	/* The semantics of zero/non-zero values of undefined symbols
--	   differs depending on whether the non-PIC ABI is in use.
--	   Under the non-PIC ABI, a non-zero value indicates that
--	   there is an address reference to the symbol and thus it
--	   must always be resolved (except when resolving a jump slot
--	   relocation) to the PLT entry whose address is provided as
--	   the symbol's value; a zero value indicates that this
--	   canonical-address behaviour is not required.  Yet under the
--	   classic MIPS psABI, a zero value indicates that there is an
--	   address reference to the function and the dynamic linker
--	   must resolve the symbol immediately upon loading.  To avoid
--	   conflict, symbols for which the dynamic linker must assume
--	   the non-PIC ABI semantics are marked with the STO_MIPS_PLT
--	   flag.  */
--	if (__builtin_expect ((sym->st_value == 0 /* No value.  */
--			       && stt != STT_TLS)
--			      || (sym->st_shndx == SHN_UNDEF
--				  && !(sym->st_other & STO_MIPS_PLT))
--			      || (type_class & (sym->st_shndx == SHN_UNDEF)),
--			      0))
--	  return NULL;
--
--	/* Ignore all but STT_NOTYPE, STT_OBJECT, STT_FUNC,
--	   STT_COMMON, STT_TLS, and STT_GNU_IFUNC since these are no
--	   code/data definitions.  */
--#define ALLOWED_STT \
--	((1 << STT_NOTYPE) | (1 << STT_OBJECT) | (1 << STT_FUNC) \
--	 | (1 << STT_COMMON) | (1 << STT_TLS) | (1 << STT_GNU_IFUNC))
--	if (__builtin_expect (((1 << stt) & ALLOWED_STT) == 0, 0))
--	  return NULL;
--
--	if (sym != ref && strcmp (strtab + sym->st_name, undef_name))
--	  /* Not the symbol we are looking for.  */
--	  return NULL;
--
--	const ElfW(Half) *verstab = map->l_versyms;
--	if (version != NULL)
--	  {
--	    if (__builtin_expect (verstab == NULL, 0))
--	      {
--		/* We need a versioned symbol but haven't found any.  If
--		   this is the object which is referenced in the verneed
--		   entry it is a bug in the library since a symbol must
--		   not simply disappear.
--
--		   It would also be a bug in the object since it means that
--		   the list of required versions is incomplete and so the
--		   tests in dl-version.c haven't found a problem.*/
--		assert (version->filename == NULL
--			|| ! _dl_name_match_p (version->filename, map));
--
--		/* Otherwise we accept the symbol.  */
--	      }
--	    else
--	      {
--		/* We can match the version information or use the
--		   default one if it is not hidden.  */
--		ElfW(Half) ndx = verstab[symidx] & 0x7fff;
--		if ((map->l_versions[ndx].hash != version->hash
--		     || strcmp (map->l_versions[ndx].name, version->name))
--		    && (version->hidden || map->l_versions[ndx].hash
--			|| (verstab[symidx] & 0x8000)))
--		  /* It's not the version we want.  */
--		  return NULL;
--	      }
--	  }
--	else
--	  {
--	    /* No specific version is selected.  There are two ways we
--	       can got here:
--
--	       - a binary which does not include versioning information
--	       is loaded
--
--	       - dlsym() instead of dlvsym() is used to get a symbol which
--	       might exist in more than one form
--
--	       If the library does not provide symbol version information
--	       there is no problem at at: we simply use the symbol if it
--	       is defined.
--
--	       These two lookups need to be handled differently if the
--	       library defines versions.  In the case of the old
--	       unversioned application the oldest (default) version
--	       should be used.  In case of a dlsym() call the latest and
--	       public interface should be returned.  */
--	    if (verstab != NULL)
--	      {
--		if ((verstab[symidx] & 0x7fff)
--		    >= ((flags & DL_LOOKUP_RETURN_NEWEST) ? 2 : 3))
--		  {
--		    /* Don't accept hidden symbols.  */
--		    if ((verstab[symidx] & 0x8000) == 0
--			&& num_versions++ == 0)
--		      /* No version so far.  */
--		      versioned_sym = sym;
--
--		    return NULL;
--		  }
--	      }
--	  }
--
--	/* There cannot be another entry for this symbol so stop here.  */
--	return sym;
--      }
--
--      const ElfW(Sym) *sym;
--      const ElfW(Addr) *bitmask = map->l_gnu_bitmask;
--      if (__builtin_expect (bitmask != NULL, 1))
--	{
--	  ElfW(Addr) bitmask_word
--	    = bitmask[(new_hash / __ELF_NATIVE_CLASS)
--		      & map->l_gnu_bitmask_idxbits];
--
--	  unsigned int hashbit1 = new_hash & (__ELF_NATIVE_CLASS - 1);
--	  unsigned int hashbit2 = ((new_hash >> map->l_gnu_shift)
--				   & (__ELF_NATIVE_CLASS - 1));
--
--	  if (__builtin_expect ((bitmask_word >> hashbit1)
--				& (bitmask_word >> hashbit2) & 1, 0))
--	    {
--	      Elf32_Word bucket = map->l_gnu_buckets[new_hash
--						     % map->l_nbuckets];
--	      if (bucket != 0)
--		{
--		  const Elf32_Word *hasharr = &map->l_gnu_chain_zero[bucket];
--
--		  do
--		    if (((*hasharr ^ new_hash) >> 1) == 0)
--		      {
--			symidx = hasharr - map->l_gnu_chain_zero;
--			sym = check_match (&symtab[symidx]);
--			if (sym != NULL)
--			  goto found_it;
--		      }
--		  while ((*hasharr++ & 1u) == 0);
--		}
--	    }
--	  /* No symbol found.  */
--	  symidx = SHN_UNDEF;
--	}
--      else
--	{
--	  if (*old_hash == 0xffffffff)
--	    *old_hash = _dl_elf_hash (undef_name);
--
--	  /* Use the old SysV-style hash table.  Search the appropriate
--	     hash bucket in this object's symbol table for a definition
--	     for the same symbol name.  */
--	  for (symidx = map->l_buckets[*old_hash % map->l_nbuckets];
--	       symidx != STN_UNDEF;
--	       symidx = map->l_chain[symidx])
--	    {
--	      sym = check_match (&symtab[symidx]);
--	      if (sym != NULL)
--		goto found_it;
--	    }
--	}
--
--      /* If we have seen exactly one versioned symbol while we are
--	 looking for an unversioned symbol and the version is not the
--	 default version we still accept this symbol since there are
--	 no possible ambiguities.  */
--      sym = num_versions == 1 ? versioned_sym : NULL;
--
--      if (sym != NULL)
--	{
--	found_it:
--	  switch (__builtin_expect (ELFW(ST_BIND) (sym->st_info), STB_GLOBAL))
--	    {
--	    case STB_WEAK:
--	      /* Weak definition.  Use this value if we don't find another.  */
--	      if (__builtin_expect (GLRO(dl_dynamic_weak), 0))
--		{
--		  if (! result->s)
--		    {
--		      result->s = sym;
--		      result->m = (struct link_map *) map;
--		    }
--		  break;
--		}
--	      /* FALLTHROUGH */
--	    case STB_GLOBAL:
--	    success:
--	      /* Global definition.  Just what we need.  */
--	      result->s = sym;
--	      result->m = (struct link_map *) map;
--	      return 1;
--
--	    case STB_GNU_UNIQUE:;
--	      /* We have to determine whether we already found a
--		 symbol with this name before.  If not then we have to
--		 add it to the search table.  If we already found a
--		 definition we have to use it.  */
--	      void enter (struct unique_sym *table, size_t size,
--			  unsigned int hash, const char *name,
--			  const ElfW(Sym) *sym, const struct link_map *map)
--	      {
--		size_t idx = hash % size;
--		size_t hash2 = 1 + hash % (size - 2);
--		while (1)
--		  {
--		    if (table[idx].hashval == 0)
--		      {
--			table[idx].hashval = hash;
--			table[idx].name = strtab + sym->st_name;
--			if ((type_class & ELF_RTYPE_CLASS_COPY) != 0)
--			  {
--			    table[idx].sym = ref;
--			    table[idx].map = undef_map;
--			  }
--			else
--			  {
--			    table[idx].sym = sym;
--			    table[idx].map = map;
--			  }
--			return;
--		      }
--
--		    idx += hash2;
--		    if (idx >= size)
--		      idx -= size;
--		  }
--	      }
--
--	      struct unique_sym_table *tab
--		= &GL(dl_ns)[map->l_ns]._ns_unique_sym_table;
--
--	      __rtld_lock_lock_recursive (tab->lock);
--
--	      struct unique_sym *entries = tab->entries;
--	      size_t size = tab->size;
--	      if (entries != NULL)
--		{
--		  size_t idx = new_hash % size;
--		  size_t hash2 = 1 + new_hash % (size - 2);
--		  while (1)
--		    {
--		      if (entries[idx].hashval == new_hash
--			  && strcmp (entries[idx].name, undef_name) == 0)
--			{
--			  result->s = entries[idx].sym;
--			  result->m = (struct link_map *) entries[idx].map;
--			  __rtld_lock_unlock_recursive (tab->lock);
--			  return 1;
--			}
--
--		      if (entries[idx].hashval == 0
--			  && entries[idx].name == NULL)
--			break;
--
--		      idx += hash2;
--		      if (idx >= size)
--			idx -= size;
--		    }
--
--		  if (size * 3 <= tab->n_elements)
--		    {
--		      /* Expand the table.  */
--		      size_t newsize = _dl_higher_prime_number (size);
--		      struct unique_sym *newentries
--			= calloc (sizeof (struct unique_sym), newsize);
--		      if (newentries == NULL)
--			{
--			nomem:
--			  __rtld_lock_unlock_recursive (tab->lock);
--			  _dl_fatal_printf ("out of memory\n");
--			}
--
--		      for (idx = 0; idx < size; ++idx)
--			if (entries[idx].hashval != 0)
--			  enter (newentries, newsize, entries[idx].hashval,
--				 entries[idx].name, entries[idx].sym,
--				 entries[idx].map);
--
--		      tab->free (entries);
--		      tab->size = newsize;
--		      entries = tab->entries = newentries;
--		      tab->free = free;
--		    }
--		}
--	      else
--		{
--#define INITIAL_NUNIQUE_SYM_TABLE 31
--		  size = INITIAL_NUNIQUE_SYM_TABLE;
--		  entries = calloc (sizeof (struct unique_sym), size);
--		  if (entries == NULL)
--		    goto nomem;
--
--		  tab->entries = entries;
--		  tab->size = size;
--		  tab->free = free;
--		}
--
--	      enter (entries, size, new_hash, strtab + sym->st_name, sym, map);
--	      ++tab->n_elements;
--
--	      __rtld_lock_unlock_recursive (tab->lock);
--
--	      goto success;
--
--	    default:
--	      /* Local symbols are ignored.  */
--	      break;
--	    }
--	}
--
--      /* If this current map is the one mentioned in the verneed entry
--	 and we have not found a weak entry, it is a bug.  */
--      if (symidx == STN_UNDEF && version != NULL && version->filename != NULL
--	  && __builtin_expect (_dl_name_match_p (version->filename, map), 0))
--	return -1;
--    }
--  while (++i < n);
--
--  /* We have not found anything until now.  */
--  return 0;
--}
-+/* The actual lookup code.  */
-+#include "do-lookup.h"
- 
- 
- static uint_fast32_t
-@@ -717,7 +341,7 @@
-     {
-       int res = do_lookup_x (undef_name, new_hash, &old_hash, *ref,
- 			     &current_value, *scope, start, version, flags,
--			     skip_map, type_class, undef_map);
-+			     skip_map, type_class);
-       if (res > 0)
- 	break;
- 
-@@ -790,7 +414,7 @@
- 	  for (scope = symbol_scope; *scope != NULL; i = 0, ++scope)
- 	    if (do_lookup_x (undef_name, new_hash, &old_hash, *ref,
- 			     &protected_value, *scope, i, version, flags,
--			     skip_map, ELF_RTYPE_CLASS_PLT, NULL) != 0)
-+			     skip_map, ELF_RTYPE_CLASS_PLT) != 0)
- 	      break;
- 
- 	  if (protected_value.s != NULL && protected_value.m != undef_map)
-@@ -916,26 +540,21 @@
- 
- 	  do_lookup_x (undef_name, new_hash, &old_hash, *ref, &val,
- 		       undef_map->l_local_scope[0], 0, version, 0, NULL,
--		       type_class, undef_map);
-+		       type_class);
- 
- 	  if (val.s != value->s || val.m != value->m)
- 	    conflict = 1;
- 	}
- 
--      if (value->s)
--	{
--	  if (__builtin_expect (ELFW(ST_TYPE) (value->s->st_info)
--				== STT_TLS, 0))
--	    type_class = 4;
--	  else if (__builtin_expect (ELFW(ST_TYPE) (value->s->st_info)
--				     == STT_GNU_IFUNC, 0))
--	    type_class |= 8;
--	}
-+      if (value->s
-+	  && (__builtin_expect (ELFW(ST_TYPE) (value->s->st_info)
-+				== STT_TLS, 0)))
-+	type_class = 4;
- 
-       if (conflict
- 	  || GLRO(dl_trace_prelink_map) == undef_map
- 	  || GLRO(dl_trace_prelink_map) == NULL
--	  || type_class >= 4)
-+	  || type_class == 4)
- 	{
- 	  _dl_printf ("%s 0x%0*Zx 0x%0*Zx -> 0x%0*Zx 0x%0*Zx ",
- 		      conflict ? "conflict" : "lookup",
-diff -Nur glibc-2.10.1/ports/sysdeps/mips/do-lookup.h glibc-2.10.90/ports/sysdeps/mips/do-lookup.h
---- glibc-2.10.1/ports/sysdeps/mips/do-lookup.h	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.10.90/ports/sysdeps/mips/do-lookup.h	2009-05-26 22:53:27.000000000 +0200
-@@ -0,0 +1,37 @@
-+/* MIPS-specific veneer to GLIBC's do-lookup.h.
-+   Copyright (C) 2008 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.  */
-+
-+/* The semantics of zero/non-zero values of undefined symbols differs
-+   depending on whether the non-PIC ABI is in use.  Under the non-PIC ABI,
-+   a non-zero value indicates that there is an address reference to the
-+   symbol and thus it must always be resolved (except when resolving a jump
-+   slot relocation) to the PLT entry whose address is provided as the
-+   symbol's value; a zero value indicates that this canonical-address
-+   behaviour is not required.  Yet under the classic MIPS psABI, a zero value
-+   indicates that there is an address reference to the function and the
-+   dynamic linker must resolve the symbol immediately upon loading.  To
-+   avoid conflict, symbols for which the dynamic linker must assume the
-+   non-PIC ABI semantics are marked with the STO_MIPS_PLT flag.  The
-+   following ugly hack causes the code in the platform-independent
-+   do-lookup.h file to check this flag correctly.  */
-+#define st_value st_shndx == SHN_UNDEF && !(sym->st_other & STO_MIPS_PLT)) \
-+		 || (sym->st_value
-+#include_next "do-lookup.h"
-+#undef st_value
-+
-diff -Nur glibc-2.10.1/ports/sysdeps/mips/__longjmp.c glibc-2.10.90/ports/sysdeps/mips/__longjmp.c
---- glibc-2.10.1/ports/sysdeps/mips/__longjmp.c	2009-08-20 08:59:52.000000000 +0200
-+++ glibc-2.10.90/ports/sysdeps/mips/__longjmp.c	2009-05-26 22:53:26.000000000 +0200
-@@ -25,19 +25,19 @@
- #endif
- 
- void
--__longjmp (env_arg, val_arg)
--     __jmp_buf env_arg;
-+__longjmp (env, val_arg)
-+     __jmp_buf env;
-      int val_arg;
- {
-   /* gcc 1.39.19 miscompiled the longjmp routine (as it did setjmp before
-      the hack around it); force it to use $a1 for the longjmp value.
-      Without this it saves $a1 in a register which gets clobbered
-      along the way.  */
--  register struct __jmp_buf_internal_tag *env asm ("a0");
-   register int val asm ("a1");
- #ifdef CHECK_SP
-   register long sp asm ("$29");
--  CHECK_SP (env[0].__sp, sp, long);
-+  if ((long) (env[0].__sp) < sp)
-+    __fortify_fail ("longjmp causes uninitialized stack frame");
- #endif
- 
- #ifdef __mips_hard_float
-diff -Nur glibc-2.10.1/ports/sysdeps/mips/____longjmp_chk.c glibc-2.10.90/ports/sysdeps/mips/____longjmp_chk.c
---- glibc-2.10.1/ports/sysdeps/mips/____longjmp_chk.c	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.10.90/ports/sysdeps/mips/____longjmp_chk.c	2009-05-26 22:53:26.000000000 +0200
-@@ -0,0 +1,22 @@
-+/* Copyright (C) 2009 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.  */
-+
-+#include <stdio.h>
-+#define __longjmp ____longjmp_chk
-+#define CHECK_SP
-+#include <__longjmp.c>
-diff -Nur glibc-2.10.1/ports/sysdeps/mips/mips64/__longjmp.c glibc-2.10.90/ports/sysdeps/mips/mips64/__longjmp.c
---- glibc-2.10.1/ports/sysdeps/mips/mips64/__longjmp.c	2009-08-20 08:59:52.000000000 +0200
-+++ glibc-2.10.90/ports/sysdeps/mips/mips64/__longjmp.c	2009-05-26 22:53:27.000000000 +0200
-@@ -27,19 +27,19 @@
- #endif
- 
- void
--__longjmp (env_arg, val_arg)
--     __jmp_buf env_arg;
-+__longjmp (env, val_arg)
-+     __jmp_buf env;
-      int val_arg;
- {
-   /* gcc 1.39.19 miscompiled the longjmp routine (as it did setjmp before
-      the hack around it); force it to use $a1 for the longjmp value.
-      Without this it saves $a1 in a register which gets clobbered
-      along the way.  */
--  register struct __jmp_buf_internal_tag *env asm ("a0");
-   register int val asm ("a1");
- #ifdef CHECK_SP
-   register long long sp asm ("$29");
--  CHECK_SP (env[0].__sp, sp, long long);
-+  if ((long long) (env[0].__sp) < sp)
-+    __fortify_fail ("longjmp causes uninitialized stack frame");
- #endif
- 
- #ifdef __mips_hard_float
diff --git a/toolchain/glibc/patches/mips32.patch b/toolchain/glibc/patches/mips32.patch
deleted file mode 100644
index d06bc7aad..000000000
--- a/toolchain/glibc/patches/mips32.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff -Nur glibc-2.10-current.orig/ports/sysdeps/mips/mips32/Makefile glibc-2.10-current/ports/sysdeps/mips/mips32/Makefile
---- glibc-2.10-current.orig/ports/sysdeps/mips/mips32/Makefile	2009-05-26 22:53:27.000000000 +0200
-+++ glibc-2.10-current/ports/sysdeps/mips/mips32/Makefile	2009-05-30 13:59:48.000000000 +0200
-@@ -1,3 +0,0 @@
--ifeq ($(filter -mabi=32,$(CC)),)
--CC += -mabi=32
--endif
diff --git a/toolchain/glibc/patches/mips64.patch b/toolchain/glibc/patches/mips64.patch
deleted file mode 100644
index 0b53244b9..000000000
--- a/toolchain/glibc/patches/mips64.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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 ;;
-- 
cgit v1.2.3


From 50beebab01a244a27e45ffd766377fa3fa91229a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 27 Feb 2010 12:19:57 +0100
Subject: fix checksum check of toolchain archives after download and update
 alix/wrap targets to 2.6.33

---
 mk/build.mk                        |   2 +-
 mk/buildhlp.mk                     |   4 -
 mk/kernel-build.mk                 |  12 +--
 target/alix1c/kernel.config        |  89 ++++++++++++++-----
 target/alix1c/target.mk            |   4 +-
 target/alix2d/kernel.config        |  87 ++++++++++++------
 target/alix2d/target.mk            |   4 +-
 target/alix2d13/target.mk          |   4 +-
 target/wrap/kernel.config          | 175 +++++++++++++++++++++++++------------
 target/wrap/target.mk              |   4 +-
 toolchain/binutils/Makefile        |   2 +-
 toolchain/eglibc/Makefile.inc      |   2 +-
 toolchain/glibc-ports/Makefile.inc |   2 +-
 toolchain/glibc/Makefile.inc       |   2 +-
 toolchain/gmp/Makefile             |   2 +-
 toolchain/gmp/Makefile.inc         |   4 +-
 toolchain/mpfr/Makefile.inc        |   2 +-
 toolchain/rules.mk                 |   1 -
 toolchain/uClibc/Makefile.inc      |   2 +-
 19 files changed, 273 insertions(+), 131 deletions(-)

(limited to 'toolchain/glibc')

diff --git a/mk/build.mk b/mk/build.mk
index a4ef86035..881acca62 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -196,7 +196,7 @@ clean:
 
 cleankernel:
 	@$(TRACE) cleankernel
-	rm -rf $(TOOLCHAIN_BUILD_DIR)/linux* $(BUILD_DIR)/linux
+	rm -rf $(TOOLCHAIN_BUILD_DIR)/w-linux* $(BUILD_DIR)/linux
 
 cleandir:
 	@$(TRACE) cleandir
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index e45504697..0b7a71f12 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -18,11 +18,7 @@ WRKBUILD?=		${WRKSRC}
 # This is where make install (fake) writes to
 WRKINST?=		${WRKDIR}/fake-${CPU_ARCH}/root
 
-ifeq ($(strip ${NO_CHECKSUM}),)
 _CHECKSUM_COOKIE=	${WRKDIR}/.checksum_done
-else
-_CHECKSUM_COOKIE=
-endif
 
 post-extract:
 
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index 79cb7f9cc..11b5a4890 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -3,20 +3,20 @@
 
 include $(TOPDIR)/rules.mk
 include $(TOPDIR)/mk/linux.mk
-include ${TOPDIR}/mk/buildhlp.mk
+#include ${TOPDIR}/mk/buildhlp.mk
 include ${TOPDIR}/mk/kernel-vars.mk
 
 KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg
 
-$(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION)/.patched:
+$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched:
 	$(TRACE) target/$(ADK_TARGET)-kernel-patch
-	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ../linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE)
-	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ../$(ADK_TARGET)/patches *.patch $(MAKE_TRACE)
+	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) ../linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE)
+	$(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) ../$(ADK_TARGET)/patches *.patch $(MAKE_TRACE)
 	touch $@
 
-$(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION)/.patched
+$(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched
 	$(TRACE) target/$(ADK_TARGET)-kernel-prepare
-	ln -sf $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) $(LINUX_DIR)
+	ln -sf $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) $(LINUX_DIR)
 	mkdir -p $(LINUX_BUILD_DIR)/kmod-control
 	touch $@
 
diff --git a/target/alix1c/kernel.config b/target/alix1c/kernel.config
index 722961e20..f51eec9a9 100644
--- a/target/alix1c/kernel.config
+++ b/target/alix1c/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32
-# Mon Feb  1 19:22:02 2010
+# Linux kernel version: 2.6.33
+# Sat Feb 27 10:02:09 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -62,9 +62,11 @@ CONFIG_LOCALVERSION=""
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -78,6 +80,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 #
 CONFIG_TREE_RCU=y
 # CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@@ -116,7 +119,7 @@ CONFIG_HAVE_PERF_EVENTS=y
 #
 # Kernel Performance Events And Counters
 #
-# CONFIG_PERF_EVENTS is not set
+CONFIG_PERF_EVENTS=y
 # CONFIG_PERF_COUNTERS is not set
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_PCI_QUIRKS is not set
@@ -133,6 +136,8 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 
 #
 # GCOV-based kernel profiling
@@ -157,14 +162,41 @@ CONFIG_BLOCK=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
 CONFIG_DEFAULT_NOOP=y
 CONFIG_DEFAULT_IOSCHED="noop"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
 # CONFIG_FREEZER is not set
 
 #
@@ -207,8 +239,7 @@ CONFIG_MGEODE_LX=y
 # CONFIG_GENERIC_CPU is not set
 # CONFIG_X86_GENERIC is not set
 CONFIG_X86_CPU=y
-CONFIG_X86_L1_CACHE_BYTES=64
-CONFIG_X86_INTERNODE_CACHE_BYTES=64
+CONFIG_X86_INTERNODE_CACHE_SHIFT=5
 CONFIG_X86_CMPXCHG=y
 CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_X86_XADD=y
@@ -219,8 +250,8 @@ CONFIG_X86_POPAD_OK=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_USE_3DNOW=y
 CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
 CONFIG_X86_DEBUGCTLMSR=y
 CONFIG_PROCESSOR_SELECT=y
 # CONFIG_CPU_SUP_INTEL is not set
@@ -247,7 +278,6 @@ CONFIG_VM86=y
 # CONFIG_MICROCODE is not set
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
-# CONFIG_X86_CPU_DEBUG is not set
 CONFIG_NOHIGHMEM=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
@@ -262,6 +292,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -275,8 +306,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -334,7 +363,6 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_ISA is not set
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
-CONFIG_GEODE_MFGPT_TIMER=y
 # CONFIG_OLPC is not set
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
@@ -412,7 +440,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
-# CONFIG_WIRELESS is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+# CONFIG_LIB80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
@@ -442,6 +476,10 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_RAM is not set
@@ -540,15 +578,16 @@ CONFIG_PATA_AMD=y
 # CONFIG_PATA_NS87415 is not set
 # CONFIG_PATA_OPTI is not set
 # CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_RADISYS is not set
 # CONFIG_PATA_RDC is not set
 # CONFIG_PATA_RZ1000 is not set
 # CONFIG_PATA_SC1200 is not set
 # CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_PDC2027X is not set
 # CONFIG_PATA_SIL680 is not set
 # CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
 # CONFIG_PATA_PLATFORM is not set
@@ -565,7 +604,7 @@ CONFIG_PATA_AMD=y
 #
 
 #
-# See the help texts for more information.
+# The newer stack is recommended.
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
@@ -644,9 +683,7 @@ CONFIG_VIA_RHINE_MMIO=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
-CONFIG_WLAN=y
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
+# CONFIG_WLAN is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -670,6 +707,7 @@ CONFIG_WLAN=y
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
 # CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
 
 #
 # Userland interfaces
@@ -711,6 +749,7 @@ CONFIG_SERIO_I8042=y
 # CONFIG_SERIO_PCIPS2 is not set
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -782,6 +821,7 @@ CONFIG_GPIO_SYSFS=y
 #
 # PCI GPIO expanders:
 #
+# CONFIG_GPIO_CS5535 is not set
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_LANGWELL is not set
 
@@ -807,7 +847,6 @@ CONFIG_WATCHDOG=y
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_ALIM1535_WDT is not set
 # CONFIG_ALIM7101_WDT is not set
-CONFIG_GEODE_WDT=y
 # CONFIG_SC520_WDT is not set
 # CONFIG_SBC_FITPC2_WATCHDOG is not set
 # CONFIG_EUROTECH_WDT is not set
@@ -1014,7 +1053,9 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_M48T35 is not set
 # CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
 # CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
@@ -1161,7 +1202,7 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_MEMORY_INIT is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 # CONFIG_FRAME_POINTER is not set
@@ -1207,7 +1248,11 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
 CONFIG_CRYPTO=y
 
 #
diff --git a/target/alix1c/target.mk b/target/alix1c/target.mk
index 9f958a84b..d5ee60a53 100644
--- a/target/alix1c/target.mk
+++ b/target/alix1c/target.mk
@@ -1,7 +1,7 @@
 ARCH:=			x86
 CPU_ARCH:=		i586
-KERNEL_VERSION:=	2.6.32
+KERNEL_VERSION:=	2.6.33
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		260551284ac224c3a43c4adac7df4879
+KERNEL_MD5SUM:=		c3883760b18d50e8d78819c54d579b00
 TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=	-march=geode
diff --git a/target/alix2d/kernel.config b/target/alix2d/kernel.config
index 4948d9d56..39382c7b4 100644
--- a/target/alix2d/kernel.config
+++ b/target/alix2d/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32
-# Fri Feb 12 18:59:57 2010
+# Linux kernel version: 2.6.33
+# Fri Feb 26 22:49:33 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -20,7 +20,6 @@ CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
@@ -62,9 +61,11 @@ CONFIG_LOCALVERSION=""
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -79,6 +80,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 #
 CONFIG_TREE_RCU=y
 # CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@@ -101,7 +103,7 @@ CONFIG_SYSCTL_SYSCALL=y
 # CONFIG_KALLSYMS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
-CONFIG_BUG=y
+# CONFIG_BUG is not set
 # CONFIG_ELF_CORE is not set
 # CONFIG_PCSPKR_PLATFORM is not set
 CONFIG_BASE_FULL=y
@@ -117,7 +119,7 @@ CONFIG_HAVE_PERF_EVENTS=y
 #
 # Kernel Performance Events And Counters
 #
-# CONFIG_PERF_EVENTS is not set
+CONFIG_PERF_EVENTS=y
 # CONFIG_PERF_COUNTERS is not set
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_PCI_QUIRKS is not set
@@ -134,6 +136,8 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 
 #
 # GCOV-based kernel profiling
@@ -158,14 +162,41 @@ CONFIG_BLOCK=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
 CONFIG_DEFAULT_NOOP=y
 CONFIG_DEFAULT_IOSCHED="noop"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
 # CONFIG_FREEZER is not set
 
 #
@@ -208,8 +239,7 @@ CONFIG_MGEODE_LX=y
 # CONFIG_GENERIC_CPU is not set
 # CONFIG_X86_GENERIC is not set
 CONFIG_X86_CPU=y
-CONFIG_X86_L1_CACHE_BYTES=64
-CONFIG_X86_INTERNODE_CACHE_BYTES=64
+CONFIG_X86_INTERNODE_CACHE_SHIFT=5
 CONFIG_X86_CMPXCHG=y
 CONFIG_X86_L1_CACHE_SHIFT=5
 CONFIG_X86_XADD=y
@@ -220,8 +250,8 @@ CONFIG_X86_POPAD_OK=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_USE_3DNOW=y
 CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
 CONFIG_X86_DEBUGCTLMSR=y
 CONFIG_PROCESSOR_SELECT=y
 # CONFIG_CPU_SUP_INTEL is not set
@@ -248,7 +278,6 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_MICROCODE is not set
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
-# CONFIG_X86_CPU_DEBUG is not set
 CONFIG_NOHIGHMEM=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
@@ -263,6 +292,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -276,8 +306,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -337,7 +365,6 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_ISA is not set
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
-CONFIG_GEODE_MFGPT_TIMER=y
 # CONFIG_OLPC is not set
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
@@ -417,9 +444,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_AF_RXRPC is not set
 CONFIG_WIRELESS=y
 # CONFIG_CFG80211 is not set
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
-# CONFIG_WIRELESS_OLD_REGULATORY is not set
-# CONFIG_WIRELESS_EXT is not set
 # CONFIG_LIB80211 is not set
 
 #
@@ -454,6 +478,10 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_RAM is not set
@@ -552,15 +580,16 @@ CONFIG_PATA_AMD=y
 # CONFIG_PATA_NS87415 is not set
 # CONFIG_PATA_OPTI is not set
 # CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_RADISYS is not set
 # CONFIG_PATA_RDC is not set
 # CONFIG_PATA_RZ1000 is not set
 # CONFIG_PATA_SC1200 is not set
 # CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_PDC2027X is not set
 # CONFIG_PATA_SIL680 is not set
 # CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
 # CONFIG_PATA_PLATFORM is not set
@@ -577,7 +606,7 @@ CONFIG_PATA_AMD=y
 #
 
 #
-# See the help texts for more information.
+# The newer stack is recommended.
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
@@ -657,8 +686,10 @@ CONFIG_VIA_RHINE_MMIO=y
 # CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
 CONFIG_WLAN=y
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
+# CONFIG_AIRO is not set
+# CONFIG_ATMEL is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_HOSTAP is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -751,6 +782,7 @@ CONFIG_GPIO_SYSFS=y
 #
 # PCI GPIO expanders:
 #
+# CONFIG_GPIO_CS5535 is not set
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_LANGWELL is not set
 
@@ -776,7 +808,6 @@ CONFIG_WATCHDOG=y
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_ALIM1535_WDT is not set
 # CONFIG_ALIM7101_WDT is not set
-CONFIG_GEODE_WDT=y
 # CONFIG_SC520_WDT is not set
 # CONFIG_SBC_FITPC2_WATCHDOG is not set
 # CONFIG_EUROTECH_WDT is not set
@@ -873,6 +904,7 @@ CONFIG_LEDS_CLASS=y
 #
 CONFIG_LEDS_ALIX2=y
 # CONFIG_LEDS_GPIO is not set
+# CONFIG_LEDS_LT3593 is not set
 
 #
 # LED Triggers
@@ -912,7 +944,9 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_M48T35 is not set
 # CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
 # CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
@@ -1059,7 +1093,6 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 # CONFIG_FRAME_POINTER is not set
@@ -1105,7 +1138,11 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
 CONFIG_CRYPTO=y
 
 #
diff --git a/target/alix2d/target.mk b/target/alix2d/target.mk
index 9f958a84b..d5ee60a53 100644
--- a/target/alix2d/target.mk
+++ b/target/alix2d/target.mk
@@ -1,7 +1,7 @@
 ARCH:=			x86
 CPU_ARCH:=		i586
-KERNEL_VERSION:=	2.6.32
+KERNEL_VERSION:=	2.6.33
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		260551284ac224c3a43c4adac7df4879
+KERNEL_MD5SUM:=		c3883760b18d50e8d78819c54d579b00
 TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=	-march=geode
diff --git a/target/alix2d13/target.mk b/target/alix2d13/target.mk
index 9f958a84b..d5ee60a53 100644
--- a/target/alix2d13/target.mk
+++ b/target/alix2d13/target.mk
@@ -1,7 +1,7 @@
 ARCH:=			x86
 CPU_ARCH:=		i586
-KERNEL_VERSION:=	2.6.32
+KERNEL_VERSION:=	2.6.33
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		260551284ac224c3a43c4adac7df4879
+KERNEL_MD5SUM:=		c3883760b18d50e8d78819c54d579b00
 TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=	-march=geode
diff --git a/target/wrap/kernel.config b/target/wrap/kernel.config
index 50f0a6b6e..0cdebff81 100644
--- a/target/wrap/kernel.config
+++ b/target/wrap/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32
-# Wed Jan  6 19:38:11 2010
+# Linux kernel version: 2.6.33
+# Sat Feb 27 12:12:13 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -20,7 +20,6 @@ CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
@@ -61,9 +60,11 @@ CONFIG_LOCALVERSION=""
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -78,6 +79,7 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 #
 CONFIG_TREE_RCU=y
 # CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@@ -98,9 +100,9 @@ CONFIG_EMBEDDED=y
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
 # CONFIG_KALLSYMS is not set
-# CONFIG_HOTPLUG is not set
+CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
-CONFIG_BUG=y
+# CONFIG_BUG is not set
 # CONFIG_ELF_CORE is not set
 # CONFIG_PCSPKR_PLATFORM is not set
 # CONFIG_BASE_FULL is not set
@@ -115,6 +117,7 @@ CONFIG_SHMEM=y
 #
 # Kernel Performance Events And Counters
 #
+CONFIG_PERF_EVENTS=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_PCI_QUIRKS is not set
 # CONFIG_COMPAT_BRK is not set
@@ -130,6 +133,8 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 
 #
 # GCOV-based kernel profiling
@@ -142,7 +147,7 @@ CONFIG_BASE_SMALL=1
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_BLOCK=y
@@ -154,14 +159,41 @@ CONFIG_BLOCK=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
 CONFIG_DEFAULT_NOOP=y
 CONFIG_DEFAULT_IOSCHED="noop"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
 # CONFIG_FREEZER is not set
 
 #
@@ -203,10 +235,9 @@ CONFIG_M486=y
 # CONFIG_GENERIC_CPU is not set
 CONFIG_X86_GENERIC=y
 CONFIG_X86_CPU=y
-CONFIG_X86_L1_CACHE_BYTES=64
-CONFIG_X86_INTERNODE_CACHE_BYTES=64
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=4
+CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
 # CONFIG_X86_PPRO_FENCE is not set
 CONFIG_X86_F00F_BUG=y
@@ -241,7 +272,6 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_MICROCODE is not set
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
-# CONFIG_X86_CPU_DEBUG is not set
 CONFIG_NOHIGHMEM=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
@@ -256,6 +286,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -269,8 +300,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -330,6 +359,8 @@ CONFIG_ISA_DMA_API=y
 CONFIG_SCx200=y
 # CONFIG_SCx200HR_TIMER is not set
 # CONFIG_OLPC is not set
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
 
 #
 # Executable file formats / Emulations
@@ -350,13 +381,8 @@ CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_MULTIPLE_TABLES is not set
-# CONFIG_IP_ROUTE_MULTIPATH is not set
-# CONFIG_IP_ROUTE_VERBOSE is not set
 # CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
@@ -409,7 +435,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
-# CONFIG_WIRELESS is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+# CONFIG_LIB80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
@@ -421,8 +453,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 #
 # Generic Driver Options
 #
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
+# CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CONNECTOR is not set
 # CONFIG_MTD is not set
@@ -435,6 +471,10 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_LOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_RAM is not set
@@ -533,15 +573,16 @@ CONFIG_ATA_SFF=y
 # CONFIG_PATA_NS87415 is not set
 # CONFIG_PATA_OPTI is not set
 # CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_RADISYS is not set
 # CONFIG_PATA_RDC is not set
 # CONFIG_PATA_RZ1000 is not set
 CONFIG_PATA_SC1200=y
 # CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_PDC2027X is not set
 # CONFIG_PATA_SIL680 is not set
 # CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
 # CONFIG_PATA_VIA is not set
 # CONFIG_PATA_WINBOND is not set
 # CONFIG_PATA_PLATFORM is not set
@@ -558,7 +599,7 @@ CONFIG_PATA_SC1200=y
 #
 
 #
-# See the help texts for more information.
+# The newer stack is recommended.
 #
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
@@ -637,8 +678,10 @@ CONFIG_NATSEMI=y
 # CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
 CONFIG_WLAN=y
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
+# CONFIG_AIRO is not set
+# CONFIG_ATMEL is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_HOSTAP is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -659,27 +702,7 @@ CONFIG_WLAN=y
 #
 # Input device support
 #
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
+# CONFIG_INPUT is not set
 
 #
 # Hardware I/O ports
@@ -722,7 +745,6 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_GEN_RTC is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
-# CONFIG_SONYPI is not set
 # CONFIG_MWAVE is not set
 CONFIG_SCx200_GPIO=y
 # CONFIG_PC8736x_GPIO is not set
@@ -746,7 +768,50 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_SC520_WDT is not set
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_IBMASR is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_ITCO_WDT is not set
+# CONFIG_IT8712F_WDT is not set
+# CONFIG_IT87_WDT is not set
+# CONFIG_HP_WATCHDOG is not set
+CONFIG_SC1200_WDT=y
+CONFIG_SCx200_WDT=y
+# CONFIG_PC87413_WDT is not set
+# CONFIG_60XX_WDT is not set
+# CONFIG_SBC8360_WDT is not set
+# CONFIG_SBC7240_WDT is not set
+# CONFIG_CPU5_WDT is not set
+# CONFIG_SMSC_SCH311X_WDT is not set
+# CONFIG_SMSC37B787_WDT is not set
+# CONFIG_W83627HF_WDT is not set
+# CONFIG_W83697HF_WDT is not set
+# CONFIG_W83697UG_WDT is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
 CONFIG_SSB_POSSIBLE=y
 
 #
@@ -841,9 +906,6 @@ CONFIG_FB_GEODE_LX=y
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_LOGO is not set
 # CONFIG_SOUND is not set
-CONFIG_HID_SUPPORT=y
-# CONFIG_HID is not set
-# CONFIG_HID_PID is not set
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_UWB is not set
 # CONFIG_MMC is not set
@@ -889,10 +951,10 @@ CONFIG_EXT2_FS=y
 # CONFIG_NILFS2_FS is not set
 # CONFIG_AUFS_FS is not set
 CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
+# CONFIG_FSNOTIFY is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY is not set
-CONFIG_INOTIFY_USER=y
+# CONFIG_INOTIFY_USER is not set
 # CONFIG_QUOTA is not set
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
@@ -994,7 +1056,6 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 # CONFIG_FRAME_POINTER is not set
@@ -1040,7 +1101,11 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
 CONFIG_CRYPTO=y
 
 #
diff --git a/target/wrap/target.mk b/target/wrap/target.mk
index 6fc2fcb45..372c3cfe3 100644
--- a/target/wrap/target.mk
+++ b/target/wrap/target.mk
@@ -1,7 +1,7 @@
 ARCH:=			x86
 CPU_ARCH:=		i486
-KERNEL_VERSION:=	2.6.32
+KERNEL_VERSION:=	2.6.33
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		260551284ac224c3a43c4adac7df4879
+KERNEL_MD5SUM:=		c3883760b18d50e8d78819c54d579b00
 TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=	-march=i486
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 53ddb5dde..d76d98125 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -2,8 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 include $(TOPDIR)/rules.mk
-include ../rules.mk
 include Makefile.inc
+include ../rules.mk
 include ${TOPDIR}/mk/buildhlp.mk
 
 ifeq ($(ADK_LINUX_64),y)
diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc
index 44a240ee9..0dba0457c 100644
--- a/toolchain/eglibc/Makefile.inc
+++ b/toolchain/eglibc/Makefile.inc
@@ -4,5 +4,5 @@
 PKG_NAME:=		eglibc
 PKG_VERSION:=		2.11.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1b5d08c87de09018dcabd9974ba754d4
+PKG_MD5SUM:=		393cfbba56898bf7d5d5444fe3313cb4
 PKG_SITES:=		http://openadk.org/distfiles/
diff --git a/toolchain/glibc-ports/Makefile.inc b/toolchain/glibc-ports/Makefile.inc
index 20e50b577..42e68663f 100644
--- a/toolchain/glibc-ports/Makefile.inc
+++ b/toolchain/glibc-ports/Makefile.inc
@@ -4,5 +4,5 @@
 PKG_NAME:=		glibc-ports
 PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		55d50abb2d7c366bde6fb5e35e681f9b
+PKG_MD5SUM:=		7100d8ba81c52e90e7fb4795d2f736c9
 PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index 23659af5d..0a7530565 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -4,5 +4,5 @@
 PKG_NAME:=		glibc
 PKG_VERSION:=		2.11.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		55d50abb2d7c366bde6fb5e35e681f9b
+PKG_MD5SUM:=		cf60820c052b14a9c5a7816fc7dc0161
 PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile
index 1a6a77d26..5b359b8cf 100644
--- a/toolchain/gmp/Makefile
+++ b/toolchain/gmp/Makefile
@@ -2,8 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 include $(TOPDIR)/rules.mk
-include ../rules.mk
 include Makefile.inc
+include ../rules.mk
 include ${TOPDIR}/mk/buildhlp.mk
 
 ifeq (${ADK_MAKE_PARALLEL},y)
diff --git a/toolchain/gmp/Makefile.inc b/toolchain/gmp/Makefile.inc
index bda03ddcd..29d2e2a68 100644
--- a/toolchain/gmp/Makefile.inc
+++ b/toolchain/gmp/Makefile.inc
@@ -4,7 +4,7 @@
 PKG_NAME:=		gmp
 PKG_VERSION:=		4.3.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		26cec15a90885042dd4a15c4003b08ae
+PKG_MD5SUM:=		dd60683d7057917e34630b4a787932e8
 PKG_SITES:=		${MASTER_SITE_GNU:=gmp/}
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-GMP_BUILD_DIR:=		$(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+GMP_BUILD_DIR:=		$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)
diff --git a/toolchain/mpfr/Makefile.inc b/toolchain/mpfr/Makefile.inc
index 8ed6a2b34..6f4ed40ef 100644
--- a/toolchain/mpfr/Makefile.inc
+++ b/toolchain/mpfr/Makefile.inc
@@ -4,6 +4,6 @@
 PKG_NAME:=		mpfr
 PKG_VERSION:=		2.4.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c5ee0a8ce82ad55fe29ac57edd35d09e
+PKG_MD5SUM:=		89e59fe665e2b3ad44a6789f40b059a0
 PKG_SITES:=		http://www.mpfr.org/mpfr-current/
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/toolchain/rules.mk b/toolchain/rules.mk
index fa8be6bd3..d2710d053 100644
--- a/toolchain/rules.mk
+++ b/toolchain/rules.mk
@@ -2,4 +2,3 @@
 # material, please see the LICENCE file in the top-level directory.
 
 WRKDIR_BASE=	${TOOLCHAIN_BUILD_DIR}
-WRKDIR=		${WRKDIR_BASE}
diff --git a/toolchain/uClibc/Makefile.inc b/toolchain/uClibc/Makefile.inc
index cc215bd1c..1ffcde868 100644
--- a/toolchain/uClibc/Makefile.inc
+++ b/toolchain/uClibc/Makefile.inc
@@ -4,6 +4,6 @@
 PKG_NAME:=		uClibc
 PKG_VERSION:=		0.9.30.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1a4b84e5536ad8170563ffa88c34679c
+PKG_MD5SUM:=		e759ec855500082ac3e671dd6cacfdb0
 PKG_SITES:=		http://uclibc.org/downloads/
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-- 
cgit v1.2.3


From b69850c9d6fd24109618ea070b8f471a263d9e39 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 24 Mar 2010 19:11:51 +0100
Subject: fix glibc build on CygWin

---
 toolchain/glibc/Makefile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'toolchain/glibc')

diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index a0e4ce11e..228f64438 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -10,20 +10,19 @@ include ${TOPDIR}/mk/buildhlp.mk
 # glibc does not compile with Os
 TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS))
 
-GLIBC_CONFOPTS:=          \
+GLIBC_CONFOPTS:=        \
 			--build=$(GNU_HOST_NAME) \
 			--host=$(REAL_GNU_TARGET_NAME) \
 			--with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \
 			--disable-nls \
 			--disable-sanity-checks \
-			--disable-nls \
 			--without-cvs \
 			--disable-profile \
 			--disable-debug \
+			--enable-kernel="2.6.0" \
 			--without-gd \
 			--with-__thread \
 			--with-tls \
-			--enable-kernel="2.6.0" \
 			--enable-add-ons
 
 GLIBC_ENV:=		PATH='${TARGET_PATH}' \
@@ -33,7 +32,6 @@ GLIBC_ENV:=		PATH='${TARGET_PATH}' \
 			CXX=${REAL_GNU_TARGET_NAME}-g++ \
 			AR=${REAL_GNU_TARGET_NAME}-ar \
 			RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \
-			LD=${REAL_GNU_TARGET_NAME}-ld \
 			libc_cv_forced_unwind=yes \
 			libc_cv_c_cleanup=yes \
 			libc_cv_gnu99_inline=yes \
@@ -51,19 +49,20 @@ GLIBC_BUILD_DIR_INITIAL:=	${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers
 GLIBC_BUILD_DIR_FINAL:=		${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final
 
 $(WRKBUILD)/.headers_configure:
-	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); ln -sf ../glibc-ports-2.11/ ports);
 	mkdir -p $(GLIBC_BUILD_DIR_INITIAL)
+	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); ln -sf ../glibc-ports-2.11/ ports);
 	(cd $(GLIBC_BUILD_DIR_INITIAL); \
+		${GLIBC_ENV} \
 		$(WRKBUILD)/configure \
-		--prefix=/usr \
-		--with-sysroot=$(TOOLCHAIN_SYSROOT) \
-		${GLIBC_CONFOPTS} \
+			--prefix=/usr \
+			--with-sysroot=$(TOOLCHAIN_SYSROOT) \
+			${GLIBC_CONFOPTS} \
 	);
 	touch $@
 
 $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 	mkdir -p $(TOOLCHAIN_SYSROOT)/usr/lib
-	-$(MAKE) ${GLIBC_MAKEOPTS} -C $(GLIBC_BUILD_DIR_INITIAL) \
+	-${GLIBC_ENV} $(MAKE) ${GLIBC_MAKEOPTS} -C $(GLIBC_BUILD_DIR_INITIAL) \
 		cross-compiling=yes \
 		install_root=$(TOOLCHAIN_SYSROOT) \
 		install-headers
-- 
cgit v1.2.3


From 97a34b0a9a6239b14758009472d500d56955821f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 25 Mar 2010 19:16:07 +0100
Subject: enable glibc build for rb532

---
 target/Config.in         | 1 +
 toolchain/glibc/Makefile | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'toolchain/glibc')

diff --git a/target/Config.in b/target/Config.in
index 1aa5826c2..6ad3feb74 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -785,6 +785,7 @@ config ADK_TARGET_LIB_GLIBC
 		ADK_LINUX_X86_ALIX2D || \
 		ADK_LINUX_X86_ALIX2D13 || \
 		ADK_LINUX_X86_WRAP || \
+		ADK_LINUX_MIPS_RB532 || \
 		ADK_LINUX_RESCUE || \
 		ADK_LINUX_X86_64_SHUTTLE || \
 		ADK_LINUX_TOOLCHAIN 
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 228f64438..bfd56f9fe 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -50,7 +50,8 @@ GLIBC_BUILD_DIR_FINAL:=		${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final
 
 $(WRKBUILD)/.headers_configure:
 	mkdir -p $(GLIBC_BUILD_DIR_INITIAL)
-	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); ln -sf ../glibc-ports-2.11/ ports);
+	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \
+	ln -sf ../../w-glibc-ports-2.11-1/glibc-ports-2.11/ ports);
 	(cd $(GLIBC_BUILD_DIR_INITIAL); \
 		${GLIBC_ENV} \
 		$(WRKBUILD)/configure \
-- 
cgit v1.2.3