ath9k: fold patches that were merged upstream into 300-pending_work.patch

[openwrt.git] / toolchain / gcc / final / Makefile

diff --git a/toolchain/gcc/final/Makefile b/toolchain/gcc/final/Makefile
index 1decc95..dc884ab 100644 (file)
--- a/toolchain/gcc/final/Makefile
+++ b/toolchain/gcc/final/Makefile
@@ -8,7 +8,7 @@ GCC_CONFIGURE += \
        --enable-threads \
        --with-slibdir=$(TOOLCHAIN_DIR)/lib
 
        --enable-threads \
        --with-slibdir=$(TOOLCHAIN_DIR)/lib
 

-ifneq ($(CONFIG_GCC_VERSION_4_5),)
+ifneq ($(CONFIG_GCC_VERSION_4_5)$(CONFIG_GCC_VERSION_4_6),)

   GCC_CONFIGURE += \
        --enable-lto \
        --with-libelf=$(TOPDIR)/staging_dir/host
   GCC_CONFIGURE += \
        --enable-lto \
        --with-libelf=$(TOPDIR)/staging_dir/host


@@ -22,6 +22,11 @@ else
        --disable-tls
 endif
 
        --disable-tls
 endif
 

+ifneq ($(CONFIG_SJLJ_EXCEPTIONS),)
+  GCC_CONFIGURE += \
+       --enable-sjlj-exceptions
+endif
+

 define Host/Configure
        mkdir -p $(GCC_BUILD_DIR) $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)
        # Important!  Required for limits.h to be fixed.
 define Host/Configure
        mkdir -p $(GCC_BUILD_DIR) $(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)
        # Important!  Required for limits.h to be fixed.