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

diff --cc ChangeLog-caf
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..87020d2d48ccb5f505ac054c180f151b56612379
new file mode 100644 (file)
--- /dev/null
--- /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 80ac4a3d478a01dce5d362d64ca50a79254a4e20,b7a8e3643778b1f04286b21ffe682bcd62e86acb..3270123c8be95d9ddedafd11ed3b343a618197b4
--- 1/gcc/configure
--- 2/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 f53a121611cfef36656da743374795d1e5431677,f53a121611cfef36656da743374795d1e5431677..5740ca90cab9751cd732b08a0614a2b19293088e
--- 1/libcc1/configure
--- 2/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 f716c2421cfcc0569e5bfe7fb24d644fd9a10681,f716c2421cfcc0569e5bfe7fb24d644fd9a10681..a64b6a16a1774a2297b3dafe487fdeb3dd378430
--- 1/libsanitizer/config.h.in
--- 2/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 5836450063d8b77ec00a2ddb52aa4df8a1aa99e0,5836450063d8b77ec00a2ddb52aa4df8a1aa99e0..31726c92f4797e0bad1e17154ea44f89d28a82e9
--- 1/libsanitizer/configure
--- 2/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 e2a754008945fd9e3c0127ea72b6217effb03c4d,e2a754008945fd9e3c0127ea72b6217effb03c4d..71ef465dff1155270a98af2f2b00d5f5c7f12cc0
--- 1/libssp/Makefile.in
--- 2/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 7eeae0cf2a9a312205134d38a555560f25b4b511,7eeae0cf2a9a312205134d38a555560f25b4b511..2bf97b5d9b5d7ded7acff85a935705d3ba84356f
--- 1/libssp/aclocal.m4
--- 2/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])