fix symbol renaming bugs

5 files changed, 5 insertions, 59 deletions

diff --git a/toolchain/Config.in b/toolchain/Config.in
deleted file mode 100644
index f80c44841..000000000
--- a/toolchain/Config.in
+++ /dev/null
@@ -1,54 +0,0 @@
-menu "Toolchain settings"
-
-config ADK_TOOLCHAIN_GDB
-	prompt "Enable building of the GNU debugger"
-	boolean
-	default y
-
-config ADK_TOOLCHAIN_GCC_CXX
-	prompt "Enable building of G++ (C++ language support in GCC)"
-	boolean
-	default y
-
-config ADK_TOOLCHAIN_SSP
-	prompt "Enable Stack Smashing Protection"
-	boolean
-	default y
-
-config ADK_TOOLCHAIN_USE_SSP
-	prompt "Use SSP for all packages"
- 	boolean	
-	depends on ADK_TOOLCHAIN_SSP
-	default n
-
-config ADK_TOOLCHAIN_LTO
-	prompt "Enable Link Time Optimization"
-	boolean
-	default y
-
-config ADK_TOOLCHAIN_USE_LTO
-	prompt "Use Link Time Optimization for all packages"
-	boolean
-	depends on ADK_TOOLCHAIN_LTO
-	default n
-
-config ADK_TOOLCHAIN_GOLD
-	prompt "Enable GOLD as linker"
-	boolean
-	depends on !ADK_LINUX_MIPS
-	default n
-
-config ADK_TOOLCHAIN_USE_GOLD
-	prompt "Use GOLD as linker for all packages"
-	boolean
-	depends on ADK_TOOLCHAIN_GOLD
-	default n
-
-config ADK_LINUX_ARM_WITH_THUMB
-	prompt "Use THUMB2 ARM mode"
-	boolean
-	depends on ADK_CPU_CORTEX_A9 && ADK_TARGET_LIB_GLIBC
-	select ADK_KERNEL_THUMB2_KERNEL
-	default n
-
-endmenu
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index d90f4fe3a..1268fa216 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -222,7 +222,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 		done;
 	(cd $(TOOLCHAIN_DIR)/usr/bin && \
 		ln -sf $(GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc-${PKG_VERSION})
-ifeq ($(ADK_TOOLCHAIN_USE_GOLD),y)
+ifeq ($(ADK_TARGET_USE_GOLD),y)
 	(cd $(TOOLCHAIN_DIR)/usr/bin && \
 		ln -sf $(GNU_TARGET_NAME)-ld.gold $(GNU_TARGET_NAME)-ld)
 else
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 44f73c1ff..0910bc72d 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -71,7 +71,7 @@ $(WRKBUILD)/.fixup:
 	-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete
 	rm -rf $(STAGING_TARGET_DIR)/usr/share/locale $(STAGING_TARGET_DIR)/usr/share/i18n
 	rm -rf $(STAGING_TARGET_DIR)/usr/lib/gconv
-ifeq ($(ADK_TOOLCHAIN),y)
+ifeq ($(ADK_TARGET_TOOLCHAIN),y)
 	# strip target libs and host tools for toolchain builds
 	PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh \
 		$(STAGING_TARGET_DIR) $(TOOLCHAIN_DIR)/usr/lib/gcc/$(GNU_TARGET_NAME)
diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile
index 7b0eeb104..b49b793f2 100644
--- a/toolchain/musl/Makefile
+++ b/toolchain/musl/Makefile
@@ -50,7 +50,7 @@ $(WRKBUILD)/.fixup:
 	$(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' DESTDIR=$(STAGING_TARGET_DIR) install
 	# cleanup toolchain
 	-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete
-ifeq ($(ADK_TOOLCHAIN),y)
+ifeq ($(ADK_TARGET_TOOLCHAIN),y)
 	# strip target libs and host tools for toolchain builds
 	PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh \
 		$(STAGING_TARGET_DIR) $(TOOLCHAIN_DIR)/usr/lib/gcc/$(GNU_TARGET_NAME)
diff --git a/toolchain/uclibc/Makefile b/toolchain/uclibc/Makefile
index 94a81391d..90399ae39 100644
--- a/toolchain/uclibc/Makefile
+++ b/toolchain/uclibc/Makefile
@@ -57,7 +57,7 @@ endif
 ifeq ($(ADK_LINUX_ARM_WITH_THUMB),y)
 	$(SED) 's/.*\(COMPILE_IN_THUMB_MODE\).*/\1=y/' ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
+ifeq ($(ADK_TARGET_USE_SSP),y)
 	$(SED) 's,.*UCLIBC_HAS_SSP,UCLIBC_HAS_SSP=y,' ${WRKBUILD}/.config
 	echo "UCLIBC_HAS_SSP_COMPAT=n" >> ${WRKBUILD}/.config
 	echo "SSP_QUICK_CANARY=n" >> ${WRKBUILD}/.config
@@ -118,7 +118,7 @@ endif
 		all install_runtime
 	# cleanup toolchain
 	-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete
-ifeq ($(ADK_TOOLCHAIN),y)
+ifeq ($(ADK_TARGET_TOOLCHAIN),y)
 	# strip target libs and host tools for toolchain builds
 	PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh \
 		$(STAGING_TARGET_DIR) $(TOOLCHAIN_DIR)/usr/lib/gcc/$(GNU_TARGET_NAME)