Author: nbd Date: 2015-11-10 22:10:53 +0100 (Tue, 10 Nov 2015) New Revision: 47443
Removed: trunk/toolchain/gcc/patches/4.6-linaro/ Modified: trunk/package/libs/toolchain/Makefile trunk/rules.mk trunk/toolchain/Config.in trunk/toolchain/gcc/Config.in trunk/toolchain/gcc/Config.version Log: gcc: remove version 4.6, it is no longer needed Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/libs/toolchain/Makefile =================================================================== --- trunk/package/libs/toolchain/Makefile 2015-11-10 21:10:45 UTC (rev 47442) +++ trunk/package/libs/toolchain/Makefile 2015-11-10 21:10:53 UTC (rev 47443) @@ -402,7 +402,7 @@ define Package/libatomic/install $(INSTALL_DIR) $(1)/lib - $(if $(CONFIG_GCC_VERSION_4_6),,$(CP) $(TOOLCHAIN_DIR)/lib/libatomic.so.* $(1)/lib/) + $(CP) $(TOOLCHAIN_DIR)/lib/libatomic.so.* $(1)/lib/ endef define Package/libgfortran/install Modified: trunk/rules.mk =================================================================== --- trunk/rules.mk 2015-11-10 21:10:45 UTC (rev 47442) +++ trunk/rules.mk 2015-11-10 21:10:53 UTC (rev 47443) @@ -201,7 +201,7 @@ HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS) HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib -L$(STAGING_DIR_HOST)/usr/lib -ifeq ($(CONFIG_GCC_VERSION_4_6)$(CONFIG_EXTERNAL_TOOLCHAIN),) +ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) TARGET_AR:=$(TARGET_CROSS)gcc-ar TARGET_RANLIB:=$(TARGET_CROSS)gcc-ranlib TARGET_NM:=$(TARGET_CROSS)gcc-nm Modified: trunk/toolchain/Config.in =================================================================== --- trunk/toolchain/Config.in 2015-11-10 21:10:45 UTC (rev 47442) +++ trunk/toolchain/Config.in 2015-11-10 21:10:53 UTC (rev 47443) @@ -28,7 +28,6 @@ config USE_MIPS16 bool "Build packages with MIPS16 instructions" if TARGET_OPTIONS depends on HAS_MIPS16 - depends on !GCC_VERSION_4_6 default y help If your target CPU does support the MIPS16 instruction set Modified: trunk/toolchain/gcc/Config.in =================================================================== --- trunk/toolchain/gcc/Config.in 2015-11-10 21:10:45 UTC (rev 47442) +++ trunk/toolchain/gcc/Config.in 2015-11-10 21:10:53 UTC (rev 47443) @@ -8,11 +8,6 @@ help Select the version of gcc you wish to use. - config GCC_USE_VERSION_4_6_LINARO - select GCC_VERSION_4_6_LINARO - bool "gcc 4.6.x with Linaro enhancements" - depends on !arc - config GCC_USE_VERSION_4_8_LINARO select GCC_VERSION_4_8_LINARO bool "gcc 4.8.x with Linaro enhancements" Modified: trunk/toolchain/gcc/Config.version =================================================================== --- trunk/toolchain/gcc/Config.version 2015-11-10 21:10:45 UTC (rev 47442) +++ trunk/toolchain/gcc/Config.version 2015-11-10 21:10:53 UTC (rev 47443) @@ -1,7 +1,3 @@ -config GCC_VERSION_4_6_LINARO - default y if (!TOOLCHAINOPTS && TARGET_octeon) - bool - config GCC_VERSION_4_8_LINARO default y if (!TOOLCHAINOPTS && !(TARGET_octeon || arc)) bool @@ -13,15 +9,10 @@ config GCC_VERSION string default "5.2.0" if GCC_VERSION_5 - default "4.6-linaro" if GCC_VERSION_4_6_LINARO default "4.8-linaro" if GCC_VERSION_4_8_LINARO default "arc-2015.06" if GCC_VERSION_4_8_ARC - default "4.6-linaro" + default "4.8-linaro" -config GCC_VERSION_4_6 - bool - default y if GCC_VERSION_4_6_LINARO - config GCC_VERSION_4_8 bool default y if (GCC_VERSION_4_8_LINARO || GCC_VERSION_4_8_ARC) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
