diff --git a/Makefile b/Makefile
index a5a604f..6442d1d 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,8 @@ KERNEL_PATH=kernel
 TOOLCHAIN_PATH=toolchain
 DL_PATH=$(TOOLCHAIN_PATH)/dl
 INSTALL_PATH=install
-PATCHES_PATH=$(TOOLCHAIN_PATH)/patches
-GLIBC_PATCHES_PATH=$(PATCHES_PATH)/glibc
+PATCHES_PATH=
+GLIBC_PATCHES_PATH=$(TOOLCHAIN_PATH)/patches/glibc
 
 BINUTILS_PACKAGE=$(BINUTILS_VER).tar.bz2
 BINUTILS_URL= \
@@ -105,11 +105,12 @@ glibc: $(DL_PATH)/$(GLIBC_PACKAGE) $(DL_PATH)/$(GLIBC_PORTS_PACKAGE) $(DL_PATH)/
 	patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-cross_hacks-1.patch && \
 	patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-libgcc_eh-1.patch && \
 	patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-localedef_segfault-1.patch && \
-	patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-mawk_fix-1.patch 
-#	patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-alpha_ioperm_fix-1.patch && \
-#	patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch && \
-#	patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-sysdep_cancel-1.patch && \
-#	patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-hppa_nptl-1.patch
+	patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-mawk_fix-1.patch && \
+	patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-alpha_ioperm_fix-1.patch && \
+	patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch && \
+	patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-sysdep_cancel-1.patch && \
+	patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-hppa_nptl-1.patch && \
+	patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-for_gcc-4.3.patch
 	mkdir -p $(TOOLCHAIN_PATH)/$(GLIBC_VER)/build
 	cd $(TOOLCHAIN_PATH)/$(GLIBC_VER)/build && \
 	echo "libc_cv_forced_unwind=yes" > config.cache && \
@@ -124,8 +125,8 @@ glibc: $(DL_PATH)/$(GLIBC_PACKAGE) $(DL_PATH)/$(GLIBC_PORTS_PACKAGE) $(DL_PATH)/
 	--with-headers=$(PWD)/$(TOOLCHAIN_PATH)/$(KERNEL_HEADERS_VER) \
 	--cache-file=config.cache && \
 	make CFLAGS=$(CFLAGS)  && \
-	mkdir -p $(TOOLCHAIN_PATH)/$(GLIBC_VER)/glibc-install && \
-	make install_root=$(TOOLCHAIN_PATH)/$(GLIBC_VER)/glibc-install install
+	mkdir -p $(PWD)$(TOOLCHAIN_PATH)/$(GLIBC_VER)/glibc-install && \
+	make install_root=$(PWD)/$(TOOLCHAIN_PATH)/$(GLIBC_VER)/glibc-install install
 	touch $@
 
 
diff --git a/toolchain/patches/glibc/glibc-2.6.1-for_gcc-4.3.patch b/toolchain/patches/glibc/glibc-2.6.1-for_gcc-4.3.patch
new file mode 100644
index 0000000..43571ec
--- /dev/null
+++ b/toolchain/patches/glibc/glibc-2.6.1-for_gcc-4.3.patch
@@ -0,0 +1,24 @@
+diff -Naur glibc-2.6.1/locale/programs/charmap-kw.h glibc-2.6.1.m/locale/programs/charmap-kw.h
+--- glibc-2.6.1/locale/programs/charmap-kw.h	2005-12-20 15:10:31.000000000 +0800
++++ glibc-2.6.1.m/locale/programs/charmap-kw.h	2009-04-06 14:59:23.000000000 +0800
+@@ -127,7 +127,7 @@
+ #ifdef __GNUC__
+ __inline
+ #endif
+-const struct keyword_t *
++static const struct keyword_t *
+ charmap_hash (register const char *str, register unsigned int len)
+ {
+   static const struct keyword_t wordlist[] =
+diff -Naur glibc-2.6.1/locale/programs/locfile-kw.h glibc-2.6.1.m/locale/programs/locfile-kw.h
+--- glibc-2.6.1/locale/programs/locfile-kw.h	2005-12-20 15:10:31.000000000 +0800
++++ glibc-2.6.1.m/locale/programs/locfile-kw.h	2009-04-06 14:59:47.000000000 +0800
+@@ -127,7 +127,7 @@
+ #ifdef __GNUC__
+ __inline
+ #endif
+-const struct keyword_t *
++static const struct keyword_t *
+ locfile_hash (register const char *str, register unsigned int len)
+ {
+   static const struct keyword_t wordlist[] =