Remove bootstrap=true from libsanitizer

	* Makefile.def (target_modules): Remove bootstrap=true and
	raw_cxx=true from libsanitizer.
	* configure.ac (bootstrap_target_libs): Remove libsanitizer.
	* Makefile.in: Regenerated.
	* configure: Likewise.


git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@193950 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 32 insertions, 574 deletions

diff --git a/ChangeLog b/ChangeLog
index 6208d19a803..fedda0f6b68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2012-11-28  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* Makefile.def (target_modules): Remove bootstrap=true and
+	raw_cxx=true from libsanitizer.
+	* configure.ac (bootstrap_target_libs): Remove libsanitizer.
+	* Makefile.in: Regenerated.
+	* configure: Likewise.
+
+2012-11-28  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* Makefile.def (target_modules): Add bootstrap=true and
 	raw_cxx=true to libsanitizer.
 	* configure.ac (bootstrap_target_libs): Add libsanitizer.
diff --git a/Makefile.def b/Makefile.def
index 8d8af2332cd..1ea63ac10f8 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -119,10 +119,7 @@ target_modules = { module= libstdc++-v3;
 		   lib_path=src/.libs;
 		   raw_cxx=true; };
 target_modules = { module= libmudflap; lib_path=.libs; };
-target_modules = { module= libsanitizer;
-		   bootstrap=true;
-		   lib_path=.libs;
-		   raw_cxx=true; };
+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; };
diff --git a/Makefile.in b/Makefile.in
index a9d2890f7f7..48202537f07 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1073,9 +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
-@if target-libsanitizer-no-bootstrap
 all-target: maybe-all-target-libsanitizer
-@endif target-libsanitizer-no-bootstrap
 all-target: maybe-all-target-libssp
 all-target: maybe-all-target-newlib
 @if target-libgcc-no-bootstrap
@@ -32186,6 +32184,7 @@ configure-target-libsanitizer: stage_current
 @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 libsanitizer..."; \
@@ -32203,7 +32202,7 @@ configure-target-libsanitizer:
 	fi; \
 	test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
-	$(RAW_CXX_TARGET_EXPORTS)  \
+	$(NORMAL_TARGET_EXPORTS)  \
 	echo Configuring in $(TARGET_SUBDIR)/libsanitizer; \
 	cd "$(TARGET_SUBDIR)/libsanitizer" || exit 1; \
 	case $(srcdir) in \
@@ -32222,276 +32221,6 @@ configure-target-libsanitizer:
 
 
 
-.PHONY: configure-stage1-target-libsanitizer maybe-configure-stage1-target-libsanitizer
-maybe-configure-stage1-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
-configure-stage1-target-libsanitizer:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE1_TFLAGS)"; \
-	echo "Checking multilib configuration for 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)/libsanitizer/Makefile; \
-	    mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage 1 in $(TARGET_SUBDIR)/libsanitizer ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
-	cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libsanitizer"; \
-	libsrcdir="$$s/libsanitizer"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  $(STAGE1_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
-
-.PHONY: configure-stage2-target-libsanitizer maybe-configure-stage2-target-libsanitizer
-maybe-configure-stage2-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stage2-target-libsanitizer: configure-stage2-target-libsanitizer
-configure-stage2-target-libsanitizer:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE2_TFLAGS)"; \
-	echo "Checking multilib configuration for 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)/libsanitizer/Makefile; \
-	    mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage 2 in $(TARGET_SUBDIR)/libsanitizer ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
-	cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libsanitizer"; \
-	libsrcdir="$$s/libsanitizer"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGE2_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
-
-.PHONY: configure-stage3-target-libsanitizer maybe-configure-stage3-target-libsanitizer
-maybe-configure-stage3-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stage3-target-libsanitizer: configure-stage3-target-libsanitizer
-configure-stage3-target-libsanitizer:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE3_TFLAGS)"; \
-	echo "Checking multilib configuration for 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)/libsanitizer/Makefile; \
-	    mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage 3 in $(TARGET_SUBDIR)/libsanitizer ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
-	cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libsanitizer"; \
-	libsrcdir="$$s/libsanitizer"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGE3_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
-
-.PHONY: configure-stage4-target-libsanitizer maybe-configure-stage4-target-libsanitizer
-maybe-configure-stage4-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stage4-target-libsanitizer: configure-stage4-target-libsanitizer
-configure-stage4-target-libsanitizer:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE4_TFLAGS)"; \
-	echo "Checking multilib configuration for 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)/libsanitizer/Makefile; \
-	    mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage 4 in $(TARGET_SUBDIR)/libsanitizer ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
-	cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libsanitizer"; \
-	libsrcdir="$$s/libsanitizer"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGE4_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
-
-.PHONY: configure-stageprofile-target-libsanitizer maybe-configure-stageprofile-target-libsanitizer
-maybe-configure-stageprofile-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer
-configure-stageprofile-target-libsanitizer:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEprofile_TFLAGS)"; \
-	echo "Checking multilib configuration for 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)/libsanitizer/Makefile; \
-	    mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage profile in $(TARGET_SUBDIR)/libsanitizer ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
-	cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libsanitizer"; \
-	libsrcdir="$$s/libsanitizer"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEprofile_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
-
-.PHONY: configure-stagefeedback-target-libsanitizer maybe-configure-stagefeedback-target-libsanitizer
-maybe-configure-stagefeedback-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitizer
-configure-stagefeedback-target-libsanitizer:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-	echo "Checking multilib configuration for 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)/libsanitizer/Makefile; \
-	    mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage feedback in $(TARGET_SUBDIR)/libsanitizer ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \
-	cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libsanitizer"; \
-	libsrcdir="$$s/libsanitizer"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} $${srcdiroption} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEfeedback_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
-
-
-
 
 
 .PHONY: all-target-libsanitizer maybe-all-target-libsanitizer
@@ -32503,265 +32232,17 @@ all-target-libsanitizer: stage_current
 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; \
-	$(RAW_CXX_TARGET_EXPORTS)  \
+	$(NORMAL_TARGET_EXPORTS)  \
 	(cd $(TARGET_SUBDIR)/libsanitizer && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
 		$(TARGET-target-libsanitizer))
 @endif target-libsanitizer
 
 
 
-.PHONY: all-stage1-target-libsanitizer maybe-all-stage1-target-libsanitizer
-.PHONY: clean-stage1-target-libsanitizer maybe-clean-stage1-target-libsanitizer
-maybe-all-stage1-target-libsanitizer:
-maybe-clean-stage1-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stage1-target-libsanitizer: all-stage1-target-libsanitizer
-all-stage1: all-stage1-target-libsanitizer
-TARGET-stage1-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE1_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS)  \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-		  \
-		TFLAGS="$(STAGE1_TFLAGS)" \
-		$(TARGET-stage1-target-libsanitizer)
-
-maybe-clean-stage1-target-libsanitizer: clean-stage1-target-libsanitizer
-clean-stage1: clean-stage1-target-libsanitizer
-clean-stage1-target-libsanitizer:
-	@if [ $(current_stage) = stage1 ]; then \
-	  [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stage1-libsanitizer/Makefile ] || exit 0; \
-	  $(MAKE) stage1-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-	  clean
-@endif target-libsanitizer-bootstrap
-
-
-.PHONY: all-stage2-target-libsanitizer maybe-all-stage2-target-libsanitizer
-.PHONY: clean-stage2-target-libsanitizer maybe-clean-stage2-target-libsanitizer
-maybe-all-stage2-target-libsanitizer:
-maybe-clean-stage2-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stage2-target-libsanitizer: all-stage2-target-libsanitizer
-all-stage2: all-stage2-target-libsanitizer
-TARGET-stage2-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stage2-target-libsanitizer: configure-stage2-target-libsanitizer
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE2_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-		TFLAGS="$(STAGE2_TFLAGS)" \
-		$(TARGET-stage2-target-libsanitizer)
-
-maybe-clean-stage2-target-libsanitizer: clean-stage2-target-libsanitizer
-clean-stage2: clean-stage2-target-libsanitizer
-clean-stage2-target-libsanitizer:
-	@if [ $(current_stage) = stage2 ]; then \
-	  [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stage2-libsanitizer/Makefile ] || exit 0; \
-	  $(MAKE) stage2-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
-
-
-.PHONY: all-stage3-target-libsanitizer maybe-all-stage3-target-libsanitizer
-.PHONY: clean-stage3-target-libsanitizer maybe-clean-stage3-target-libsanitizer
-maybe-all-stage3-target-libsanitizer:
-maybe-clean-stage3-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stage3-target-libsanitizer: all-stage3-target-libsanitizer
-all-stage3: all-stage3-target-libsanitizer
-TARGET-stage3-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stage3-target-libsanitizer: configure-stage3-target-libsanitizer
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE3_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-		TFLAGS="$(STAGE3_TFLAGS)" \
-		$(TARGET-stage3-target-libsanitizer)
-
-maybe-clean-stage3-target-libsanitizer: clean-stage3-target-libsanitizer
-clean-stage3: clean-stage3-target-libsanitizer
-clean-stage3-target-libsanitizer:
-	@if [ $(current_stage) = stage3 ]; then \
-	  [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stage3-libsanitizer/Makefile ] || exit 0; \
-	  $(MAKE) stage3-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
-
-
-.PHONY: all-stage4-target-libsanitizer maybe-all-stage4-target-libsanitizer
-.PHONY: clean-stage4-target-libsanitizer maybe-clean-stage4-target-libsanitizer
-maybe-all-stage4-target-libsanitizer:
-maybe-clean-stage4-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stage4-target-libsanitizer: all-stage4-target-libsanitizer
-all-stage4: all-stage4-target-libsanitizer
-TARGET-stage4-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stage4-target-libsanitizer: configure-stage4-target-libsanitizer
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGE4_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-		TFLAGS="$(STAGE4_TFLAGS)" \
-		$(TARGET-stage4-target-libsanitizer)
-
-maybe-clean-stage4-target-libsanitizer: clean-stage4-target-libsanitizer
-clean-stage4: clean-stage4-target-libsanitizer
-clean-stage4-target-libsanitizer:
-	@if [ $(current_stage) = stage4 ]; then \
-	  [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stage4-libsanitizer/Makefile ] || exit 0; \
-	  $(MAKE) stage4-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
-
-
-.PHONY: all-stageprofile-target-libsanitizer maybe-all-stageprofile-target-libsanitizer
-.PHONY: clean-stageprofile-target-libsanitizer maybe-clean-stageprofile-target-libsanitizer
-maybe-all-stageprofile-target-libsanitizer:
-maybe-clean-stageprofile-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stageprofile-target-libsanitizer: all-stageprofile-target-libsanitizer
-all-stageprofile: all-stageprofile-target-libsanitizer
-TARGET-stageprofile-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEprofile_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-		TFLAGS="$(STAGEprofile_TFLAGS)" \
-		$(TARGET-stageprofile-target-libsanitizer)
-
-maybe-clean-stageprofile-target-libsanitizer: clean-stageprofile-target-libsanitizer
-clean-stageprofile: clean-stageprofile-target-libsanitizer
-clean-stageprofile-target-libsanitizer:
-	@if [ $(current_stage) = stageprofile ]; then \
-	  [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageprofile-libsanitizer/Makefile ] || exit 0; \
-	  $(MAKE) stageprofile-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
-
-
-.PHONY: all-stagefeedback-target-libsanitizer maybe-all-stagefeedback-target-libsanitizer
-.PHONY: clean-stagefeedback-target-libsanitizer maybe-clean-stagefeedback-target-libsanitizer
-maybe-all-stagefeedback-target-libsanitizer:
-maybe-clean-stagefeedback-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stagefeedback-target-libsanitizer: all-stagefeedback-target-libsanitizer
-all-stagefeedback: all-stagefeedback-target-libsanitizer
-TARGET-stagefeedback-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitizer
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-		TFLAGS="$(STAGEfeedback_TFLAGS)" \
-		$(TARGET-stagefeedback-target-libsanitizer)
-
-maybe-clean-stagefeedback-target-libsanitizer: clean-stagefeedback-target-libsanitizer
-clean-stagefeedback: clean-stagefeedback-target-libsanitizer
-clean-stagefeedback-target-libsanitizer:
-	@if [ $(current_stage) = stagefeedback ]; then \
-	  [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stagefeedback-libsanitizer/Makefile ] || exit 0; \
-	  $(MAKE) stagefeedback-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
-
-
-
-
 
 
 .PHONY: check-target-libsanitizer maybe-check-target-libsanitizer
@@ -32773,9 +32254,9 @@ check-target-libsanitizer:
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/libsanitizer && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 
 @endif target-libsanitizer
 
@@ -32788,7 +32269,7 @@ install-target-libsanitizer: installdirs
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 
@@ -32803,7 +32284,7 @@ install-strip-target-libsanitizer: installdirs
 	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/libsanitizer && \
 	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 
@@ -32822,7 +32303,7 @@ info-target-libsanitizer: \
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	echo "Doing info in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -32848,7 +32329,7 @@ dvi-target-libsanitizer: \
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	echo "Doing dvi in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -32874,7 +32355,7 @@ pdf-target-libsanitizer: \
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	echo "Doing pdf in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -32900,7 +32381,7 @@ html-target-libsanitizer: \
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	echo "Doing html in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -32926,7 +32407,7 @@ TAGS-target-libsanitizer: \
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	echo "Doing TAGS in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -32953,7 +32434,7 @@ install-info-target-libsanitizer: \
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	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|"`; \
@@ -32980,7 +32461,7 @@ install-pdf-target-libsanitizer: \
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	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|"`; \
@@ -33007,7 +32488,7 @@ install-html-target-libsanitizer: \
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	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|"`; \
@@ -33033,7 +32514,7 @@ installcheck-target-libsanitizer: \
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	echo "Doing installcheck in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -33058,7 +32539,7 @@ mostlyclean-target-libsanitizer:
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -33083,7 +32564,7 @@ clean-target-libsanitizer:
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	echo "Doing clean in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -33108,7 +32589,7 @@ distclean-target-libsanitizer:
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	echo "Doing distclean in $(TARGET_SUBDIR)/libsanitizer" ; \
 	for flag in $(EXTRA_TARGET_FLAGS); do \
 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
@@ -33133,7 +32614,7 @@ maintainer-clean-target-libsanitizer:
 	@[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
+	$(NORMAL_TARGET_EXPORTS) \
 	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|"`; \
@@ -45388,12 +44869,7 @@ configure-stage4-target-libstdc++-v3: maybe-all-stage4-gcc
 configure-stageprofile-target-libstdc++-v3: maybe-all-stageprofile-gcc
 configure-stagefeedback-target-libstdc++-v3: maybe-all-stagefeedback-gcc
 configure-target-libmudflap: stage_last
-configure-stage1-target-libsanitizer: maybe-all-stage1-gcc
-configure-stage2-target-libsanitizer: maybe-all-stage2-gcc
-configure-stage3-target-libsanitizer: maybe-all-stage3-gcc
-configure-stage4-target-libsanitizer: maybe-all-stage4-gcc
-configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-gcc
-configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-gcc
+configure-target-libsanitizer: stage_last
 configure-target-libssp: stage_last
 configure-target-newlib: stage_last
 configure-stage1-target-libgcc: maybe-all-stage1-gcc
@@ -46172,13 +45648,6 @@ 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-libsanitizer: maybe-all-target-libstdc++-v3
-
-configure-stage1-target-libsanitizer: maybe-all-stage1-target-libstdc++-v3
-configure-stage2-target-libsanitizer: maybe-all-stage2-target-libstdc++-v3
-configure-stage3-target-libsanitizer: maybe-all-stage3-target-libstdc++-v3
-configure-stage4-target-libsanitizer: maybe-all-stage4-target-libstdc++-v3
-configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-target-libstdc++-v3
-configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-target-libstdc++-v3
 all-target-libstdc++-v3: maybe-configure-target-libgomp
 
 all-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
@@ -46206,12 +45675,6 @@ configure-stage3-target-libstdc++-v3: maybe-all-stage3-target-libgcc
 configure-stage4-target-libstdc++-v3: maybe-all-stage4-target-libgcc
 configure-stageprofile-target-libstdc++-v3: maybe-all-stageprofile-target-libgcc
 configure-stagefeedback-target-libstdc++-v3: maybe-all-stagefeedback-target-libgcc
-configure-stage1-target-libsanitizer: maybe-all-stage1-target-libgcc
-configure-stage2-target-libsanitizer: maybe-all-stage2-target-libgcc
-configure-stage3-target-libsanitizer: maybe-all-stage3-target-libgcc
-configure-stage4-target-libsanitizer: maybe-all-stage4-target-libgcc
-configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-target-libgcc
-configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-target-libgcc
 configure-stage1-target-libgomp: maybe-all-stage1-target-libgcc
 configure-stage2-target-libgomp: maybe-all-stage2-target-libgcc
 configure-stage3-target-libgomp: maybe-all-stage3-target-libgcc
diff --git a/configure b/configure
index acff17345db..b58860ff3b2 100755
--- a/configure
+++ b/configure
@@ -6913,11 +6913,6 @@ if echo " ${target_configdirs} " | grep " libgomp " > /dev/null 2>&1 ; then
   bootstrap_target_libs=${bootstrap_target_libs}target-libgomp,
 fi
 
-# If we are building libsanitizer, bootstrap it.
-if echo " ${target_configdirs} " | grep " libsanitizer " > /dev/null 2>&1 ; then
-  bootstrap_target_libs=${bootstrap_target_libs}target-libsanitizer,
-fi
-
 # Determine whether gdb needs tk/tcl or not.
 # Use 'maybe' since enable_gdbtk might be true even if tk isn't available
 # and in that case we want gdb to be built without tk.  Ugh!
diff --git a/configure.ac b/configure.ac
index a92ff3af8b0..49f4f5dae88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2433,11 +2433,6 @@ if echo " ${target_configdirs} " | grep " libgomp " > /dev/null 2>&1 ; then
   bootstrap_target_libs=${bootstrap_target_libs}target-libgomp,
 fi
 
-# If we are building libsanitizer, bootstrap it.
-if echo " ${target_configdirs} " | grep " libsanitizer " > /dev/null 2>&1 ; then
-  bootstrap_target_libs=${bootstrap_target_libs}target-libsanitizer,
-fi
-
 # Determine whether gdb needs tk/tcl or not.
 # Use 'maybe' since enable_gdbtk might be true even if tk isn't available
 # and in that case we want gdb to be built without tk.  Ugh!