diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 8c34302ce9e..560f6f66e30 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-25  Venkataramanan Kumar  <venkataramanan.kumar@linaro.org>
+
+	* configure.ac (TSAN_TARGET_DEPENDENT_OBJECTS): Undefine. 
+	* configure: Regenerate.
+	* configure.tgt (TSAN_TARGET_DEPENDENT_OBJECTS): Define.  
+
 2015-01-25  Venkataramanan Kumar  <venkataramanan.kumar@linaro.org>
 
 	* configure.ac (TSAN_TARGET_DEPENDENT_OBJECTS): Define.
diff --git a/libsanitizer/configure b/libsanitizer/configure
index 4a90acfe85b..a2a96b76a3f 100755
--- a/libsanitizer/configure
+++ b/libsanitizer/configure
@@ -16363,10 +16363,6 @@ if test "x$TSAN_SUPPORTED" = "xyes"; then
 
 fi
 
-case "${target}" in
- x86_64-*-linux-*) TSAN_TARGET_DEPENDENT_OBJECTS='tsan_rtl_amd64.lo' ;;
- *) TSAN_TARGET_DEPENDENT_OBJECTS='' ;;
-esac
 
 
 cat >confcache <<\_ACEOF
diff --git a/libsanitizer/configure.ac b/libsanitizer/configure.ac
index 03208db6632..311ebff47d4 100644
--- a/libsanitizer/configure.ac
+++ b/libsanitizer/configure.ac
@@ -346,10 +346,6 @@ _EOF
 ])
 fi
 
-case "${target}" in
- x86_64-*-linux-*) TSAN_TARGET_DEPENDENT_OBJECTS='tsan_rtl_amd64.lo' ;;
- *) TSAN_TARGET_DEPENDENT_OBJECTS='' ;;
-esac
 AC_SUBST([TSAN_TARGET_DEPENDENT_OBJECTS])
 
 AC_OUTPUT
diff --git a/libsanitizer/configure.tgt b/libsanitizer/configure.tgt
index 2c302ab6489..0b14cd830f8 100644
--- a/libsanitizer/configure.tgt
+++ b/libsanitizer/configure.tgt
@@ -19,11 +19,13 @@
 # lets us skip running autoconf when modifying target specific information.
 
 # Filter out unsupported systems.
+TSAN_TARGET_DEPENDENT_OBJECTS=
 case "${target}" in
   x86_64-*-linux* | i?86-*-linux*)
 	if test x$ac_cv_sizeof_void_p = x8; then
 		TSAN_SUPPORTED=yes
 		LSAN_SUPPORTED=yes
+		TSAN_TARGET_DEPENDENT_OBJECTS=tsan_rtl_amd64.lo
 	fi
 	;;
   powerpc*le-*-linux*)