[gcc-7] 41/354: * Drop the work around for PR libstdc++/65913.

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:50:28 UTC 2017


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit fed3c408ad6f5547dfd6c457a50d08501b213459
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Nov 22 23:49:45 2016 +0000

      * Drop the work around for PR libstdc++/65913.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9120 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                       |   1 +
 debian/patches/pr65913-workaround.diff | 933 ---------------------------------
 debian/rules.patch                     |   5 -
 3 files changed, 1 insertion(+), 938 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a438d0..72d82c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ gcc-7 (7-20161117-1) UNRELEASED; urgency=medium
   * Build the GC enabled libobjc using the system libgc when available
   * Mark libgphobos symbols changing with the file location (sic!) as optional.
   * Add pkg-config to the build dependencies.
+  * Drop the work around for PR libstdc++/65913.
 
   [ YunQiang Su ]
   * Update gnat patches for GCC 7, stop building libgnatvsn and libgnatprj.
diff --git a/debian/patches/pr65913-workaround.diff b/debian/patches/pr65913-workaround.diff
deleted file mode 100644
index 4633dc9..0000000
--- a/debian/patches/pr65913-workaround.diff
+++ /dev/null
@@ -1,933 +0,0 @@
-# DP: Work around PR c++/65913, link with -latomic (older than binutils 2.25)
-
-Index: b/src/gcc/cp/g++spec.c
-===================================================================
---- a/src/gcc/cp/g++spec.c
-+++ b/src/gcc/cp/g++spec.c
-@@ -263,6 +263,8 @@ lang_specific_driver (struct cl_decoded_
- 
-   /* Add one for shared_libgcc or extra static library.  */
-   num_args = argc + added + need_math + (library > 0) * 4 + 1;
-+  /* Link libatomic.  */
-+  num_args += 2;
-   new_decoded_options = XNEWVEC (struct cl_decoded_option, num_args);
- 
-   i = 0;
-@@ -388,6 +390,17 @@ lang_specific_driver (struct cl_decoded_
-   if (shared_libgcc && !static_link)
-     generate_option (OPT_shared_libgcc, NULL, 1, CL_DRIVER,
- 		     &new_decoded_options[j++]);
-+  if (library > 0)
-+    {
-+      /* Work around http://gcc.gnu.org/PR65913.  */
-+      generate_option (OPT_Wl_, "--as-needed", 1, CL_DRIVER,
-+		       &new_decoded_options[j]);
-+      j++;
-+      generate_option (OPT_l, "atomic", 1, CL_DRIVER,
-+		       &new_decoded_options[j]);
-+      added_libraries++;
-+      j++;
-+    }
- 
-   *in_decoded_options_count = j;
-   *in_decoded_options = new_decoded_options;
-Index: b/src/configure.ac
-===================================================================
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -2612,6 +2612,11 @@ target_configdirs=`echo "${target_config
- build_configdirs=`echo "${build_configdirs}" | sed -e 's/build-//g'`
- bootstrap_fixincludes=no
- 
-+# If we are building libatomic, bootstrap it.
-+if echo " ${target_configdirs} " | grep " libatomic " > /dev/null 2>&1 ; then
-+  bootstrap_target_libs=${bootstrap_target_libs}target-libatomic,
-+fi
-+
- # If we are building libgomp, bootstrap it.
- if echo " ${target_configdirs} " | grep " libgomp " > /dev/null 2>&1 ; then
-   bootstrap_target_libs=${bootstrap_target_libs}target-libgomp,
-@@ -3318,7 +3323,7 @@ GCC_TARGET_TOOL(as, AS_FOR_TARGET, AS, [
- GCC_TARGET_TOOL(cc, CC_FOR_TARGET, CC, [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
- dnl see comments for CXX_FOR_TARGET_FLAG_TO_PASS
- GCC_TARGET_TOOL(c++, CXX_FOR_TARGET, CXX,
--		[gcc/xg++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs],
-+		[gcc/xg++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libatomic/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs],
- 		c++)
- GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX,
- 		[gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs],
-Index: b/src/Makefile.def
-===================================================================
---- a/src/Makefile.def
-+++ b/src/Makefile.def
-@@ -171,7 +171,7 @@ target_modules = { module= rda; };
- target_modules = { module= libada; };
- target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
- target_modules = { module= libitm; lib_path=.libs; };
--target_modules = { module= libatomic; lib_path=.libs; };
-+target_modules = { module= libatomic; bootstrap= true; lib_path=.libs; };
- 
- // These are (some of) the make targets to be done in each subdirectory.
- // Not all; these are the ones which don't have special options.
-@@ -554,6 +554,7 @@ dependencies = { module=all-target-libgo
- dependencies = { module=all-target-libgo; on=all-target-libatomic; };
- 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-libatomic; };
- dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; };
- dependencies = { module=configure-target-liboffloadmic; on=configure-target-libgomp; };
- dependencies = { module=configure-target-libsanitizer; on=all-target-libstdc++-v3; };
-@@ -578,6 +579,9 @@ dependencies = { module=install-target-l
- dependencies = { module=install-target-libitm; on=install-target-libgcc; };
- dependencies = { module=install-target-libobjc; on=install-target-libgcc; };
- dependencies = { module=install-target-libstdc++-v3; on=install-target-libgcc; };
-+dependencies = { module=install-target-libstdc++-v3; on=install-target-libatomic; };
-+dependencies = { module=install-target-libcc1; on=install-target-libstdc++-v3; };
-+dependencies = { module=install-target-libcc1; on=install-target-libatomic; };
- 
- // Target modules in the 'src' repository.
- lang_env_dependencies = { module=libtermcap; };
-Index: b/src/Makefile.tpl
-===================================================================
---- a/src/Makefile.tpl
-+++ b/src/Makefile.tpl
-@@ -242,11 +242,13 @@ POSTSTAGE1_CXX_EXPORT = \
- POSTSTAGE1_CXX_EXPORT = \
- 	CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xg++$(exeext) \
- 	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \
-+	  -B$$r/prev-$(TARGET_SUBDIR)/libatomic/.libs \
- 	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
- 	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
- 	  `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \
- 	  `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \
- 	  `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$s/libstdc++-v3/libsupc++ \
-+	  -L$$r/prev-$(TARGET_SUBDIR)/libatomic/.libs \
- 	  -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
- 	  -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs"; \
- 	  export CXX; \
-Index: b/src/Makefile.in
-===================================================================
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -239,11 +239,13 @@ POSTSTAGE1_CXX_EXPORT = \
- POSTSTAGE1_CXX_EXPORT = \
- 	CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xg++$(exeext) \
- 	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \
-+	  -B$$r/prev-$(TARGET_SUBDIR)/libatomic/.libs \
- 	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
- 	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
- 	  `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \
- 	  `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \
- 	  `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$s/libstdc++-v3/libsupc++ \
-+	  -L$$r/prev-$(TARGET_SUBDIR)/libatomic/.libs \
- 	  -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
- 	  -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs"; \
- 	  export CXX; \
-@@ -1179,7 +1181,9 @@ all-target: maybe-all-target-libada
- all-target: maybe-all-target-libgomp
- @endif target-libgomp-no-bootstrap
- all-target: maybe-all-target-libitm
-+ at if target-libatomic-no-bootstrap
- all-target: maybe-all-target-libatomic
-+ at endif target-libatomic-no-bootstrap
- 
- # Do a target for all the subdirectories.  A ``make do-X'' will do a
- # ``make X'' in all subdirectories (because, in general, there is a
-@@ -47871,6 +47875,9 @@ maintainer-clean-target-libffi:
- @endif target-libffi
- 
- 
-+
-+
-+
- .PHONY: configure-target-zlib maybe-configure-target-zlib
- maybe-configure-target-zlib:
- @if gcc-bootstrap
-@@ -51325,7 +51332,6 @@ configure-target-libatomic: stage_curren
- @if target-libatomic
- maybe-configure-target-libatomic: configure-target-libatomic
- configure-target-libatomic: 
--	@: $(MAKE); $(unstage)
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	echo "Checking multilib configuration for libatomic..."; \
-@@ -51363,6 +51369,367 @@ configure-target-libatomic:
- 
- 
- 
-+.PHONY: configure-stage1-target-libatomic maybe-configure-stage1-target-libatomic
-+maybe-configure-stage1-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-configure-stage1-target-libatomic: configure-stage1-target-libatomic
-+configure-stage1-target-libatomic:
-+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGE1_TFLAGS)"; \
-+	echo "Checking multilib configuration for libatomic..."; \
-+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libatomic/multilib.tmp 2> /dev/null; \
-+	if test -r $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	  if cmp -s $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/multilib.tmp; \
-+	  else \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/Makefile; \
-+	    mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	  fi; \
-+	else \
-+	  mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	fi; \
-+	test ! -f $(TARGET_SUBDIR)/libatomic/Makefile || exit 0; \
-+	$(NORMAL_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)/libatomic; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic; \
-+	cd $(TARGET_SUBDIR)/libatomic || exit 1; \
-+	case $(srcdir) in \
-+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+	  *) topdir=`echo $(TARGET_SUBDIR)/libatomic/ | \
-+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+	esac; \
-+	module_srcdir=libatomic; \
-+	$(SHELL) $$s/$$module_srcdir/configure \
-+	  --srcdir=$${topdir}/$$module_srcdir \
-+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-+	  --target=${target_alias} \
-+	   \
-+	  $(STAGE1_CONFIGURE_FLAGS)
-+ at endif target-libatomic-bootstrap
-+
-+.PHONY: configure-stage2-target-libatomic maybe-configure-stage2-target-libatomic
-+maybe-configure-stage2-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-configure-stage2-target-libatomic: configure-stage2-target-libatomic
-+configure-stage2-target-libatomic:
-+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGE2_TFLAGS)"; \
-+	echo "Checking multilib configuration for libatomic..."; \
-+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libatomic/multilib.tmp 2> /dev/null; \
-+	if test -r $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	  if cmp -s $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/multilib.tmp; \
-+	  else \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/Makefile; \
-+	    mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	  fi; \
-+	else \
-+	  mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	fi; \
-+	test ! -f $(TARGET_SUBDIR)/libatomic/Makefile || exit 0; \
-+	$(NORMAL_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)/libatomic; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic; \
-+	cd $(TARGET_SUBDIR)/libatomic || exit 1; \
-+	case $(srcdir) in \
-+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+	  *) topdir=`echo $(TARGET_SUBDIR)/libatomic/ | \
-+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+	esac; \
-+	module_srcdir=libatomic; \
-+	$(SHELL) $$s/$$module_srcdir/configure \
-+	  --srcdir=$${topdir}/$$module_srcdir \
-+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-+	  --target=${target_alias} \
-+	  --with-build-libsubdir=$(HOST_SUBDIR) \
-+	  $(STAGE2_CONFIGURE_FLAGS)
-+ at endif target-libatomic-bootstrap
-+
-+.PHONY: configure-stage3-target-libatomic maybe-configure-stage3-target-libatomic
-+maybe-configure-stage3-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-configure-stage3-target-libatomic: configure-stage3-target-libatomic
-+configure-stage3-target-libatomic:
-+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGE3_TFLAGS)"; \
-+	echo "Checking multilib configuration for libatomic..."; \
-+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libatomic/multilib.tmp 2> /dev/null; \
-+	if test -r $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	  if cmp -s $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/multilib.tmp; \
-+	  else \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/Makefile; \
-+	    mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	  fi; \
-+	else \
-+	  mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	fi; \
-+	test ! -f $(TARGET_SUBDIR)/libatomic/Makefile || exit 0; \
-+	$(NORMAL_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)/libatomic; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic; \
-+	cd $(TARGET_SUBDIR)/libatomic || exit 1; \
-+	case $(srcdir) in \
-+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+	  *) topdir=`echo $(TARGET_SUBDIR)/libatomic/ | \
-+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+	esac; \
-+	module_srcdir=libatomic; \
-+	$(SHELL) $$s/$$module_srcdir/configure \
-+	  --srcdir=$${topdir}/$$module_srcdir \
-+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-+	  --target=${target_alias} \
-+	  --with-build-libsubdir=$(HOST_SUBDIR) \
-+	  $(STAGE3_CONFIGURE_FLAGS)
-+ at endif target-libatomic-bootstrap
-+
-+.PHONY: configure-stage4-target-libatomic maybe-configure-stage4-target-libatomic
-+maybe-configure-stage4-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-configure-stage4-target-libatomic: configure-stage4-target-libatomic
-+configure-stage4-target-libatomic:
-+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGE4_TFLAGS)"; \
-+	echo "Checking multilib configuration for libatomic..."; \
-+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libatomic/multilib.tmp 2> /dev/null; \
-+	if test -r $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	  if cmp -s $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/multilib.tmp; \
-+	  else \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/Makefile; \
-+	    mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	  fi; \
-+	else \
-+	  mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	fi; \
-+	test ! -f $(TARGET_SUBDIR)/libatomic/Makefile || exit 0; \
-+	$(NORMAL_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)/libatomic; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic; \
-+	cd $(TARGET_SUBDIR)/libatomic || exit 1; \
-+	case $(srcdir) in \
-+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+	  *) topdir=`echo $(TARGET_SUBDIR)/libatomic/ | \
-+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+	esac; \
-+	module_srcdir=libatomic; \
-+	$(SHELL) $$s/$$module_srcdir/configure \
-+	  --srcdir=$${topdir}/$$module_srcdir \
-+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-+	  --target=${target_alias} \
-+	  --with-build-libsubdir=$(HOST_SUBDIR) \
-+	  $(STAGE4_CONFIGURE_FLAGS)
-+ at endif target-libatomic-bootstrap
-+
-+.PHONY: configure-stageprofile-target-libatomic maybe-configure-stageprofile-target-libatomic
-+maybe-configure-stageprofile-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-configure-stageprofile-target-libatomic: configure-stageprofile-target-libatomic
-+configure-stageprofile-target-libatomic:
-+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
-+	echo "Checking multilib configuration for libatomic..."; \
-+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libatomic/multilib.tmp 2> /dev/null; \
-+	if test -r $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	  if cmp -s $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/multilib.tmp; \
-+	  else \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/Makefile; \
-+	    mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	  fi; \
-+	else \
-+	  mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	fi; \
-+	test ! -f $(TARGET_SUBDIR)/libatomic/Makefile || exit 0; \
-+	$(NORMAL_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)/libatomic; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic; \
-+	cd $(TARGET_SUBDIR)/libatomic || exit 1; \
-+	case $(srcdir) in \
-+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+	  *) topdir=`echo $(TARGET_SUBDIR)/libatomic/ | \
-+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+	esac; \
-+	module_srcdir=libatomic; \
-+	$(SHELL) $$s/$$module_srcdir/configure \
-+	  --srcdir=$${topdir}/$$module_srcdir \
-+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-+	  --target=${target_alias} \
-+	  --with-build-libsubdir=$(HOST_SUBDIR) \
-+	  $(STAGEprofile_CONFIGURE_FLAGS)
-+ at endif target-libatomic-bootstrap
-+
-+.PHONY: configure-stagefeedback-target-libatomic maybe-configure-stagefeedback-target-libatomic
-+maybe-configure-stagefeedback-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-configure-stagefeedback-target-libatomic: configure-stagefeedback-target-libatomic
-+configure-stagefeedback-target-libatomic:
-+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-+	echo "Checking multilib configuration for libatomic..."; \
-+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libatomic/multilib.tmp 2> /dev/null; \
-+	if test -r $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	  if cmp -s $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/multilib.tmp; \
-+	  else \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/Makefile; \
-+	    mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	  fi; \
-+	else \
-+	  mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	fi; \
-+	test ! -f $(TARGET_SUBDIR)/libatomic/Makefile || exit 0; \
-+	$(NORMAL_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)/libatomic; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic; \
-+	cd $(TARGET_SUBDIR)/libatomic || exit 1; \
-+	case $(srcdir) in \
-+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+	  *) topdir=`echo $(TARGET_SUBDIR)/libatomic/ | \
-+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+	esac; \
-+	module_srcdir=libatomic; \
-+	$(SHELL) $$s/$$module_srcdir/configure \
-+	  --srcdir=$${topdir}/$$module_srcdir \
-+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-+	  --target=${target_alias} \
-+	  --with-build-libsubdir=$(HOST_SUBDIR) \
-+	  $(STAGEfeedback_CONFIGURE_FLAGS)
-+ at endif target-libatomic-bootstrap
-+
-+.PHONY: configure-stageautoprofile-target-libatomic maybe-configure-stageautoprofile-target-libatomic
-+maybe-configure-stageautoprofile-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-configure-stageautoprofile-target-libatomic: configure-stageautoprofile-target-libatomic
-+configure-stageautoprofile-target-libatomic:
-+	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-+	echo "Checking multilib configuration for libatomic..."; \
-+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libatomic/multilib.tmp 2> /dev/null; \
-+	if test -r $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	  if cmp -s $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/multilib.tmp; \
-+	  else \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/Makefile; \
-+	    mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	  fi; \
-+	else \
-+	  mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	fi; \
-+	test ! -f $(TARGET_SUBDIR)/libatomic/Makefile || exit 0; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	 \
-+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-+	echo Configuring stage autoprofile in $(TARGET_SUBDIR)/libatomic; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic; \
-+	cd $(TARGET_SUBDIR)/libatomic || exit 1; \
-+	case $(srcdir) in \
-+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+	  *) topdir=`echo $(TARGET_SUBDIR)/libatomic/ | \
-+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+	esac; \
-+	module_srcdir=libatomic; \
-+	$(SHELL) $$s/$$module_srcdir/configure \
-+	  --srcdir=$${topdir}/$$module_srcdir \
-+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-+	  --target=${target_alias} \
-+	  --with-build-libsubdir=$(HOST_SUBDIR) \
-+	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-+ at endif target-libatomic-bootstrap
-+
-+.PHONY: configure-stageautofeedback-target-libatomic maybe-configure-stageautofeedback-target-libatomic
-+maybe-configure-stageautofeedback-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-configure-stageautofeedback-target-libatomic: configure-stageautofeedback-target-libatomic
-+configure-stageautofeedback-target-libatomic:
-+	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-+	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-+	echo "Checking multilib configuration for libatomic..."; \
-+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libatomic/multilib.tmp 2> /dev/null; \
-+	if test -r $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	  if cmp -s $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; then \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/multilib.tmp; \
-+	  else \
-+	    rm -f $(TARGET_SUBDIR)/libatomic/Makefile; \
-+	    mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	  fi; \
-+	else \
-+	  mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \
-+	fi; \
-+	test ! -f $(TARGET_SUBDIR)/libatomic/Makefile || exit 0; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	 \
-+	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-+	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-+	echo Configuring stage autofeedback in $(TARGET_SUBDIR)/libatomic; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic; \
-+	cd $(TARGET_SUBDIR)/libatomic || exit 1; \
-+	case $(srcdir) in \
-+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+	  *) topdir=`echo $(TARGET_SUBDIR)/libatomic/ | \
-+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+	esac; \
-+	module_srcdir=libatomic; \
-+	$(SHELL) $$s/$$module_srcdir/configure \
-+	  --srcdir=$${topdir}/$$module_srcdir \
-+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-+	  --target=${target_alias} \
-+	  --with-build-libsubdir=$(HOST_SUBDIR) \
-+	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-+ at endif target-libatomic-bootstrap
-+
-+
-+
- 
- 
- .PHONY: all-target-libatomic maybe-all-target-libatomic
-@@ -51374,7 +51741,6 @@ all-target-libatomic: stage_current
- TARGET-target-libatomic=all
- maybe-all-target-libatomic: all-target-libatomic
- all-target-libatomic: configure-target-libatomic
--	@: $(MAKE); $(unstage)
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS)  \
-@@ -51385,6 +51751,345 @@ all-target-libatomic: configure-target-l
- 
- 
- 
-+.PHONY: all-stage1-target-libatomic maybe-all-stage1-target-libatomic
-+.PHONY: clean-stage1-target-libatomic maybe-clean-stage1-target-libatomic
-+maybe-all-stage1-target-libatomic:
-+maybe-clean-stage1-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-all-stage1-target-libatomic: all-stage1-target-libatomic
-+all-stage1: all-stage1-target-libatomic
-+TARGET-stage1-target-libatomic = $(TARGET-target-libatomic)
-+all-stage1-target-libatomic: configure-stage1-target-libatomic
-+	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGE1_TFLAGS)"; \
-+	$(NORMAL_TARGET_EXPORTS)  \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	 \
-+	$(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)  \
-+		  \
-+		TFLAGS="$(STAGE1_TFLAGS)"  \
-+		$(TARGET-stage1-target-libatomic)
-+
-+maybe-clean-stage1-target-libatomic: clean-stage1-target-libatomic
-+clean-stage1: clean-stage1-target-libatomic
-+clean-stage1-target-libatomic:
-+	@if [ $(current_stage) = stage1 ]; then \
-+	  [ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
-+	else \
-+	  [ -f $(TARGET_SUBDIR)/stage1-libatomic/Makefile ] || exit 0; \
-+	  $(MAKE) stage1-start; \
-+	fi; \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
-+	  clean
-+ at endif target-libatomic-bootstrap
-+
-+
-+.PHONY: all-stage2-target-libatomic maybe-all-stage2-target-libatomic
-+.PHONY: clean-stage2-target-libatomic maybe-clean-stage2-target-libatomic
-+maybe-all-stage2-target-libatomic:
-+maybe-clean-stage2-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-all-stage2-target-libatomic: all-stage2-target-libatomic
-+all-stage2: all-stage2-target-libatomic
-+TARGET-stage2-target-libatomic = $(TARGET-target-libatomic)
-+all-stage2-target-libatomic: configure-stage2-target-libatomic
-+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGE2_TFLAGS)"; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	  \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	 \
-+	$(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)   \
-+		TFLAGS="$(STAGE2_TFLAGS)"  \
-+		$(TARGET-stage2-target-libatomic)
-+
-+maybe-clean-stage2-target-libatomic: clean-stage2-target-libatomic
-+clean-stage2: clean-stage2-target-libatomic
-+clean-stage2-target-libatomic:
-+	@if [ $(current_stage) = stage2 ]; then \
-+	  [ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
-+	else \
-+	  [ -f $(TARGET_SUBDIR)/stage2-libatomic/Makefile ] || exit 0; \
-+	  $(MAKE) stage2-start; \
-+	fi; \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-+ at endif target-libatomic-bootstrap
-+
-+
-+.PHONY: all-stage3-target-libatomic maybe-all-stage3-target-libatomic
-+.PHONY: clean-stage3-target-libatomic maybe-clean-stage3-target-libatomic
-+maybe-all-stage3-target-libatomic:
-+maybe-clean-stage3-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-all-stage3-target-libatomic: all-stage3-target-libatomic
-+all-stage3: all-stage3-target-libatomic
-+TARGET-stage3-target-libatomic = $(TARGET-target-libatomic)
-+all-stage3-target-libatomic: configure-stage3-target-libatomic
-+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGE3_TFLAGS)"; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	  \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	 \
-+	$(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)   \
-+		TFLAGS="$(STAGE3_TFLAGS)"  \
-+		$(TARGET-stage3-target-libatomic)
-+
-+maybe-clean-stage3-target-libatomic: clean-stage3-target-libatomic
-+clean-stage3: clean-stage3-target-libatomic
-+clean-stage3-target-libatomic:
-+	@if [ $(current_stage) = stage3 ]; then \
-+	  [ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
-+	else \
-+	  [ -f $(TARGET_SUBDIR)/stage3-libatomic/Makefile ] || exit 0; \
-+	  $(MAKE) stage3-start; \
-+	fi; \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-+ at endif target-libatomic-bootstrap
-+
-+
-+.PHONY: all-stage4-target-libatomic maybe-all-stage4-target-libatomic
-+.PHONY: clean-stage4-target-libatomic maybe-clean-stage4-target-libatomic
-+maybe-all-stage4-target-libatomic:
-+maybe-clean-stage4-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-all-stage4-target-libatomic: all-stage4-target-libatomic
-+all-stage4: all-stage4-target-libatomic
-+TARGET-stage4-target-libatomic = $(TARGET-target-libatomic)
-+all-stage4-target-libatomic: configure-stage4-target-libatomic
-+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGE4_TFLAGS)"; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	  \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	 \
-+	$(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)   \
-+		TFLAGS="$(STAGE4_TFLAGS)"  \
-+		$(TARGET-stage4-target-libatomic)
-+
-+maybe-clean-stage4-target-libatomic: clean-stage4-target-libatomic
-+clean-stage4: clean-stage4-target-libatomic
-+clean-stage4-target-libatomic:
-+	@if [ $(current_stage) = stage4 ]; then \
-+	  [ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
-+	else \
-+	  [ -f $(TARGET_SUBDIR)/stage4-libatomic/Makefile ] || exit 0; \
-+	  $(MAKE) stage4-start; \
-+	fi; \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-+ at endif target-libatomic-bootstrap
-+
-+
-+.PHONY: all-stageprofile-target-libatomic maybe-all-stageprofile-target-libatomic
-+.PHONY: clean-stageprofile-target-libatomic maybe-clean-stageprofile-target-libatomic
-+maybe-all-stageprofile-target-libatomic:
-+maybe-clean-stageprofile-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-all-stageprofile-target-libatomic: all-stageprofile-target-libatomic
-+all-stageprofile: all-stageprofile-target-libatomic
-+TARGET-stageprofile-target-libatomic = $(TARGET-target-libatomic)
-+all-stageprofile-target-libatomic: configure-stageprofile-target-libatomic
-+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGEprofile_TFLAGS)"; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	  \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	 \
-+	$(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)   \
-+		TFLAGS="$(STAGEprofile_TFLAGS)"  \
-+		$(TARGET-stageprofile-target-libatomic)
-+
-+maybe-clean-stageprofile-target-libatomic: clean-stageprofile-target-libatomic
-+clean-stageprofile: clean-stageprofile-target-libatomic
-+clean-stageprofile-target-libatomic:
-+	@if [ $(current_stage) = stageprofile ]; then \
-+	  [ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
-+	else \
-+	  [ -f $(TARGET_SUBDIR)/stageprofile-libatomic/Makefile ] || exit 0; \
-+	  $(MAKE) stageprofile-start; \
-+	fi; \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-+ at endif target-libatomic-bootstrap
-+
-+
-+.PHONY: all-stagefeedback-target-libatomic maybe-all-stagefeedback-target-libatomic
-+.PHONY: clean-stagefeedback-target-libatomic maybe-clean-stagefeedback-target-libatomic
-+maybe-all-stagefeedback-target-libatomic:
-+maybe-clean-stagefeedback-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-all-stagefeedback-target-libatomic: all-stagefeedback-target-libatomic
-+all-stagefeedback: all-stagefeedback-target-libatomic
-+TARGET-stagefeedback-target-libatomic = $(TARGET-target-libatomic)
-+all-stagefeedback-target-libatomic: configure-stagefeedback-target-libatomic
-+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGEfeedback_TFLAGS)"; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	  \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	 \
-+	$(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)   \
-+		TFLAGS="$(STAGEfeedback_TFLAGS)"  \
-+		$(TARGET-stagefeedback-target-libatomic)
-+
-+maybe-clean-stagefeedback-target-libatomic: clean-stagefeedback-target-libatomic
-+clean-stagefeedback: clean-stagefeedback-target-libatomic
-+clean-stagefeedback-target-libatomic:
-+	@if [ $(current_stage) = stagefeedback ]; then \
-+	  [ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
-+	else \
-+	  [ -f $(TARGET_SUBDIR)/stagefeedback-libatomic/Makefile ] || exit 0; \
-+	  $(MAKE) stagefeedback-start; \
-+	fi; \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-+ at endif target-libatomic-bootstrap
-+
-+
-+.PHONY: all-stageautoprofile-target-libatomic maybe-all-stageautoprofile-target-libatomic
-+.PHONY: clean-stageautoprofile-target-libatomic maybe-clean-stageautoprofile-target-libatomic
-+maybe-all-stageautoprofile-target-libatomic:
-+maybe-clean-stageautoprofile-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-all-stageautoprofile-target-libatomic: all-stageautoprofile-target-libatomic
-+all-stageautoprofile: all-stageautoprofile-target-libatomic
-+TARGET-stageautoprofile-target-libatomic = $(TARGET-target-libatomic)
-+all-stageautoprofile-target-libatomic: configure-stageautoprofile-target-libatomic
-+	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	  \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-+	$(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)   \
-+		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-+		$(TARGET-stageautoprofile-target-libatomic)
-+
-+maybe-clean-stageautoprofile-target-libatomic: clean-stageautoprofile-target-libatomic
-+clean-stageautoprofile: clean-stageautoprofile-target-libatomic
-+clean-stageautoprofile-target-libatomic:
-+	@if [ $(current_stage) = stageautoprofile ]; then \
-+	  [ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
-+	else \
-+	  [ -f $(TARGET_SUBDIR)/stageautoprofile-libatomic/Makefile ] || exit 0; \
-+	  $(MAKE) stageautoprofile-start; \
-+	fi; \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-+ at endif target-libatomic-bootstrap
-+
-+
-+.PHONY: all-stageautofeedback-target-libatomic maybe-all-stageautofeedback-target-libatomic
-+.PHONY: clean-stageautofeedback-target-libatomic maybe-clean-stageautofeedback-target-libatomic
-+maybe-all-stageautofeedback-target-libatomic:
-+maybe-clean-stageautofeedback-target-libatomic:
-+ at if target-libatomic-bootstrap
-+maybe-all-stageautofeedback-target-libatomic: all-stageautofeedback-target-libatomic
-+all-stageautofeedback: all-stageautofeedback-target-libatomic
-+TARGET-stageautofeedback-target-libatomic = $(TARGET-target-libatomic)
-+all-stageautofeedback-target-libatomic: configure-stageautofeedback-target-libatomic
-+	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	  \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	 \
-+	$(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)   \
-+		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-+		$(TARGET-stageautofeedback-target-libatomic)
-+
-+maybe-clean-stageautofeedback-target-libatomic: clean-stageautofeedback-target-libatomic
-+clean-stageautofeedback: clean-stageautofeedback-target-libatomic
-+clean-stageautofeedback-target-libatomic:
-+	@if [ $(current_stage) = stageautofeedback ]; then \
-+	  [ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \
-+	else \
-+	  [ -f $(TARGET_SUBDIR)/stageautofeedback-libatomic/Makefile ] || exit 0; \
-+	  $(MAKE) stageautofeedback-start; \
-+	fi; \
-+	cd $(TARGET_SUBDIR)/libatomic && \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-+ at endif target-libatomic-bootstrap
-+
-+
-+
-+
- 
- 
- .PHONY: check-target-libatomic maybe-check-target-libatomic
-@@ -54757,7 +55462,14 @@ configure-stagefeedback-target-libgomp:
- configure-stageautoprofile-target-libgomp: maybe-all-stageautoprofile-gcc
- configure-stageautofeedback-target-libgomp: maybe-all-stageautofeedback-gcc
- configure-target-libitm: stage_last
--configure-target-libatomic: stage_last
-+configure-stage1-target-libatomic: maybe-all-stage1-gcc
-+configure-stage2-target-libatomic: maybe-all-stage2-gcc
-+configure-stage3-target-libatomic: maybe-all-stage3-gcc
-+configure-stage4-target-libatomic: maybe-all-stage4-gcc
-+configure-stageprofile-target-libatomic: maybe-all-stageprofile-gcc
-+configure-stagefeedback-target-libatomic: maybe-all-stagefeedback-gcc
-+configure-stageautoprofile-target-libatomic: maybe-all-stageautoprofile-gcc
-+configure-stageautofeedback-target-libatomic: maybe-all-stageautofeedback-gcc
- @endif gcc-bootstrap
- 
- @if gcc-no-bootstrap
-@@ -55805,6 +56517,16 @@ all-target-libgo: maybe-all-target-libff
- all-target-libgo: maybe-all-target-libatomic
- configure-target-libobjc: maybe-configure-target-boehm-gc
- all-target-libobjc: maybe-all-target-boehm-gc
-+configure-target-libstdc++-v3: maybe-configure-target-libatomic
-+
-+configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libatomic
-+configure-stage2-target-libstdc++-v3: maybe-configure-stage2-target-libatomic
-+configure-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libatomic
-+configure-stage4-target-libstdc++-v3: maybe-configure-stage4-target-libatomic
-+configure-stageprofile-target-libstdc++-v3: maybe-configure-stageprofile-target-libatomic
-+configure-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libatomic
-+configure-stageautoprofile-target-libstdc++-v3: maybe-configure-stageautoprofile-target-libatomic
-+configure-stageautofeedback-target-libstdc++-v3: maybe-configure-stageautofeedback-target-libatomic
- configure-target-libstdc++-v3: maybe-configure-target-libgomp
- 
- configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
-@@ -55861,6 +56583,9 @@ install-target-liboffloadmic: maybe-inst
- install-target-libitm: maybe-install-target-libgcc
- install-target-libobjc: maybe-install-target-libgcc
- install-target-libstdc++-v3: maybe-install-target-libgcc
-+install-target-libstdc++-v3: maybe-install-target-libatomic
-+install-target-libcc1: maybe-install-target-libstdc++-v3
-+install-target-libcc1: maybe-install-target-libatomic
- all-target-libgloss: maybe-all-target-newlib
- all-target-winsup: maybe-all-target-libtermcap
- configure-target-newlib: maybe-all-binutils
-@@ -55915,6 +56640,14 @@ configure-stageprofile-target-libgomp: m
- configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-target-libgcc
- configure-stageautoprofile-target-libgomp: maybe-all-stageautoprofile-target-libgcc
- configure-stageautofeedback-target-libgomp: maybe-all-stageautofeedback-target-libgcc
-+configure-stage1-target-libatomic: maybe-all-stage1-target-libgcc
-+configure-stage2-target-libatomic: maybe-all-stage2-target-libgcc
-+configure-stage3-target-libatomic: maybe-all-stage3-target-libgcc
-+configure-stage4-target-libatomic: maybe-all-stage4-target-libgcc
-+configure-stageprofile-target-libatomic: maybe-all-stageprofile-target-libgcc
-+configure-stagefeedback-target-libatomic: maybe-all-stagefeedback-target-libgcc
-+configure-stageautoprofile-target-libatomic: maybe-all-stageautoprofile-target-libgcc
-+configure-stageautofeedback-target-libatomic: maybe-all-stageautofeedback-target-libgcc
- @endif gcc-bootstrap
- 
- @if gcc-no-bootstrap
diff --git a/debian/rules.patch b/debian/rules.patch
index a163b27..a469997 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -74,11 +74,6 @@ debian_patches += \
 	libffi-race-condition \
 
 
-# this is still needed on powerpc, e.g. firefox and insighttoolkit4 will ftbfs.
-ifneq (,$(filter $(DEB_TARGET_ARCH),powerpc))
-  debian_patches += pr65913-workaround
-endif
-
 ifeq ($(libstdcxx_abi),new)
   debian_patches += libstdc++-functexcept
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git



More information about the Reproducible-commits mailing list