[PING]: [PATCH]: Conditionally include target specific files while building TSAN

[Venkataramanan Kumar]

Hi Jakub,

On 24 January 2015 at 14:40, Jakub Jelinek <jakub@redhat.com> wrote:
> On Sat, Jan 24, 2015 at 01:23:22PM +0530, Venkataramanan Kumar wrote:
>> I reused libgcc's "host_address" test and the patch passed normal
>> bootstrap in x86_64.
>>
>> Can you please check if this is fine ?
>
> Can't you just use what configure.tgt already uses?
>
>   x86_64-*-linux* | i?86-*-linux*)
>         if test x$ac_cv_sizeof_void_p = x8; then
>                 TSAN_SUPPORTED=yes
>                 LSAN_SUPPORTED=yes
>         fi
>         ;;
>
> Just make sure AC_CHECK_SIZEOF([void *]) is above this (seems it is).
>
> So
>
> TSAN_TARGET_DEPENDENT_OBJECTS=
> case "${target}" in
>   x86_64-*-linux* | i?86-*-linux*)
>     if test x$ac_cv_sizeof_void_p = x8; then
>       TSAN_TARGET_DEPENDENT_OBJECTS=tsan_rtl_amd64.lo
>     fi;;
> esac
> AC_SUBST([TSAN_TARGET_DEPENDENT_OBJECTS])
>
> ?
> Or even better move the TSAN_TARGET_DEPENDENT_OBJECTS initialization
> to configure.tgt and just keep AC_SUBST([TSAN_TARGET_DEPENDENT_OBJECTS])
> in configure.ac.
>
>         Jakub

As per you suggestion, I moved the TSAN_TARGET_DEPENDENT_OBJECTS  to
"configure.tgt" also it includes i?86 targets.

Bootstraped on x86_64 and Aarch64.


regards,
Venkat.
-------------- next part --------------
Index: libsanitizer/ChangeLog
===================================================================
--- libsanitizer/ChangeLog	(revision 220079)
+++ libsanitizer/ChangeLog	(working copy)
@@ -1,5 +1,11 @@
 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.
 	* configure: Regenerate.
 	* tsan/Makefile.am (EXTRA_libtsan_la_SOURCES): Define.
Index: libsanitizer/configure
===================================================================
--- libsanitizer/configure	(revision 220079)
+++ libsanitizer/configure	(working copy)
@@ -16363,10 +16363,6 @@
 
 fi
 
-case "${target}" in
- x86_64-*-linux-*) TSAN_TARGET_DEPENDENT_OBJECTS='tsan_rtl_amd64.lo' ;;
- *) TSAN_TARGET_DEPENDENT_OBJECTS='' ;;
-esac
 
 
 cat >confcache <<\_ACEOF
Index: libsanitizer/configure.ac
===================================================================
--- libsanitizer/configure.ac	(revision 220079)
+++ libsanitizer/configure.ac	(working copy)
@@ -346,10 +346,6 @@
 ])
 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
Index: libsanitizer/configure.tgt
===================================================================
--- libsanitizer/configure.tgt	(revision 220079)
+++ libsanitizer/configure.tgt	(working copy)
@@ -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*)