4 files changed, 4 insertions, 10 deletions
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index 7b04ffa23..ec0f4f639 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -33,7 +33,7 @@ EGLIBC_ENV:=		PATH='${TARGET_PATH}' \
 			libc_cv_gnu99_inline=yes \
 			libc_cv_slibdir="/lib" 
 
-ifeq ($(ADK_DEVICE_NO_FPU),y)
+ifeq ($(ADK_TARGET_NO_FPU),y)
 EGLIBC_CONFOPTS+=       --without-fp
 endif
 
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 210c0f68a..f93691cab 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -28,19 +28,13 @@ GCC_CONFOPTS=		--prefix=$(STAGING_TOOLS) \
 			--disable-sjlj-exceptions \
 			--disable-nls 
 
-#ifeq ($(ADK_LINUX_ARM_TOMTOM),y)
-#GCC_CONFOPTS+=		--enable-sjlj-exceptions
-#else
-#GCC_CONFOPTS+=		--disable-sjlj-exceptions
-#endif
-
 ifeq ($(ADK_SSP),y)
 GCC_CONFOPTS+=		--enable-libssp
 else
 GCC_CONFOPTS+=		--disable-libssp
 endif
 
-ifeq ($(ADK_DEVICE_NO_FPU),y)
+ifeq ($(ADK_TARGET_NO_FPU),y)
 GCC_CONFOPTS+=		--with-float=soft
 endif
 
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 36d6f1214..448d41606 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -39,7 +39,7 @@ GLIBC_ENV:=		PATH='${TARGET_PATH}' \
 			libc_cv_gnu99_inline=yes \
 			libc_cv_slibdir="/lib"
 
-ifeq ($(ADK_DEVICE_NO_FPU),y)
+ifeq ($(ADK_TARGET_NO_FPU),y)
 GLIBC_CONFOPTS+=	--without-fp
 endif
 
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 3a9310ad1..d3e2c7e70 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -20,7 +20,7 @@ endif
 $(WRKBUILD)/.headers:
 	$(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak
 	sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${TOOLCHAIN_SYSROOT}/usr/include\"' \
-	    $(TOPDIR)/target/$(DEVICE)/uclibc.config >${WRKBUILD}/.config
+	    $(TOPDIR)/target/$(ADK_TARGET)/uclibc.config >${WRKBUILD}/.config
 ifeq ($(ADK_IPV6),y)
 	$(SED) 's,# UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=y,' \
 		${WRKBUILD}/.config