From: Thomas Koenig <tkoenig@gcc.gnu.org>
Date: Tue, 21 Aug 2018 20:17:38 +0000 (+0000)
Subject: Changelog-caf: New file.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ceb3bc68d357feb90ca5ec1b0e0bde295bb0c7c5;p=thirdparty%2Fgcc.git

Changelog-caf: New file.

2018-08-21  Thomas Koenig  <tkoenig@gcc.gnu.org>

        * Changelog-caf: New file.
        * Merged branch from r263319 to r263750.

From-SVN: r263753
---

ceb3bc68d357feb90ca5ec1b0e0bde295bb0c7c5
diff --cc ChangeLog-caf
index 000000000000,000000000000..87020d2d48cc
new file mode 100644
--- /dev/null
+++ b/ChangeLog-caf
@@@ -1,0 -1,0 +1,4 @@@
++2018-08-21  Thomas Koenig  <tkoenig@gcc.gnu.org>
++
++	* Changelog-caf: New file.
++	* Merged branch from r263319 to r263750.
diff --cc gcc/configure
index 80ac4a3d478a,b7a8e3643778..3270123c8be9
--- a/gcc/configure
+++ b/gcc/configure
@@@ -19731,20 -19731,20 +19731,20 @@@ if test -z "$aix_libpath"; then aix_lib
  	      prelink_cmds_CXX='tpldir=Template.dir~
  		rm -rf $tpldir~
  		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
--		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
++		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
  	      old_archive_cmds_CXX='tpldir=Template.dir~
  		rm -rf $tpldir~
  		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
--		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
++		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
  		$RANLIB $oldlib'
  	      archive_cmds_CXX='tpldir=Template.dir~
  		rm -rf $tpldir~
  		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  	      archive_expsym_cmds_CXX='tpldir=Template.dir~
  		rm -rf $tpldir~
  		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
  	      ;;
  	    *) # Version 6 and above use weak symbols
  	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
diff --cc libcc1/configure
index f53a121611cf,f53a121611cf..5740ca90cab9
--- a/libcc1/configure
+++ b/libcc1/configure
@@@ -12221,20 -12221,20 +12221,20 @@@ if test -z "$aix_libpath"; then aix_lib
  	      prelink_cmds_CXX='tpldir=Template.dir~
  		rm -rf $tpldir~
  		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
--		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
++		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
  	      old_archive_cmds_CXX='tpldir=Template.dir~
  		rm -rf $tpldir~
  		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
--		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
++		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
  		$RANLIB $oldlib'
  	      archive_cmds_CXX='tpldir=Template.dir~
  		rm -rf $tpldir~
  		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  	      archive_expsym_cmds_CXX='tpldir=Template.dir~
  		rm -rf $tpldir~
  		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
  	      ;;
  	    *) # Version 6 and above use weak symbols
  	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
diff --cc libsanitizer/config.h.in
index f716c2421cfc,f716c2421cfc..a64b6a16a177
--- a/libsanitizer/config.h.in
+++ b/libsanitizer/config.h.in
@@@ -40,12 -40,12 +40,12 @@@
  /* Define to 1 if you have the <link.h> header file. */
  #undef HAVE_LINK_H
  
--/* Define to 1 if you have the <memory.h> header file. */
--#undef HAVE_MEMORY_H
--
  /* Define to 1 if you have the `lstat' function. */
  #undef HAVE_LSTAT
  
++/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H
++
  /* Define to 1 if you have the `readlink' function. */
  #undef HAVE_READLINK
  
diff --cc libsanitizer/configure
index 5836450063d8,5836450063d8..31726c92f479
--- a/libsanitizer/configure
+++ b/libsanitizer/configure
@@@ -13308,20 -13308,20 +13308,20 @@@ if test -z "$aix_libpath"; then aix_lib
  	      prelink_cmds_CXX='tpldir=Template.dir~
  		rm -rf $tpldir~
  		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
--		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
++		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
  	      old_archive_cmds_CXX='tpldir=Template.dir~
  		rm -rf $tpldir~
  		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
--		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
++		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
  		$RANLIB $oldlib'
  	      archive_cmds_CXX='tpldir=Template.dir~
  		rm -rf $tpldir~
  		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  	      archive_expsym_cmds_CXX='tpldir=Template.dir~
  		rm -rf $tpldir~
  		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
  	      ;;
  	    *) # Version 6 and above use weak symbols
  	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
diff --cc libssp/Makefile.in
index e2a754008945,e2a754008945..71ef465dff11
--- a/libssp/Makefile.in
+++ b/libssp/Makefile.in
@@@ -61,7 -61,7 +61,9 @@@ DIST_COMMON = ChangeLog $(srcdir)/Makef
  	$(nobase_libsubinclude_HEADERS)
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
++	$(top_srcdir)/../config/cet.m4 \
  	$(top_srcdir)/../config/depstand.m4 \
++	$(top_srcdir)/../config/enable.m4 \
  	$(top_srcdir)/../config/lead-dot.m4 \
  	$(top_srcdir)/../config/lthostflags.m4 \
  	$(top_srcdir)/../config/multi.m4 \
@@@ -69,9 -69,9 +71,7 @@@
  	$(top_srcdir)/../config/override.m4 \
  	$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
  	$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
--	$(top_srcdir)/../lt~obsolete.m4 \
--	$(top_srcdir)/../config/enable.m4 \
--	$(top_srcdir)/../config/cet.m4 $(top_srcdir)/configure.ac
++	$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --cc libssp/aclocal.m4
index 7eeae0cf2a9a,7eeae0cf2a9a..2bf97b5d9b5d
--- a/libssp/aclocal.m4
+++ b/libssp/aclocal.m4
@@@ -989,7 -989,7 +989,9 @@@ AC_SUBST([am__untar]
  ]) # _AM_PROG_TAR
  
  m4_include([../config/acx.m4])
++m4_include([../config/cet.m4])
  m4_include([../config/depstand.m4])
++m4_include([../config/enable.m4])
  m4_include([../config/lead-dot.m4])
  m4_include([../config/lthostflags.m4])
  m4_include([../config/multi.m4])
@@@ -1000,5 -1000,5 +1002,3 @@@ m4_include([../ltoptions.m4]
  m4_include([../ltsugar.m4])
  m4_include([../ltversion.m4])
  m4_include([../lt~obsolete.m4])
--m4_include([../config/enable.m4])
--m4_include([../config/cet.m4])