aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2017-11-08 09:17:02 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2017-11-08 09:17:02 +0100
commit5925290f7d809ce6622df64d68073522f7928761 (patch)
treefd9147f967dd6ec2b1ab4135833364144061fb3f /libsanitizer
parentcaba2b36fa2b8fb0f688e5e6733b5d7c513ade7f (diff)
downloadgcc-5925290f7d809ce6622df64d68073522f7928761.zip
gcc-5925290f7d809ce6622df64d68073522f7928761.tar.gz
gcc-5925290f7d809ce6622df64d68073522f7928761.tar.bz2
re PR bootstrap/82670 (UBSAN bootstrap broken after recent libsanitizer merge)
PR bootstrap/82670 * ubsan/Makefile.am (ubsan_files): Remove ubsan_init_standalone.cc and ubsan_signals_standalone.cc. * ubsan/Makefile.in: Regenerated. From-SVN: r254518
Diffstat (limited to 'libsanitizer')
-rw-r--r--libsanitizer/ChangeLog7
-rw-r--r--libsanitizer/ubsan/Makefile.am5
-rw-r--r--libsanitizer/ubsan/Makefile.in11
3 files changed, 10 insertions, 13 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 0428650..f94a53b 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,10 @@
+2017-11-08 Jakub Jelinek <jakub@redhat.com>
+
+ PR bootstrap/82670
+ * ubsan/Makefile.am (ubsan_files): Remove ubsan_init_standalone.cc
+ and ubsan_signals_standalone.cc.
+ * ubsan/Makefile.in: Regenerated.
+
2017-11-05 Tom de Vries <tom@codesourcery.com>
PR other/82784
diff --git a/libsanitizer/ubsan/Makefile.am b/libsanitizer/ubsan/Makefile.am
index cce728c..fea000c 100644
--- a/libsanitizer/ubsan/Makefile.am
+++ b/libsanitizer/ubsan/Makefile.am
@@ -22,10 +22,7 @@ ubsan_plugin_files = \
ubsan_type_hash_win.cc \
ubsan_value.cc
-ubsan_files = \
- $(ubsan_plugin_files) \
- ubsan_init_standalone.cc \
- ubsan_signals_standalone.cc
+ubsan_files = $(ubsan_plugin_files)
libubsan_la_SOURCES = $(ubsan_files)
libubsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la
diff --git a/libsanitizer/ubsan/Makefile.in b/libsanitizer/ubsan/Makefile.in
index 9552ec1..e757d29 100644
--- a/libsanitizer/ubsan/Makefile.in
+++ b/libsanitizer/ubsan/Makefile.in
@@ -111,8 +111,7 @@ am__objects_1 = ubsan_diag.lo ubsan_flags.lo ubsan_handlers.lo \
ubsan_handlers_cxx.lo ubsan_init.lo ubsan_type_hash.lo \
ubsan_type_hash_itanium.lo ubsan_type_hash_win.lo \
ubsan_value.lo
-am__objects_2 = $(am__objects_1) ubsan_init_standalone.lo \
- ubsan_signals_standalone.lo
+am__objects_2 = $(am__objects_1)
am_libubsan_la_OBJECTS = $(am__objects_2)
libubsan_la_OBJECTS = $(am_libubsan_la_OBJECTS)
libubsan_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -306,11 +305,7 @@ ubsan_plugin_files = \
ubsan_type_hash_win.cc \
ubsan_value.cc
-ubsan_files = \
- $(ubsan_plugin_files) \
- ubsan_init_standalone.cc \
- ubsan_signals_standalone.cc
-
+ubsan_files = $(ubsan_plugin_files)
libubsan_la_SOURCES = $(ubsan_files)
libubsan_la_LIBADD = \
$(top_builddir)/sanitizer_common/libsanitizer_common.la \
@@ -436,8 +431,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ubsan_handlers.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ubsan_handlers_cxx.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ubsan_init.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ubsan_init_standalone.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ubsan_signals_standalone.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ubsan_type_hash.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ubsan_type_hash_itanium.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ubsan_type_hash_win.Plo@am__quote@