From f97dbcf294210864262595e1c8d55f5ceecb4d5d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 18 Jun 2009 16:47:51 +0200
Subject: fix broken uClibc

- after upgrade to gcc 4.4 ld.so in uClibc was broken
- add gcc attribute always_inline for ld.so static functions
- -Os does not automatically inline the code, use O2 especially
 for mips and uClibc compile
---
 toolchain/uClibc/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'toolchain/uClibc/Makefile')

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 23b1afa2f..69b5d343a 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -8,6 +8,11 @@ include ../rules.mk
 include Makefile.inc
 include ${TOPDIR}/mk/buildhlp.mk
 
+#workaround for mips and gcc 4.4, where -Os does not inline code in ld.so
+ifeq ($(ARCH),mips)
+TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS))
+endif
+
 $(WRKBUILD)/.headers:
 	$(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak
 	sed -e 's
^KERNEL_HEADERS.*$$
KERNEL_HEADERS=\"${TOOLCHAIN_SYSROOT}/usr/include\"
' \
@@ -64,7 +69,6 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.install_headers
 		RUNTIME_PREFIX=/ \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		install_runtime
-	echo $(PKG_VERSION) >$(STAGING_DIR)/uclibc_version
 	rm -rf $(STAGING_DIR)/lib/libc.so
 	ln -s libc.so.0 $(STAGING_DIR)/lib/libc.so
 	touch $@
-- 
cgit v1.2.3