[toolchain/gcc]: bump the 4.4 flavour to 4.4.6

[openwrt.git] / toolchain / eglibc / Makefile

diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index f333f9d..07ad22e 100644 (file)
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -36,6 +36,9 @@ endif
 ifneq ($(CONFIG_EGLIBC_VERSION_2_12),)
   PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_12
 endif
 ifneq ($(CONFIG_EGLIBC_VERSION_2_12),)
   PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_12
 endif

+ifneq ($(CONFIG_EGLIBC_VERSION_2_13),)
+  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_13
+endif

 ifneq ($(CONFIG_EGLIBC_VERSION_TRUNK),)
   PKG_SOURCE_URL:=svn://svn.eglibc.org/trunk
 endif
 ifneq ($(CONFIG_EGLIBC_VERSION_TRUNK),)
   PKG_SOURCE_URL:=svn://svn.eglibc.org/trunk
 endif


@@ -52,15 +55,15 @@ HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.eglibc_installed
 HOST_BUILD_DIR1:=$(HOST_BUILD_DIR)-initial
 HOST_BUILD_DIR2:=$(HOST_BUILD_DIR)-final
 
 HOST_BUILD_DIR1:=$(HOST_BUILD_DIR)-initial
 HOST_BUILD_DIR2:=$(HOST_BUILD_DIR)-final
 

-# XXX: {e,}glibc does not build w/ -Os
-# http://sourceware.org/bugzilla/show_bug.cgi?id=5203
-EGLIBC_CFLAGS:=$(subst -Os,-O2,$(TARGET_CFLAGS))
+EGLIBC_CFLAGS:= \
+       $(TARGET_CFLAGS)

 
 EGLIBC_CONFIGURE:= \
        BUILD_CC="$(HOSTCC)" \
        $(TARGET_CONFIGURE_OPTS) \
        CFLAGS="$(EGLIBC_CFLAGS)" \
        libc_cv_slibdir="/lib" \
 
 EGLIBC_CONFIGURE:= \
        BUILD_CC="$(HOSTCC)" \
        $(TARGET_CONFIGURE_OPTS) \
        CFLAGS="$(EGLIBC_CFLAGS)" \
        libc_cv_slibdir="/lib" \

+       use_ldconfig=no \

        $(HOST_BUILD_DIR)/libc/configure \
                --prefix= \
                --build=$(GNU_HOST_NAME) \
        $(HOST_BUILD_DIR)/libc/configure \
                --prefix= \
                --build=$(GNU_HOST_NAME) \


@@ -82,6 +85,7 @@ endif
 EGLIBC_MAKE:= \
        $(MAKE) \
 
 EGLIBC_MAKE:= \
        $(MAKE) \
 

+export libc_cv_ssp=no

 
 define Host/SetToolchainInfo
        $(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
 
 define Host/SetToolchainInfo
        $(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk