[package] iptables: remove CHAOS and TARPIT patches

[openwrt.git] / toolchain / gcc / Makefile

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 9a364eb..039643d 100644 (file)
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -41,6 +41,9 @@ endif
 ifeq ($(PKG_VERSION),4.3.2)
   PKG_MD5SUM:=5dfac5da961ecd5f227c3175859a486d
 endif
 ifeq ($(PKG_VERSION),4.3.2)
   PKG_MD5SUM:=5dfac5da961ecd5f227c3175859a486d
 endif

+ifeq ($(PKG_VERSION),4.3.3)
+  PKG_MD5SUM:=cc3c5565fdb9ab87a05ddb106ba0bd1f
+endif

 
 PATCH_DIR=./patches/$(PKG_VERSION)
 
 
 PATCH_DIR=./patches/$(PKG_VERSION)
 


@@ -60,7 +63,7 @@ PKG_BUILD_DIR2:=$(PKG_BUILD_DIR)-final
 SEP:=,
 TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)"
 
 SEP:=,
 TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)"
 

-GCC_CONFIGURE_COMMON:= \
+GCC_CONFIGURE:= \

        SHELL="$(BASH)" \
        $(PKG_BUILD_DIR)/configure \
                --prefix=$(TOOLCHAIN_DIR)/usr \
        SHELL="$(BASH)" \
        $(PKG_BUILD_DIR)/configure \
                --prefix=$(TOOLCHAIN_DIR)/usr \


@@ -77,37 +80,37 @@ GCC_CONFIGURE_COMMON:= \
                $(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
 
 ifneq ($(CONFIG_GCC_VERSION_4_3),)
                $(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
 
 ifneq ($(CONFIG_GCC_VERSION_4_3),)

-       GCC_BUILD_TARGET_LIBGCC:=y
-       GCC_CONFIGURE_COMMON+= \
+  GCC_BUILD_TARGET_LIBGCC:=y
+  GCC_CONFIGURE+= \

                --with-gmp=$(TOPDIR)/staging_dir/host \
                --with-mpfr=$(TOPDIR)/staging_dir/host \
                --disable-decimal-float
 endif
 
 ifneq ($(CONFIG_SSP_SUPPORT),)
                --with-gmp=$(TOPDIR)/staging_dir/host \
                --with-mpfr=$(TOPDIR)/staging_dir/host \
                --disable-decimal-float
 endif
 
 ifneq ($(CONFIG_SSP_SUPPORT),)

-       GCC_CONFIGURE_COMMON+= \
+  GCC_CONFIGURE+= \

                --enable-libssp
 else
                --enable-libssp
 else

-       GCC_CONFIGURE_COMMON+= \
+  GCC_CONFIGURE+= \

                --disable-libssp
 endif
 
 ifneq ($(CONFIG_EXTRA_TARGET_ARCH),)
                --disable-libssp
 endif
 
 ifneq ($(CONFIG_EXTRA_TARGET_ARCH),)

-       GCC_CONFIGURE_COMMON+= \
+  GCC_CONFIGURE+= \

                --enable-biarch \
                --enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-$(TARGET_SUFFIX)
 endif
 
 ifeq ($(LIBC),uClibc)
                --enable-biarch \
                --enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-$(TARGET_SUFFIX)
 endif
 
 ifeq ($(LIBC),uClibc)

-       GCC_CONFIGURE_COMMON+= \
+  GCC_CONFIGURE+= \

                --disable-__cxa_atexit
 else
                --disable-__cxa_atexit
 else

-       GCC_CONFIGURE_COMMON+= \
+  GCC_CONFIGURE+= \

                --enable-__cxa_atexit
 endif
 
 GCC_CONFIGURE_STAGE0:= \
                --enable-__cxa_atexit
 endif
 
 GCC_CONFIGURE_STAGE0:= \

-       $(GCC_CONFIGURE_COMMON) \
+       $(GCC_CONFIGURE) \

                --with-newlib \
                --without-headers \
                --enable-languages=c \
                --with-newlib \
                --without-headers \
                --enable-languages=c \


@@ -116,7 +119,7 @@ GCC_CONFIGURE_STAGE0:= \
                --disable-threads \
 
 GCC_CONFIGURE_STAGE1:= \
                --disable-threads \
 
 GCC_CONFIGURE_STAGE1:= \

-       $(GCC_CONFIGURE_COMMON) \
+       $(GCC_CONFIGURE) \

                --with-newlib \
                --with-sysroot=$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev \
                --enable-languages=c \
                --with-newlib \
                --with-sysroot=$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev \
                --enable-languages=c \


@@ -124,7 +127,7 @@ GCC_CONFIGURE_STAGE1:= \
                --disable-threads \
 
 GCC_CONFIGURE_STAGE2:= \
                --disable-threads \
 
 GCC_CONFIGURE_STAGE2:= \

-       $(GCC_CONFIGURE_COMMON) \
+       $(GCC_CONFIGURE) \

                --enable-languages=$(TARGET_LANGUAGES) \
                --enable-shared \
                --enable-threads \
                --enable-languages=$(TARGET_LANGUAGES) \
                --enable-shared \
                --enable-threads \