diff options
| author | Martin Liska <mliska@suse.cz> | 2019-11-05 14:55:17 +0100 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2019-11-05 13:55:17 +0000 |
| commit | 617be04ad7806882245d659319a6d8aa9e5ec1d3 (patch) | |
| tree | 113069e1807008a2954e7793e9359874bc81cf82 /libsanitizer | |
| parent | 3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8 (diff) | |
Update Makefile.am.
2019-11-05 Martin Liska <mliska@suse.cz>
* tsan/Makefile.am: Rename tsan_interceptors.cpp to
tsan_interceptors_posix.
* tsan/Makefile.in: Regenerate.
From-SVN: r277835
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 6 | ||||
| -rw-r--r-- | libsanitizer/tsan/Makefile.am | 2 | ||||
| -rw-r--r-- | libsanitizer/tsan/Makefile.in | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 3a926394b73..7dee22c19bd 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,5 +1,11 @@ 2019-11-05 Martin Liska <mliska@suse.cz> + * tsan/Makefile.am: Rename tsan_interceptors.cpp to + tsan_interceptors_posix. + * tsan/Makefile.in: Regenerate. + +2019-11-05 Martin Liska <mliska@suse.cz> + * all source files: Merge from upstream r375507. 2019-10-22 Tamar Christina <tamar.christina@arm.com> diff --git a/libsanitizer/tsan/Makefile.am b/libsanitizer/tsan/Makefile.am index 1ca9b68a3c5..5d37abd20de 100644 --- a/libsanitizer/tsan/Makefile.am +++ b/libsanitizer/tsan/Makefile.am @@ -20,7 +20,7 @@ tsan_files = \ tsan_fd.cpp \ tsan_flags.cpp \ tsan_ignoreset.cpp \ - tsan_interceptors.cpp \ + tsan_interceptors_posix.cpp \ tsan_interceptors_mac.cpp \ tsan_interface_ann.cpp \ tsan_interface_atomic.cpp \ diff --git a/libsanitizer/tsan/Makefile.in b/libsanitizer/tsan/Makefile.in index cae00ab45ad..3d1d9565e47 100644 --- a/libsanitizer/tsan/Makefile.in +++ b/libsanitizer/tsan/Makefile.in @@ -146,7 +146,7 @@ LTLIBRARIES = $(toolexeclib_LTLIBRARIES) am__DEPENDENCIES_1 = am__objects_1 = tsan_clock.lo tsan_debugging.lo tsan_external.lo \ tsan_fd.lo tsan_flags.lo tsan_ignoreset.lo \ - tsan_interceptors.lo tsan_interceptors_mac.lo \ + tsan_interceptors_posix.lo tsan_interceptors_mac.lo \ tsan_interface_ann.lo tsan_interface_atomic.lo \ tsan_interface.lo tsan_interface_java.lo tsan_malloc_mac.lo \ tsan_md5.lo tsan_mman.lo tsan_mutex.lo tsan_mutexset.lo \ @@ -421,7 +421,7 @@ tsan_files = \ tsan_fd.cpp \ tsan_flags.cpp \ tsan_ignoreset.cpp \ - tsan_interceptors.cpp \ + tsan_interceptors_posix.cpp \ tsan_interceptors_mac.cpp \ tsan_interface_ann.cpp \ tsan_interface_atomic.cpp \ @@ -585,8 +585,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsan_fd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsan_flags.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsan_ignoreset.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsan_interceptors.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsan_interceptors_mac.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsan_interceptors_posix.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsan_interface.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsan_interface_ann.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsan_interface_atomic.Plo@am__quote@ |