[gcc-7] 09/354: - update another patch

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:50:21 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 d17e71e79e5c37dfd285652bd923fc0ce2d2ad19
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat Nov 12 12:10:39 2016 +0000

     - update another patch
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9049 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/pr65913-workaround.diff | 324 ++++++++++++++++++++++++++-------
 1 file changed, 263 insertions(+), 61 deletions(-)

diff --git a/debian/patches/pr65913-workaround.diff b/debian/patches/pr65913-workaround.diff
index 26c026c..4633dc9 100644
--- a/debian/patches/pr65913-workaround.diff
+++ b/debian/patches/pr65913-workaround.diff
@@ -1,8 +1,10 @@
 # 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
-@@ -264,6 +264,8 @@
+@@ -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;
@@ -11,7 +13,7 @@
    new_decoded_options = XNEWVEC (struct cl_decoded_option, num_args);
  
    i = 0;
-@@ -389,6 +391,17 @@
+@@ -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++]);
@@ -29,9 +31,11 @@
  
    *in_decoded_options_count = j;
    *in_decoded_options = new_decoded_options;
+Index: b/src/configure.ac
+===================================================================
 --- a/src/configure.ac
 +++ b/src/configure.ac
-@@ -2683,6 +2683,11 @@
+@@ -2612,6 +2612,11 @@ target_configdirs=`echo "${target_config
  build_configdirs=`echo "${build_configdirs}" | sed -e 's/build-//g'`
  bootstrap_fixincludes=no
  
@@ -43,7 +47,7 @@
  # 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,
-@@ -3389,7 +3394,7 @@
+@@ -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,
@@ -52,9 +56,11 @@
  		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
-@@ -166,7 +166,7 @@
+@@ -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; };
@@ -63,15 +69,15 @@
  
  // 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.
-@@ -549,6 +549,7 @@
- dependencies = { module=all-target-libjava; on=all-target-libffi; };
+@@ -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; };
-@@ -574,6 +575,9 @@
+@@ -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; };
@@ -81,9 +87,11 @@
  
  // Target modules in the 'src' repository.
  lang_env_dependencies = { module=libtermcap; };
+Index: b/src/Makefile.tpl
+===================================================================
 --- a/src/Makefile.tpl
 +++ b/src/Makefile.tpl
-@@ -240,11 +240,13 @@
+@@ -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++ \
@@ -97,9 +105,11 @@
  	  -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
-@@ -237,11 +237,13 @@
+@@ -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++ \
@@ -113,7 +123,7 @@
  	  -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
  	  -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs"; \
  	  export CXX; \
-@@ -1132,7 +1134,9 @@
+@@ -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
@@ -123,7 +133,17 @@
  
  # 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
-@@ -46810,7 +46814,6 @@
+@@ -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: 
@@ -131,7 +151,7 @@
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	echo "Checking multilib configuration for libatomic..."; \
-@@ -46848,8 +46851,279 @@
+@@ -51363,6 +51369,367 @@ configure-target-libatomic:
  
  
  
@@ -146,7 +166,7 @@
 +	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 ; \
++	$(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; \
@@ -162,8 +182,8 @@
 +	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 ; \
++	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) ;; \
@@ -178,7 +198,7 @@
 +	   \
 +	  $(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
@@ -190,7 +210,7 @@
 +	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 ; \
++	$(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; \
@@ -207,8 +227,8 @@
 +	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 ; \
++	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) ;; \
@@ -220,10 +240,10 @@
 +	  --srcdir=$${topdir}/$$module_srcdir \
 +	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 +	  --target=${target_alias} \
-+	   --with-build-libsubdir=$(HOST_SUBDIR)  \
++	  --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
@@ -235,7 +255,7 @@
 +	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 ; \
++	$(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; \
@@ -252,8 +272,8 @@
 +	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 ; \
++	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) ;; \
@@ -265,7 +285,7 @@
 +	  --srcdir=$${topdir}/$$module_srcdir \
 +	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 +	  --target=${target_alias} \
-+	   --with-build-libsubdir=$(HOST_SUBDIR)  \
++	  --with-build-libsubdir=$(HOST_SUBDIR) \
 +	  $(STAGE3_CONFIGURE_FLAGS)
 + at endif target-libatomic-bootstrap
 +
@@ -280,7 +300,7 @@
 +	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 ; \
++	$(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; \
@@ -297,8 +317,8 @@
 +	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 ; \
++	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) ;; \
@@ -310,7 +330,7 @@
 +	  --srcdir=$${topdir}/$$module_srcdir \
 +	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 +	  --target=${target_alias} \
-+	   --with-build-libsubdir=$(HOST_SUBDIR)  \
++	  --with-build-libsubdir=$(HOST_SUBDIR) \
 +	  $(STAGE4_CONFIGURE_FLAGS)
 + at endif target-libatomic-bootstrap
 +
@@ -325,7 +345,7 @@
 +	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 ; \
++	$(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; \
@@ -342,8 +362,8 @@
 +	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 ; \
++	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) ;; \
@@ -355,7 +375,7 @@
 +	  --srcdir=$${topdir}/$$module_srcdir \
 +	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 +	  --target=${target_alias} \
-+	   --with-build-libsubdir=$(HOST_SUBDIR)  \
++	  --with-build-libsubdir=$(HOST_SUBDIR) \
 +	  $(STAGEprofile_CONFIGURE_FLAGS)
 + at endif target-libatomic-bootstrap
 +
@@ -370,7 +390,7 @@
 +	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 ; \
++	$(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; \
@@ -387,8 +407,8 @@
 +	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 ; \
++	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) ;; \
@@ -400,18 +420,106 @@
 +	  --srcdir=$${topdir}/$$module_srcdir \
 +	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
 +	  --target=${target_alias} \
-+	   --with-build-libsubdir=$(HOST_SUBDIR)  \
++	  --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
- maybe-all-target-libatomic:
- @if gcc-bootstrap
-@@ -46859,7 +47133,6 @@
+@@ -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
@@ -419,7 +527,7 @@
  	@r=`${PWD_COMMAND}`; export r; \
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(NORMAL_TARGET_EXPORTS)  \
-@@ -46870,8 +47143,257 @@
+@@ -51385,6 +51751,345 @@ all-target-libatomic: configure-target-l
  
  
  
@@ -438,6 +546,7 @@
 +	TFLAGS="$(STAGE1_TFLAGS)"; \
 +	$(NORMAL_TARGET_EXPORTS)  \
 +	cd $(TARGET_SUBDIR)/libatomic && \
++	 \
 +	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 +		CFLAGS="$(CFLAGS_FOR_TARGET)" \
 +		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -447,9 +556,9 @@
 +		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
 +		$(EXTRA_TARGET_FLAGS)  \
 +		  \
-+		TFLAGS="$(STAGE1_TFLAGS)" \
++		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:
@@ -463,7 +572,7 @@
 +	$(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
@@ -481,6 +590,7 @@
 +	$(NORMAL_TARGET_EXPORTS) \
 +	  \
 +	cd $(TARGET_SUBDIR)/libatomic && \
++	 \
 +	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 +		CFLAGS="$(CFLAGS_FOR_TARGET)" \
 +		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -489,7 +599,7 @@
 +		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
 +		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
 +		$(EXTRA_TARGET_FLAGS)   \
-+		TFLAGS="$(STAGE2_TFLAGS)" \
++		TFLAGS="$(STAGE2_TFLAGS)"  \
 +		$(TARGET-stage2-target-libatomic)
 +
 +maybe-clean-stage2-target-libatomic: clean-stage2-target-libatomic
@@ -522,6 +632,7 @@
 +	$(NORMAL_TARGET_EXPORTS) \
 +	  \
 +	cd $(TARGET_SUBDIR)/libatomic && \
++	 \
 +	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 +		CFLAGS="$(CFLAGS_FOR_TARGET)" \
 +		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -530,7 +641,7 @@
 +		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
 +		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
 +		$(EXTRA_TARGET_FLAGS)   \
-+		TFLAGS="$(STAGE3_TFLAGS)" \
++		TFLAGS="$(STAGE3_TFLAGS)"  \
 +		$(TARGET-stage3-target-libatomic)
 +
 +maybe-clean-stage3-target-libatomic: clean-stage3-target-libatomic
@@ -563,6 +674,7 @@
 +	$(NORMAL_TARGET_EXPORTS) \
 +	  \
 +	cd $(TARGET_SUBDIR)/libatomic && \
++	 \
 +	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 +		CFLAGS="$(CFLAGS_FOR_TARGET)" \
 +		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -571,7 +683,7 @@
 +		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
 +		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
 +		$(EXTRA_TARGET_FLAGS)   \
-+		TFLAGS="$(STAGE4_TFLAGS)" \
++		TFLAGS="$(STAGE4_TFLAGS)"  \
 +		$(TARGET-stage4-target-libatomic)
 +
 +maybe-clean-stage4-target-libatomic: clean-stage4-target-libatomic
@@ -604,6 +716,7 @@
 +	$(NORMAL_TARGET_EXPORTS) \
 +	  \
 +	cd $(TARGET_SUBDIR)/libatomic && \
++	 \
 +	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 +		CFLAGS="$(CFLAGS_FOR_TARGET)" \
 +		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -612,7 +725,7 @@
 +		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
 +		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
 +		$(EXTRA_TARGET_FLAGS)   \
-+		TFLAGS="$(STAGEprofile_TFLAGS)" \
++		TFLAGS="$(STAGEprofile_TFLAGS)"  \
 +		$(TARGET-stageprofile-target-libatomic)
 +
 +maybe-clean-stageprofile-target-libatomic: clean-stageprofile-target-libatomic
@@ -645,6 +758,7 @@
 +	$(NORMAL_TARGET_EXPORTS) \
 +	  \
 +	cd $(TARGET_SUBDIR)/libatomic && \
++	 \
 +	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 +		CFLAGS="$(CFLAGS_FOR_TARGET)" \
 +		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -653,7 +767,7 @@
 +		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
 +		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
 +		$(EXTRA_TARGET_FLAGS)   \
-+		TFLAGS="$(STAGEfeedback_TFLAGS)" \
++		TFLAGS="$(STAGEfeedback_TFLAGS)"  \
 +		$(TARGET-stagefeedback-target-libatomic)
 +
 +maybe-clean-stagefeedback-target-libatomic: clean-stagefeedback-target-libatomic
@@ -670,16 +784,98 @@
 + 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
- maybe-check-target-libatomic:
- @if target-libatomic
-@@ -49508,7 +50030,12 @@
- configure-stageprofile-target-libgomp: maybe-all-stageprofile-gcc
- configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-gcc
+@@ -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
@@ -688,11 +884,13 @@
 +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
-@@ -50328,6 +50855,14 @@
- all-target-libjava: maybe-all-target-libffi
+@@ -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
@@ -703,10 +901,12 @@
 +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
-@@ -50377,6 +50912,9 @@
+@@ -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
@@ -716,16 +916,18 @@
  all-target-libgloss: maybe-all-target-newlib
  all-target-winsup: maybe-all-target-libtermcap
  configure-target-newlib: maybe-all-binutils
-@@ -50420,6 +50958,12 @@
- configure-stage4-target-libgomp: maybe-all-stage4-target-libgcc
- configure-stageprofile-target-libgomp: maybe-all-stageprofile-target-libgcc
+@@ -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

-- 
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