diff mbox

[asan] change libasan to libsanitizer

Message ID CA+4CFy5F_Nwv5OL6uTaOsrqO5=sLBDVRJtHALM=Lb2ar3-FdkQ@mail.gmail.com
State New
Headers show

Commit Message

Wei Mi Nov. 1, 2012, 8:02 p.m. UTC 
Hi,

Here is the patch to change libasan to libsanitizer and reorganize the
directory. I divided the patch into three parts for review.

patch.part1.txt: Contains the changes in the outermost level.
patch.part2.txt.bz2: Remove libasan
patch.part3.txt.bz2: Add libsanitizer

Is it ok for asan branch?

2012-11-1  Wei Mi  <wmi@google.com>

        * configure.ac: Change target-libasan to target-libsanitizer.
        * configure.in: Regenerate.
        * Makefile.def: Change libasan module to libsanitizer.
        * Makefile.in: Regenerate.
        * libsanitizer: Change libasan to libsanitizer and add
        an empty tsan directory under libsanitizer.

Thanks,
Wei.

Comments

Wei Mi Nov. 1, 2012, 8:17 p.m. UTC | #1 
patch.part2.txt.bz2 and patch.part3.txt.bz2 are still too big.

Divide patch.part2.txt.bz2 into two parts:
patch.part2-1.txt.bz2 + patch.part2-2.txt.bz2

Divide patch.part3.txt.bz2 into two parts:
patch.part3-1.txt.bz2 + patch.part3-2.txt.bz2

This is patch.part2-1.txt.bz2.

Thanks,
Wei.

On Thu, Nov 1, 2012 at 1:02 PM, Wei Mi <wmi@google.com> wrote:
> Hi,
>
> Here is the patch to change libasan to libsanitizer and reorganize the
> directory. I divided the patch into three parts for review.
>
> patch.part1.txt: Contains the changes in the outermost level.
> patch.part2.txt.bz2: Remove libasan
> patch.part3.txt.bz2: Add libsanitizer
>
> Is it ok for asan branch?
>
> 2012-11-1  Wei Mi  <wmi@google.com>
>
>         * configure.ac: Change target-libasan to target-libsanitizer.
>         * configure.in: Regenerate.
>         * Makefile.def: Change libasan module to libsanitizer.
>         * Makefile.in: Regenerate.
>         * libsanitizer: Change libasan to libsanitizer and add
>         an empty tsan directory under libsanitizer.
>
> Thanks,
> Wei.
Wei Mi Nov. 1, 2012, 8:18 p.m. UTC | #2 
This is patch.part2-2.txt.bz2.

On Thu, Nov 1, 2012 at 1:17 PM, Wei Mi <wmi@google.com> wrote:
> patch.part2.txt.bz2 and patch.part3.txt.bz2 are still too big.
>
> Divide patch.part2.txt.bz2 into two parts:
> patch.part2-1.txt.bz2 + patch.part2-2.txt.bz2
>
> Divide patch.part3.txt.bz2 into two parts:
> patch.part3-1.txt.bz2 + patch.part3-2.txt.bz2
>
> This is patch.part2-1.txt.bz2.
>
> Thanks,
> Wei.
>
> On Thu, Nov 1, 2012 at 1:02 PM, Wei Mi <wmi@google.com> wrote:
>> Hi,
>>
>> Here is the patch to change libasan to libsanitizer and reorganize the
>> directory. I divided the patch into three parts for review.
>>
>> patch.part1.txt: Contains the changes in the outermost level.
>> patch.part2.txt.bz2: Remove libasan
>> patch.part3.txt.bz2: Add libsanitizer
>>
>> Is it ok for asan branch?
>>
>> 2012-11-1  Wei Mi  <wmi@google.com>
>>
>>         * configure.ac: Change target-libasan to target-libsanitizer.
>>         * configure.in: Regenerate.
>>         * Makefile.def: Change libasan module to libsanitizer.
>>         * Makefile.in: Regenerate.
>>         * libsanitizer: Change libasan to libsanitizer and add
>>         an empty tsan directory under libsanitizer.
>>
>> Thanks,
>> Wei.
Xinliang David Li Nov. 1, 2012, 8:19 p.m. UTC | #3 
Will it be easier if you just rolled back your previous libasan
library changes, and resubmit it with the restructured directory?

David

On Thu, Nov 1, 2012 at 1:17 PM, Wei Mi <wmi@google.com> wrote:
> patch.part2.txt.bz2 and patch.part3.txt.bz2 are still too big.
>
> Divide patch.part2.txt.bz2 into two parts:
> patch.part2-1.txt.bz2 + patch.part2-2.txt.bz2
>
> Divide patch.part3.txt.bz2 into two parts:
> patch.part3-1.txt.bz2 + patch.part3-2.txt.bz2
>
> This is patch.part2-1.txt.bz2.
>
> Thanks,
> Wei.
>
> On Thu, Nov 1, 2012 at 1:02 PM, Wei Mi <wmi@google.com> wrote:
>> Hi,
>>
>> Here is the patch to change libasan to libsanitizer and reorganize the
>> directory. I divided the patch into three parts for review.
>>
>> patch.part1.txt: Contains the changes in the outermost level.
>> patch.part2.txt.bz2: Remove libasan
>> patch.part3.txt.bz2: Add libsanitizer
>>
>> Is it ok for asan branch?
>>
>> 2012-11-1  Wei Mi  <wmi@google.com>
>>
>>         * configure.ac: Change target-libasan to target-libsanitizer.
>>         * configure.in: Regenerate.
>>         * Makefile.def: Change libasan module to libsanitizer.
>>         * Makefile.in: Regenerate.
>>         * libsanitizer: Change libasan to libsanitizer and add
>>         an empty tsan directory under libsanitizer.
>>
>> Thanks,
>> Wei.
Wei Mi Nov. 1, 2012, 8:26 p.m. UTC | #4 
This is patch.part3-1.txt.bz2.

On Thu, Nov 1, 2012 at 1:18 PM, Wei Mi <wmi@google.com> wrote:
> This is patch.part2-2.txt.bz2.
>
> On Thu, Nov 1, 2012 at 1:17 PM, Wei Mi <wmi@google.com> wrote:
>> patch.part2.txt.bz2 and patch.part3.txt.bz2 are still too big.
>>
>> Divide patch.part2.txt.bz2 into two parts:
>> patch.part2-1.txt.bz2 + patch.part2-2.txt.bz2
>>
>> Divide patch.part3.txt.bz2 into two parts:
>> patch.part3-1.txt.bz2 + patch.part3-2.txt.bz2
>>
>> This is patch.part2-1.txt.bz2.
>>
>> Thanks,
>> Wei.
>>
>> On Thu, Nov 1, 2012 at 1:02 PM, Wei Mi <wmi@google.com> wrote:
>>> Hi,
>>>
>>> Here is the patch to change libasan to libsanitizer and reorganize the
>>> directory. I divided the patch into three parts for review.
>>>
>>> patch.part1.txt: Contains the changes in the outermost level.
>>> patch.part2.txt.bz2: Remove libasan
>>> patch.part3.txt.bz2: Add libsanitizer
>>>
>>> Is it ok for asan branch?
>>>
>>> 2012-11-1  Wei Mi  <wmi@google.com>
>>>
>>>         * configure.ac: Change target-libasan to target-libsanitizer.
>>>         * configure.in: Regenerate.
>>>         * Makefile.def: Change libasan module to libsanitizer.
>>>         * Makefile.in: Regenerate.
>>>         * libsanitizer: Change libasan to libsanitizer and add
>>>         an empty tsan directory under libsanitizer.
>>>
>>> Thanks,
>>> Wei.
Wei Mi Nov. 1, 2012, 8:27 p.m. UTC | #5 
This is patch.part3-2.txt.bz2.

Thanks,
Wei.

On Thu, Nov 1, 2012 at 1:26 PM, Wei Mi <wmi@google.com> wrote:
> This is patch.part3-1.txt.bz2.
>
> On Thu, Nov 1, 2012 at 1:18 PM, Wei Mi <wmi@google.com> wrote:
>> This is patch.part2-2.txt.bz2.
>>
>> On Thu, Nov 1, 2012 at 1:17 PM, Wei Mi <wmi@google.com> wrote:
>>> patch.part2.txt.bz2 and patch.part3.txt.bz2 are still too big.
>>>
>>> Divide patch.part2.txt.bz2 into two parts:
>>> patch.part2-1.txt.bz2 + patch.part2-2.txt.bz2
>>>
>>> Divide patch.part3.txt.bz2 into two parts:
>>> patch.part3-1.txt.bz2 + patch.part3-2.txt.bz2
>>>
>>> This is patch.part2-1.txt.bz2.
>>>
>>> Thanks,
>>> Wei.
>>>
>>> On Thu, Nov 1, 2012 at 1:02 PM, Wei Mi <wmi@google.com> wrote:
>>>> Hi,
>>>>
>>>> Here is the patch to change libasan to libsanitizer and reorganize the
>>>> directory. I divided the patch into three parts for review.
>>>>
>>>> patch.part1.txt: Contains the changes in the outermost level.
>>>> patch.part2.txt.bz2: Remove libasan
>>>> patch.part3.txt.bz2: Add libsanitizer
>>>>
>>>> Is it ok for asan branch?
>>>>
>>>> 2012-11-1  Wei Mi  <wmi@google.com>
>>>>
>>>>         * configure.ac: Change target-libasan to target-libsanitizer.
>>>>         * configure.in: Regenerate.
>>>>         * Makefile.def: Change libasan module to libsanitizer.
>>>>         * Makefile.in: Regenerate.
>>>>         * libsanitizer: Change libasan to libsanitizer and add
>>>>         an empty tsan directory under libsanitizer.
>>>>
>>>> Thanks,
>>>> Wei.
Wei Mi Nov. 1, 2012, 8:28 p.m. UTC | #6 
Yes. That will be easier and clearer. The patch is too big.

Thanks,
Wei.

On Thu, Nov 1, 2012 at 1:19 PM, Xinliang David Li <davidxl@google.com> wrote:
> Will it be easier if you just rolled back your previous libasan
> library changes, and resubmit it with the restructured directory?
>
> David
>
> On Thu, Nov 1, 2012 at 1:17 PM, Wei Mi <wmi@google.com> wrote:
>> patch.part2.txt.bz2 and patch.part3.txt.bz2 are still too big.
>>
>> Divide patch.part2.txt.bz2 into two parts:
>> patch.part2-1.txt.bz2 + patch.part2-2.txt.bz2
>>
>> Divide patch.part3.txt.bz2 into two parts:
>> patch.part3-1.txt.bz2 + patch.part3-2.txt.bz2
>>
>> This is patch.part2-1.txt.bz2.
>>
>> Thanks,
>> Wei.
>>
>> On Thu, Nov 1, 2012 at 1:02 PM, Wei Mi <wmi@google.com> wrote:
>>> Hi,
>>>
>>> Here is the patch to change libasan to libsanitizer and reorganize the
>>> directory. I divided the patch into three parts for review.
>>>
>>> patch.part1.txt: Contains the changes in the outermost level.
>>> patch.part2.txt.bz2: Remove libasan
>>> patch.part3.txt.bz2: Add libsanitizer
>>>
>>> Is it ok for asan branch?
>>>
>>> 2012-11-1  Wei Mi  <wmi@google.com>
>>>
>>>         * configure.ac: Change target-libasan to target-libsanitizer.
>>>         * configure.in: Regenerate.
>>>         * Makefile.def: Change libasan module to libsanitizer.
>>>         * Makefile.in: Regenerate.
>>>         * libsanitizer: Change libasan to libsanitizer and add
>>>         an empty tsan directory under libsanitizer.
>>>
>>> Thanks,
>>> Wei.
Jakub Jelinek Nov. 1, 2012, 8:31 p.m. UTC | #7 
On Thu, Nov 01, 2012 at 01:19:42PM -0700, Xinliang David Li wrote:
> Will it be easier if you just rolled back your previous libasan
> library changes, and resubmit it with the restructured directory?

I think better would be if you didn't apply it as a patch with lots of svn
add/svn rm commands, but instead just svn mv the directory or files.
So it would be better if you could post the planned svn commands
and the patch that would be applied on top of that.

	Jakub
Xinliang David Li Nov. 1, 2012, 8:34 p.m. UTC | #8 
that sounds good to me.

David

On Thu, Nov 1, 2012 at 1:31 PM, Jakub Jelinek <jakub@redhat.com> wrote:
> On Thu, Nov 01, 2012 at 01:19:42PM -0700, Xinliang David Li wrote:
>> Will it be easier if you just rolled back your previous libasan
>> library changes, and resubmit it with the restructured directory?
>
> I think better would be if you didn't apply it as a patch with lots of svn
> add/svn rm commands, but instead just svn mv the directory or files.
> So it would be better if you could post the planned svn commands
> and the patch that would be applied on top of that.
>
>         Jakub
Dodji Seketeli Nov. 1, 2012, 9:47 p.m. UTC | #9 
Instead of planning this change for the branch, would it be possible to
plan it for trunk directly, on top of the patches that I posted for
review there?

The patch could go in on top of the patches I posted.

Wei Mi <wmi@google.com> writes:

> This is the part2.
>
> On Thu, Nov 1, 2012 at 1:02 PM, Wei Mi <wmi@google.com> wrote:
>> Hi,
>>
>> Here is the patch to change libasan to libsanitizer and reorganize the
>> directory. I divided the patch into three parts for review.
>>
>> patch.part1.txt: Contains the changes in the outermost level.
>> patch.part2.txt.bz2: Remove libasan
>> patch.part3.txt.bz2: Add libsanitizer
>>
>> Is it ok for asan branch?
>>
>> 2012-11-1  Wei Mi  <wmi@google.com>
>>
>>         * configure.ac: Change target-libasan to target-libsanitizer.
>>         * configure.in: Regenerate.
>>         * Makefile.def: Change libasan module to libsanitizer.
>>         * Makefile.in: Regenerate.
>>         * libsanitizer: Change libasan to libsanitizer and add
>>         an empty tsan directory under libsanitizer.
>>
>> Thanks,
>> Wei.
>
Xinliang David Li Nov. 1, 2012, 9:52 p.m. UTC | #10 
I think it is better to apply this patch to asan first to avoid extra
thread.   You probably just need to retrieve your runtime part of the
trunk patch and resend it. Make sense?

thanks,

David

On Thu, Nov 1, 2012 at 2:47 PM, Dodji Seketeli <dodji@redhat.com> wrote:
> Instead of planning this change for the branch, would it be possible to
> plan it for trunk directly, on top of the patches that I posted for
> review there?
>
> The patch could go in on top of the patches I posted.
>
> Wei Mi <wmi@google.com> writes:
>
>> This is the part2.
>>
>> On Thu, Nov 1, 2012 at 1:02 PM, Wei Mi <wmi@google.com> wrote:
>>> Hi,
>>>
>>> Here is the patch to change libasan to libsanitizer and reorganize the
>>> directory. I divided the patch into three parts for review.
>>>
>>> patch.part1.txt: Contains the changes in the outermost level.
>>> patch.part2.txt.bz2: Remove libasan
>>> patch.part3.txt.bz2: Add libsanitizer
>>>
>>> Is it ok for asan branch?
>>>
>>> 2012-11-1  Wei Mi  <wmi@google.com>
>>>
>>>         * configure.ac: Change target-libasan to target-libsanitizer.
>>>         * configure.in: Regenerate.
>>>         * Makefile.def: Change libasan module to libsanitizer.
>>>         * Makefile.in: Regenerate.
>>>         * libsanitizer: Change libasan to libsanitizer and add
>>>         an empty tsan directory under libsanitizer.
>>>
>>> Thanks,
>>> Wei.
>>
>
> --
>                 Dodji
Jakub Jelinek Nov. 1, 2012, 9:55 p.m. UTC | #11 
On Thu, Nov 01, 2012 at 02:52:52PM -0700, Xinliang David Li wrote:
> I think it is better to apply this patch to asan first to avoid extra
> thread.   You probably just need to retrieve your runtime part of the
> trunk patch and resend it. Make sense?

Yeah, for trunk I believe it would be better to provide the whole
libsanitizer directory plus corresponding toplevel changes as one commit,
instead of redoing the commits to a different location, then moves.
The gcc/ changes should be split as they were of course.

	Jakub
Xinliang David Li Nov. 1, 2012, 10 p.m. UTC | #12 
Yes, there is no need to repeat the error made in asan branch in trunk.

David

On Thu, Nov 1, 2012 at 2:55 PM, Jakub Jelinek <jakub@redhat.com> wrote:
> On Thu, Nov 01, 2012 at 02:52:52PM -0700, Xinliang David Li wrote:
>> I think it is better to apply this patch to asan first to avoid extra
>> thread.   You probably just need to retrieve your runtime part of the
>> trunk patch and resend it. Make sense?
>
> Yeah, for trunk I believe it would be better to provide the whole
> libsanitizer directory plus corresponding toplevel changes as one commit,
> instead of redoing the commits to a different location, then moves.
> The gcc/ changes should be split as they were of course.
>
>         Jakub
Dodji Seketeli Nov. 4, 2012, 8:04 a.m. UTC | #13 
Jakub Jelinek <jakub@redhat.com> writes:

> On Thu, Nov 01, 2012 at 02:52:52PM -0700, Xinliang David Li wrote:
>> I think it is better to apply this patch to asan first to avoid extra
>> thread.   You probably just need to retrieve your runtime part of the
>> trunk patch and resend it. Make sense?
>
> Yeah, for trunk I believe it would be better to provide the whole
> libsanitizer directory plus corresponding toplevel changes as one commit,
> instead of redoing the commits to a different location, then moves.
> The gcc/ changes should be split as they were of course.

This is hopefully what I did in the patch submission [asan] -> [trunk] I
did in the sub-thread rooted by
http://gcc.gnu.org/ml/gcc-patches/2012-11/msg00227.html.
diff mbox

Patch

Index: configure
===================================================================
--- configure	(revision 193063)
+++ configure	(working copy)
@@ -2771,7 +2771,7 @@  target_libraries="target-libgcc \
 		target-libitm \
 		target-libstdc++-v3 \
 		target-libmudflap \
-		target-libasan \
+		target-libsanitizer \
 		target-libssp \
 		target-libquadmath \
 		target-libgfortran \
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 193063)
+++ Makefile.in	(working copy)
@@ -575,7 +575,7 @@  all:
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that programs built for the target machine work.
-TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libasan)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
+TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
 
 @if target-libstdc++-v3
 TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
@@ -585,9 +585,9 @@  TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TAR
 TARGET_LIB_PATH_libmudflap = $$r/$(TARGET_SUBDIR)/libmudflap/.libs:
 @endif target-libmudflap
 
-@if target-libasan
-TARGET_LIB_PATH_libasan = $$r/$(TARGET_SUBDIR)/libasan/.libs:
-@endif target-libasan
+@if target-libsanitizer
+TARGET_LIB_PATH_libsanitizer = $$r/$(TARGET_SUBDIR)/libsanitizer/.libs:
+@endif target-libsanitizer
 
 @if target-libssp
 TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs:
@@ -924,7 +924,7 @@  configure-host:  \
 configure-target:  \
     maybe-configure-target-libstdc++-v3 \
     maybe-configure-target-libmudflap \
-    maybe-configure-target-libasan \
+    maybe-configure-target-libsanitizer \
     maybe-configure-target-libssp \
     maybe-configure-target-newlib \
     maybe-configure-target-libgcc \
@@ -1073,7 +1073,7 @@  all-host: maybe-all-lto-plugin
 all-target: maybe-all-target-libstdc++-v3
 @endif target-libstdc++-v3-no-bootstrap
 all-target: maybe-all-target-libmudflap
-all-target: maybe-all-target-libasan
+all-target: maybe-all-target-libsanitizer
 all-target: maybe-all-target-libssp
 all-target: maybe-all-target-newlib
 @if target-libgcc-no-bootstrap
@@ -1164,7 +1164,7 @@  info-host: maybe-info-lto-plugin
 
 info-target: maybe-info-target-libstdc++-v3
 info-target: maybe-info-target-libmudflap
-info-target: maybe-info-target-libasan
+info-target: maybe-info-target-libsanitizer
 info-target: maybe-info-target-libssp
 info-target: maybe-info-target-newlib
 info-target: maybe-info-target-libgcc
@@ -1246,7 +1246,7 @@  dvi-host: maybe-dvi-lto-plugin
 
 dvi-target: maybe-dvi-target-libstdc++-v3
 dvi-target: maybe-dvi-target-libmudflap
-dvi-target: maybe-dvi-target-libasan
+dvi-target: maybe-dvi-target-libsanitizer
 dvi-target: maybe-dvi-target-libssp
 dvi-target: maybe-dvi-target-newlib
 dvi-target: maybe-dvi-target-libgcc
@@ -1328,7 +1328,7 @@  pdf-host: maybe-pdf-lto-plugin
 
 pdf-target: maybe-pdf-target-libstdc++-v3
 pdf-target: maybe-pdf-target-libmudflap
-pdf-target: maybe-pdf-target-libasan
+pdf-target: maybe-pdf-target-libsanitizer
 pdf-target: maybe-pdf-target-libssp
 pdf-target: maybe-pdf-target-newlib
 pdf-target: maybe-pdf-target-libgcc
@@ -1410,7 +1410,7 @@  html-host: maybe-html-lto-plugin
 
 html-target: maybe-html-target-libstdc++-v3
 html-target: maybe-html-target-libmudflap
-html-target: maybe-html-target-libasan
+html-target: maybe-html-target-libsanitizer
 html-target: maybe-html-target-libssp
 html-target: maybe-html-target-newlib
 html-target: maybe-html-target-libgcc
@@ -1492,7 +1492,7 @@  TAGS-host: maybe-TAGS-lto-plugin
 
 TAGS-target: maybe-TAGS-target-libstdc++-v3
 TAGS-target: maybe-TAGS-target-libmudflap
-TAGS-target: maybe-TAGS-target-libasan
+TAGS-target: maybe-TAGS-target-libsanitizer
 TAGS-target: maybe-TAGS-target-libssp
 TAGS-target: maybe-TAGS-target-newlib
 TAGS-target: maybe-TAGS-target-libgcc
@@ -1574,7 +1574,7 @@  install-info-host: maybe-install-info-lt
 
 install-info-target: maybe-install-info-target-libstdc++-v3
 install-info-target: maybe-install-info-target-libmudflap
-install-info-target: maybe-install-info-target-libasan
+install-info-target: maybe-install-info-target-libsanitizer
 install-info-target: maybe-install-info-target-libssp
 install-info-target: maybe-install-info-target-newlib
 install-info-target: maybe-install-info-target-libgcc
@@ -1656,7 +1656,7 @@  install-pdf-host: maybe-install-pdf-lto-
 
 install-pdf-target: maybe-install-pdf-target-libstdc++-v3
 install-pdf-target: maybe-install-pdf-target-libmudflap
-install-pdf-target: maybe-install-pdf-target-libasan
+install-pdf-target: maybe-install-pdf-target-libsanitizer
 install-pdf-target: maybe-install-pdf-target-libssp
 install-pdf-target: maybe-install-pdf-target-newlib
 install-pdf-target: maybe-install-pdf-target-libgcc
@@ -1738,7 +1738,7 @@  install-html-host: maybe-install-html-lt
 
 install-html-target: maybe-install-html-target-libstdc++-v3
 install-html-target: maybe-install-html-target-libmudflap
-install-html-target: maybe-install-html-target-libasan
+install-html-target: maybe-install-html-target-libsanitizer
 install-html-target: maybe-install-html-target-libssp
 install-html-target: maybe-install-html-target-newlib
 install-html-target: maybe-install-html-target-libgcc
@@ -1820,7 +1820,7 @@  installcheck-host: maybe-installcheck-lt
 
 installcheck-target: maybe-installcheck-target-libstdc++-v3
 installcheck-target: maybe-installcheck-target-libmudflap
-installcheck-target: maybe-installcheck-target-libasan
+installcheck-target: maybe-installcheck-target-libsanitizer
 installcheck-target: maybe-installcheck-target-libssp
 installcheck-target: maybe-installcheck-target-newlib
 installcheck-target: maybe-installcheck-target-libgcc
@@ -1902,7 +1902,7 @@  mostlyclean-host: maybe-mostlyclean-lto-
 
 mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3
 mostlyclean-target: maybe-mostlyclean-target-libmudflap
-mostlyclean-target: maybe-mostlyclean-target-libasan
+mostlyclean-target: maybe-mostlyclean-target-libsanitizer
 mostlyclean-target: maybe-mostlyclean-target-libssp
 mostlyclean-target: maybe-mostlyclean-target-newlib
 mostlyclean-target: maybe-mostlyclean-target-libgcc
@@ -1984,7 +1984,7 @@  clean-host: maybe-clean-lto-plugin
 
 clean-target: maybe-clean-target-libstdc++-v3
 clean-target: maybe-clean-target-libmudflap
-clean-target: maybe-clean-target-libasan
+clean-target: maybe-clean-target-libsanitizer
 clean-target: maybe-clean-target-libssp
 clean-target: maybe-clean-target-newlib
 clean-target: maybe-clean-target-libgcc
@@ -2066,7 +2066,7 @@  distclean-host: maybe-distclean-lto-plug
 
 distclean-target: maybe-distclean-target-libstdc++-v3
 distclean-target: maybe-distclean-target-libmudflap
-distclean-target: maybe-distclean-target-libasan
+distclean-target: maybe-distclean-target-libsanitizer
 distclean-target: maybe-distclean-target-libssp
 distclean-target: maybe-distclean-target-newlib
 distclean-target: maybe-distclean-target-libgcc
@@ -2148,7 +2148,7 @@  maintainer-clean-host: maybe-maintainer-
 
 maintainer-clean-target: maybe-maintainer-clean-target-libstdc++-v3
 maintainer-clean-target: maybe-maintainer-clean-target-libmudflap
-maintainer-clean-target: maybe-maintainer-clean-target-libasan
+maintainer-clean-target: maybe-maintainer-clean-target-libsanitizer
 maintainer-clean-target: maybe-maintainer-clean-target-libssp
 maintainer-clean-target: maybe-maintainer-clean-target-newlib
 maintainer-clean-target: maybe-maintainer-clean-target-libgcc
@@ -2285,7 +2285,7 @@  check-host:  \
 check-target:  \
     maybe-check-target-libstdc++-v3 \
     maybe-check-target-libmudflap \
-    maybe-check-target-libasan \
+    maybe-check-target-libsanitizer \
     maybe-check-target-libssp \
     maybe-check-target-newlib \
     maybe-check-target-libgcc \
@@ -2440,7 +2440,7 @@  install-host:  \
 install-target:  \
     maybe-install-target-libstdc++-v3 \
     maybe-install-target-libmudflap \
-    maybe-install-target-libasan \
+    maybe-install-target-libsanitizer \
     maybe-install-target-libssp \
     maybe-install-target-newlib \
     maybe-install-target-libgcc \
@@ -2542,7 +2542,7 @@  install-strip-host:  \
 install-strip-target:  \
     maybe-install-strip-target-libstdc++-v3 \
     maybe-install-strip-target-libmudflap \
-    maybe-install-strip-target-libasan \
+    maybe-install-strip-target-libsanitizer \
     maybe-install-strip-target-libssp \
     maybe-install-strip-target-newlib \
     maybe-install-strip-target-libgcc \
@@ -32176,139 +32176,139 @@  maintainer-clean-target-libmudflap:
 
 
 
-.PHONY: configure-target-libasan maybe-configure-target-libasan
-maybe-configure-target-libasan:
+.PHONY: configure-target-libsanitizer maybe-configure-target-libsanitizer
+maybe-configure-target-libsanitizer:
 @if gcc-bootstrap
-configure-target-libasan: stage_current
+configure-target-libsanitizer: stage_current
 @endif gcc-bootstrap
-@if target-libasan
-maybe-configure-target-libasan: configure-target-libasan
-configure-target-libasan: 
+@if target-libsanitizer
+maybe-configure-target-libsanitizer: configure-target-libsanitizer
+configure-target-libsanitizer: 
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libasan..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libasan ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libasan/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libasan/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libasan/multilib.tmp $(TARGET_SUBDIR)/libasan/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libasan/multilib.tmp; \
+	echo "Checking multilib configuration for libsanitizer..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \
+	if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
 	  else \
-	    rm -f $(TARGET_SUBDIR)/libasan/Makefile; \
-	    mv $(TARGET_SUBDIR)/libasan/multilib.tmp $(TARGET_SUBDIR)/libasan/multilib.out; \
+	    rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
+	    mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
 	  fi; \
 	else \
-	  mv $(TARGET_SUBDIR)/libasan/multilib.tmp $(TARGET_SUBDIR)/libasan/multilib.out; \
+	  mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
 	fi; \
-	test ! -f $(TARGET_SUBDIR)/libasan/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libasan ; \
+	test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
 	$(NORMAL_TARGET_EXPORTS)  \
-	echo Configuring in $(TARGET_SUBDIR)/libasan; \
-	cd "$(TARGET_SUBDIR)/libasan" || exit 1; \
+	echo Configuring in $(TARGET_SUBDIR)/libsanitizer; \
+	cd "$(TARGET_SUBDIR)/libsanitizer" || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libasan/ | \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
 		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
 	esac; \
-	srcdiroption="--srcdir=$${topdir}/libasan"; \
-	libsrcdir="$$s/libasan"; \
+	srcdiroption="--srcdir=$${topdir}/libsanitizer"; \
+	libsrcdir="$$s/libsanitizer"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 	  --target=${target_alias} $${srcdiroption}  \
 	  || exit 1
-@endif target-libasan
+@endif target-libsanitizer
 
 
 
 
 
-.PHONY: all-target-libasan maybe-all-target-libasan
-maybe-all-target-libasan:
+.PHONY: all-target-libsanitizer maybe-all-target-libsanitizer
+maybe-all-target-libsanitizer:
 @if gcc-bootstrap
-all-target-libasan: stage_current
+all-target-libsanitizer: stage_current
 @endif gcc-bootstrap
-@if target-libasan
-TARGET-target-libasan=all
-maybe-all-target-libasan: all-target-libasan
-all-target-libasan: configure-target-libasan
+@if target-libsanitizer
+TARGET-target-libsanitizer=all
+maybe-all-target-libsanitizer: all-target-libsanitizer
+all-target-libsanitizer: configure-target-libsanitizer
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS)  \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
-		$(TARGET-target-libasan))
-@endif target-libasan
+		$(TARGET-target-libsanitizer))
+@endif target-libsanitizer
 
 
 
 
 
-.PHONY: check-target-libasan maybe-check-target-libasan
-maybe-check-target-libasan:
-@if target-libasan
-maybe-check-target-libasan: check-target-libasan
+.PHONY: check-target-libsanitizer maybe-check-target-libsanitizer
+maybe-check-target-libsanitizer:
+@if target-libsanitizer
+maybe-check-target-libsanitizer: check-target-libsanitizer
 
-check-target-libasan:
+check-target-libsanitizer:
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
-@endif target-libasan
+@endif target-libsanitizer
 
-.PHONY: install-target-libasan maybe-install-target-libasan
-maybe-install-target-libasan:
-@if target-libasan
-maybe-install-target-libasan: install-target-libasan
+.PHONY: install-target-libsanitizer maybe-install-target-libsanitizer
+maybe-install-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-target-libsanitizer: install-target-libsanitizer
 
-install-target-libasan: installdirs
+install-target-libsanitizer: installdirs
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
-@endif target-libasan
+@endif target-libsanitizer
 
-.PHONY: install-strip-target-libasan maybe-install-strip-target-libasan
-maybe-install-strip-target-libasan:
-@if target-libasan
-maybe-install-strip-target-libasan: install-strip-target-libasan
+.PHONY: install-strip-target-libsanitizer maybe-install-strip-target-libsanitizer
+maybe-install-strip-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-strip-target-libsanitizer: install-strip-target-libsanitizer
 
-install-strip-target-libasan: installdirs
+install-strip-target-libsanitizer: installdirs
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
-@endif target-libasan
+@endif target-libsanitizer
 
 # Other targets (info, dvi, pdf, etc.)
 
-.PHONY: maybe-info-target-libasan info-target-libasan
-maybe-info-target-libasan:
-@if target-libasan
-maybe-info-target-libasan: info-target-libasan
+.PHONY: maybe-info-target-libsanitizer info-target-libsanitizer
+maybe-info-target-libsanitizer:
+@if target-libsanitizer
+maybe-info-target-libsanitizer: info-target-libsanitizer
 
-info-target-libasan: \
-    configure-target-libasan 
+info-target-libsanitizer: \
+    configure-target-libsanitizer 
 	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libasan/Makefile ] || exit 0 ; \
+	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libasan" ; \
+	echo "Doing info in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	          "RANLIB=$${RANLIB}" \
@@ -32316,25 +32316,25 @@  info-target-libasan: \
 	           info) \
 	  || exit 1
 
-@endif target-libasan
+@endif target-libsanitizer
 
-.PHONY: maybe-dvi-target-libasan dvi-target-libasan
-maybe-dvi-target-libasan:
-@if target-libasan
-maybe-dvi-target-libasan: dvi-target-libasan
+.PHONY: maybe-dvi-target-libsanitizer dvi-target-libsanitizer
+maybe-dvi-target-libsanitizer:
+@if target-libsanitizer
+maybe-dvi-target-libsanitizer: dvi-target-libsanitizer
 
-dvi-target-libasan: \
-    configure-target-libasan 
+dvi-target-libsanitizer: \
+    configure-target-libsanitizer 
 	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libasan/Makefile ] || exit 0 ; \
+	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libasan" ; \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	          "RANLIB=$${RANLIB}" \
@@ -32342,25 +32342,25 @@  dvi-target-libasan: \
 	           dvi) \
 	  || exit 1
 
-@endif target-libasan
+@endif target-libsanitizer
 
-.PHONY: maybe-pdf-target-libasan pdf-target-libasan
-maybe-pdf-target-libasan:
-@if target-libasan
-maybe-pdf-target-libasan: pdf-target-libasan
+.PHONY: maybe-pdf-target-libsanitizer pdf-target-libsanitizer
+maybe-pdf-target-libsanitizer:
+@if target-libsanitizer
+maybe-pdf-target-libsanitizer: pdf-target-libsanitizer
 
-pdf-target-libasan: \
-    configure-target-libasan 
+pdf-target-libsanitizer: \
+    configure-target-libsanitizer 
 	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libasan/Makefile ] || exit 0 ; \
+	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing pdf in $(TARGET_SUBDIR)/libasan" ; \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	          "RANLIB=$${RANLIB}" \
@@ -32368,25 +32368,25 @@  pdf-target-libasan: \
 	           pdf) \
 	  || exit 1
 
-@endif target-libasan
+@endif target-libsanitizer
 
-.PHONY: maybe-html-target-libasan html-target-libasan
-maybe-html-target-libasan:
-@if target-libasan
-maybe-html-target-libasan: html-target-libasan
+.PHONY: maybe-html-target-libsanitizer html-target-libsanitizer
+maybe-html-target-libsanitizer:
+@if target-libsanitizer
+maybe-html-target-libsanitizer: html-target-libsanitizer
 
-html-target-libasan: \
-    configure-target-libasan 
+html-target-libsanitizer: \
+    configure-target-libsanitizer 
 	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libasan/Makefile ] || exit 0 ; \
+	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libasan" ; \
+	echo "Doing html in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	          "RANLIB=$${RANLIB}" \
@@ -32394,25 +32394,25 @@  html-target-libasan: \
 	           html) \
 	  || exit 1
 
-@endif target-libasan
+@endif target-libsanitizer
 
-.PHONY: maybe-TAGS-target-libasan TAGS-target-libasan
-maybe-TAGS-target-libasan:
-@if target-libasan
-maybe-TAGS-target-libasan: TAGS-target-libasan
+.PHONY: maybe-TAGS-target-libsanitizer TAGS-target-libsanitizer
+maybe-TAGS-target-libsanitizer:
+@if target-libsanitizer
+maybe-TAGS-target-libsanitizer: TAGS-target-libsanitizer
 
-TAGS-target-libasan: \
-    configure-target-libasan 
+TAGS-target-libsanitizer: \
+    configure-target-libsanitizer 
 	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libasan/Makefile ] || exit 0 ; \
+	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libasan" ; \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	          "RANLIB=$${RANLIB}" \
@@ -32420,26 +32420,26 @@  TAGS-target-libasan: \
 	           TAGS) \
 	  || exit 1
 
-@endif target-libasan
+@endif target-libsanitizer
 
-.PHONY: maybe-install-info-target-libasan install-info-target-libasan
-maybe-install-info-target-libasan:
-@if target-libasan
-maybe-install-info-target-libasan: install-info-target-libasan
+.PHONY: maybe-install-info-target-libsanitizer install-info-target-libsanitizer
+maybe-install-info-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-info-target-libsanitizer: install-info-target-libsanitizer
 
-install-info-target-libasan: \
-    configure-target-libasan \
-    info-target-libasan 
+install-info-target-libsanitizer: \
+    configure-target-libsanitizer \
+    info-target-libsanitizer 
 	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libasan/Makefile ] || exit 0 ; \
+	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libasan" ; \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	          "RANLIB=$${RANLIB}" \
@@ -32447,26 +32447,26 @@  install-info-target-libasan: \
 	           install-info) \
 	  || exit 1
 
-@endif target-libasan
+@endif target-libsanitizer
 
-.PHONY: maybe-install-pdf-target-libasan install-pdf-target-libasan
-maybe-install-pdf-target-libasan:
-@if target-libasan
-maybe-install-pdf-target-libasan: install-pdf-target-libasan
+.PHONY: maybe-install-pdf-target-libsanitizer install-pdf-target-libsanitizer
+maybe-install-pdf-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-pdf-target-libsanitizer: install-pdf-target-libsanitizer
 
-install-pdf-target-libasan: \
-    configure-target-libasan \
-    pdf-target-libasan 
+install-pdf-target-libsanitizer: \
+    configure-target-libsanitizer \
+    pdf-target-libsanitizer 
 	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libasan/Makefile ] || exit 0 ; \
+	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-pdf in $(TARGET_SUBDIR)/libasan" ; \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	          "RANLIB=$${RANLIB}" \
@@ -32474,26 +32474,26 @@  install-pdf-target-libasan: \
 	           install-pdf) \
 	  || exit 1
 
-@endif target-libasan
+@endif target-libsanitizer
 
-.PHONY: maybe-install-html-target-libasan install-html-target-libasan
-maybe-install-html-target-libasan:
-@if target-libasan
-maybe-install-html-target-libasan: install-html-target-libasan
+.PHONY: maybe-install-html-target-libsanitizer install-html-target-libsanitizer
+maybe-install-html-target-libsanitizer:
+@if target-libsanitizer
+maybe-install-html-target-libsanitizer: install-html-target-libsanitizer
 
-install-html-target-libasan: \
-    configure-target-libasan \
-    html-target-libasan 
+install-html-target-libsanitizer: \
+    configure-target-libsanitizer \
+    html-target-libsanitizer 
 	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libasan/Makefile ] || exit 0 ; \
+	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-html in $(TARGET_SUBDIR)/libasan" ; \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	          "RANLIB=$${RANLIB}" \
@@ -32501,25 +32501,25 @@  install-html-target-libasan: \
 	           install-html) \
 	  || exit 1
 
-@endif target-libasan
+@endif target-libsanitizer
 
-.PHONY: maybe-installcheck-target-libasan installcheck-target-libasan
-maybe-installcheck-target-libasan:
-@if target-libasan
-maybe-installcheck-target-libasan: installcheck-target-libasan
+.PHONY: maybe-installcheck-target-libsanitizer installcheck-target-libsanitizer
+maybe-installcheck-target-libsanitizer:
+@if target-libsanitizer
+maybe-installcheck-target-libsanitizer: installcheck-target-libsanitizer
 
-installcheck-target-libasan: \
-    configure-target-libasan 
+installcheck-target-libsanitizer: \
+    configure-target-libsanitizer 
 	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libasan/Makefile ] || exit 0 ; \
+	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libasan" ; \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	          "RANLIB=$${RANLIB}" \
@@ -32527,24 +32527,24 @@  installcheck-target-libasan: \
 	           installcheck) \
 	  || exit 1
 
-@endif target-libasan
+@endif target-libsanitizer
 
-.PHONY: maybe-mostlyclean-target-libasan mostlyclean-target-libasan
-maybe-mostlyclean-target-libasan:
-@if target-libasan
-maybe-mostlyclean-target-libasan: mostlyclean-target-libasan
+.PHONY: maybe-mostlyclean-target-libsanitizer mostlyclean-target-libsanitizer
+maybe-mostlyclean-target-libsanitizer:
+@if target-libsanitizer
+maybe-mostlyclean-target-libsanitizer: mostlyclean-target-libsanitizer
 
-mostlyclean-target-libasan: 
+mostlyclean-target-libsanitizer: 
 	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libasan/Makefile ] || exit 0 ; \
+	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libasan" ; \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	          "RANLIB=$${RANLIB}" \
@@ -32552,24 +32552,24 @@  mostlyclean-target-libasan:
 	           mostlyclean) \
 	  || exit 1
 
-@endif target-libasan
+@endif target-libsanitizer
 
-.PHONY: maybe-clean-target-libasan clean-target-libasan
-maybe-clean-target-libasan:
-@if target-libasan
-maybe-clean-target-libasan: clean-target-libasan
+.PHONY: maybe-clean-target-libsanitizer clean-target-libsanitizer
+maybe-clean-target-libsanitizer:
+@if target-libsanitizer
+maybe-clean-target-libsanitizer: clean-target-libsanitizer
 
-clean-target-libasan: 
+clean-target-libsanitizer: 
 	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libasan/Makefile ] || exit 0 ; \
+	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libasan" ; \
+	echo "Doing clean in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	          "RANLIB=$${RANLIB}" \
@@ -32577,24 +32577,24 @@  clean-target-libasan:
 	           clean) \
 	  || exit 1
 
-@endif target-libasan
+@endif target-libsanitizer
 
-.PHONY: maybe-distclean-target-libasan distclean-target-libasan
-maybe-distclean-target-libasan:
-@if target-libasan
-maybe-distclean-target-libasan: distclean-target-libasan
+.PHONY: maybe-distclean-target-libsanitizer distclean-target-libsanitizer
+maybe-distclean-target-libsanitizer:
+@if target-libsanitizer
+maybe-distclean-target-libsanitizer: distclean-target-libsanitizer
 
-distclean-target-libasan: 
+distclean-target-libsanitizer: 
 	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libasan/Makefile ] || exit 0 ; \
+	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libasan" ; \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	          "RANLIB=$${RANLIB}" \
@@ -32602,24 +32602,24 @@  distclean-target-libasan:
 	           distclean) \
 	  || exit 1
 
-@endif target-libasan
+@endif target-libsanitizer
 
-.PHONY: maybe-maintainer-clean-target-libasan maintainer-clean-target-libasan
-maybe-maintainer-clean-target-libasan:
-@if target-libasan
-maybe-maintainer-clean-target-libasan: maintainer-clean-target-libasan
+.PHONY: maybe-maintainer-clean-target-libsanitizer maintainer-clean-target-libsanitizer
+maybe-maintainer-clean-target-libsanitizer:
+@if target-libsanitizer
+maybe-maintainer-clean-target-libsanitizer: maintainer-clean-target-libsanitizer
 
-maintainer-clean-target-libasan: 
+maintainer-clean-target-libsanitizer: 
 	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libasan/Makefile ] || exit 0 ; \
+	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libasan" ; \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 	done; \
-	(cd $(TARGET_SUBDIR)/libasan && \
+	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	          "RANLIB=$${RANLIB}" \
@@ -32627,7 +32627,7 @@  maintainer-clean-target-libasan:
 	           maintainer-clean) \
 	  || exit 1
 
-@endif target-libasan
+@endif target-libsanitizer
 
 
 
@@ -44869,7 +44869,7 @@  configure-stage4-target-libstdc++-v3: ma
 configure-stageprofile-target-libstdc++-v3: maybe-all-stageprofile-gcc
 configure-stagefeedback-target-libstdc++-v3: maybe-all-stagefeedback-gcc
 configure-target-libmudflap: stage_last
-configure-target-libasan: stage_last
+configure-target-libsanitizer: stage_last
 configure-target-libssp: stage_last
 configure-target-newlib: stage_last
 configure-stage1-target-libgcc: maybe-all-stage1-gcc
@@ -44905,7 +44905,7 @@  configure-target-libatomic: stage_last
 @if gcc-no-bootstrap
 configure-target-libstdc++-v3: maybe-all-gcc
 configure-target-libmudflap: maybe-all-gcc
-configure-target-libasan: maybe-all-gcc
+configure-target-libsanitizer: maybe-all-gcc
 configure-target-libssp: maybe-all-gcc
 configure-target-newlib: maybe-all-gcc
 configure-target-libgcc: maybe-all-gcc
@@ -45647,7 +45647,7 @@  configure-stage3-target-libstdc++-v3: ma
 configure-stage4-target-libstdc++-v3: maybe-configure-stage4-target-libgomp
 configure-stageprofile-target-libstdc++-v3: maybe-configure-stageprofile-target-libgomp
 configure-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libgomp
-configure-target-libasan: maybe-all-target-libstdc++-v3
+configure-target-libsanitizer: maybe-all-target-libstdc++-v3
 all-target-libstdc++-v3: maybe-configure-target-libgomp
 
 all-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
@@ -45686,7 +45686,7 @@  configure-stagefeedback-target-libgomp:
 @if gcc-no-bootstrap
 configure-target-libstdc++-v3: maybe-all-target-libgcc
 configure-target-libmudflap: maybe-all-target-libgcc
-configure-target-libasan: maybe-all-target-libgcc
+configure-target-libsanitizer: maybe-all-target-libgcc
 configure-target-libssp: maybe-all-target-libgcc
 configure-target-newlib: maybe-all-target-libgcc
 configure-target-libbacktrace: maybe-all-target-libgcc
@@ -45713,7 +45713,7 @@  configure-target-libstdc++-v3: maybe-all
 
 configure-target-libmudflap: maybe-all-target-newlib maybe-all-target-libgloss
 
-configure-target-libasan: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-libsanitizer: maybe-all-target-newlib maybe-all-target-libgloss
 
 configure-target-libssp: maybe-all-target-newlib maybe-all-target-libgloss

Index: Makefile.def
===================================================================
--- Makefile.def	(revision 193063)
+++ Makefile.def	(working copy)
@@ -119,7 +119,7 @@  target_modules = { module= libstdc++-v3;
 		   lib_path=src/.libs;
 		   raw_cxx=true; };
 target_modules = { module= libmudflap; lib_path=.libs; };
-target_modules = { module= libasan; lib_path=.libs; };
+target_modules = { module= libsanitizer; lib_path=.libs; };
 target_modules = { module= libssp; lib_path=.libs; };
 target_modules = { module= newlib; };
 target_modules = { module= libgcc; bootstrap=true; no_check=true; };
@@ -504,7 +504,7 @@  dependencies = { module=all-target-libja
 dependencies = { module=configure-target-libobjc; on=configure-target-boehm-gc; };
 dependencies = { module=all-target-libobjc; on=all-target-boehm-gc; };
 dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; };
-dependencies = { module=configure-target-libasan; on=all-target-libstdc++-v3; };
+dependencies = { module=configure-target-libsanitizer; on=all-target-libstdc++-v3; };
 // parallel_list.o and parallel_settings.o depend on omp.h, which is
 // generated by the libgomp configure.  Unfortunately, due to the use of
 //  recursive make, we can't be that specific.
Index: configure.ac
===================================================================
--- configure.ac	(revision 193063)
+++ configure.ac	(working copy)
@@ -160,7 +160,7 @@  target_libraries="target-libgcc \
 		target-libitm \
 		target-libstdc++-v3 \
 		target-libmudflap \
-		target-libasan \
+		target-libsanitizer \
 		target-libssp \
 		target-libquadmath \
 		target-libgfortran \