From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 8 Nov 2017 08:17:02 +0000 (+0100)
Subject: re PR bootstrap/82670 (UBSAN bootstrap broken after recent libsanitizer merge)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5925290f7d809ce6622df64d68073522f7928761;p=gcc.git

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

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 0428650d906..f94a53bcd37 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 cce728ceeca..fea000c0c8e 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 9552ec1425d..e757d29cd4a 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@