Restore MAKEOVERRIDES in libsanitizer

	* Makefile.am (MAKEOVERRIDES): Restored.
	* asan/Makefile.am: Likewise.
	* interception/Makefile.am: Likewise.
	* sanitizer_common/Makefile.am: Likewise.
	* tsan/Makefile.am: Likewise.
	* Makefile.in: Regenerated.
	* asan/Makefile.in: Likewise.
	* interception/Makefile.in: Likewise.
	* sanitizer_common/Makefile.in: Likewise.
	* tsan/Makefile.in: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194450 138bc75d-0d04-0410-961f-82ee72b054a4

11 files changed, 28 insertions, 0 deletions

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index aa26e3eeaa3..4c85dbee574 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,5 +1,18 @@
 2012-12-12  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* Makefile.am (MAKEOVERRIDES): Restored.
+	* asan/Makefile.am: Likewise.
+	* interception/Makefile.am: Likewise.
+	* sanitizer_common/Makefile.am: Likewise.
+	* tsan/Makefile.am: Likewise.
+	* Makefile.in: Regenerated.
+	* asan/Makefile.in: Likewise.
+	* interception/Makefile.in: Likewise.
+	* sanitizer_common/Makefile.in: Likewise.
+	* tsan/Makefile.in: Likewise.
+
+2012-12-12  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* asan/Makefile.am (libasan_la_LIBADD): Use $(LIBSTDCXX_RAW_CXX_LDLAGS).
 	* tsan/Makefile.am (libtsan_la_LIBADD): Likewise.
 	* Makefile.in: Regenerated.
diff --git a/libsanitizer/Makefile.am b/libsanitizer/Makefile.am
index ac3276e1694..272a218a8fd 100644
--- a/libsanitizer/Makefile.am
+++ b/libsanitizer/Makefile.am
@@ -10,5 +10,7 @@ if USING_MAC_INTERPOSE
 SUBDIRS = sanitizer_common asan
 endif
 
+MAKEOVERRIDES=
+
 ## ################################################################
 
diff --git a/libsanitizer/Makefile.in b/libsanitizer/Makefile.in
index 42cde43cfaa..b089634b958 100644
--- a/libsanitizer/Makefile.in
+++ b/libsanitizer/Makefile.in
@@ -252,6 +252,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config
 @TSAN_SUPPORTED_FALSE@SUBDIRS = interception sanitizer_common asan 
 @TSAN_SUPPORTED_TRUE@SUBDIRS = interception sanitizer_common asan tsan 
 @USING_MAC_INTERPOSE_TRUE@SUBDIRS = sanitizer_common asan
+MAKEOVERRIDES = 
 all: all-recursive
 
 .SUFFIXES:
diff --git a/libsanitizer/asan/Makefile.am b/libsanitizer/asan/Makefile.am
index fcd145ccb31..95fd75efd9b 100644
--- a/libsanitizer/asan/Makefile.am
+++ b/libsanitizer/asan/Makefile.am
@@ -44,5 +44,7 @@ libasan_la_LIBADD += $(LIBSTDCXX_RAW_CXX_LDLAGS)
 
 libasan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl
 
+MAKEOVERRIDES=
+
 ## ################################################################
 
diff --git a/libsanitizer/asan/Makefile.in b/libsanitizer/asan/Makefile.in
index 9a397bc3f67..87a45457567 100644
--- a/libsanitizer/asan/Makefile.in
+++ b/libsanitizer/asan/Makefile.in
@@ -291,6 +291,7 @@ libasan_la_SOURCES = $(asan_files) $(am__append_2)
 @USING_MAC_INTERPOSE_TRUE@libasan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la \
 @USING_MAC_INTERPOSE_TRUE@	$(LIBSTDCXX_RAW_CXX_LDLAGS)
 libasan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl
+MAKEOVERRIDES = 
 all: all-am
 
 .SUFFIXES:
diff --git a/libsanitizer/interception/Makefile.am b/libsanitizer/interception/Makefile.am
index a35ea307d11..aab68f07c0f 100644
--- a/libsanitizer/interception/Makefile.am
+++ b/libsanitizer/interception/Makefile.am
@@ -17,5 +17,7 @@ interception_files = \
 
 libinterception_la_SOURCES = $(interception_files)
 
+MAKEOVERRIDES=
+
 ## ################################################################
 
diff --git a/libsanitizer/interception/Makefile.in b/libsanitizer/interception/Makefile.in
index d1c4dcb10df..af8269c0fb8 100644
--- a/libsanitizer/interception/Makefile.in
+++ b/libsanitizer/interception/Makefile.in
@@ -225,6 +225,7 @@ interception_files = \
         interception_win.cc
 
 libinterception_la_SOURCES = $(interception_files)
+MAKEOVERRIDES = 
 all: all-am
 
 .SUFFIXES:
diff --git a/libsanitizer/sanitizer_common/Makefile.am b/libsanitizer/sanitizer_common/Makefile.am
index 7e499e03ecb..8d414b306c5 100644
--- a/libsanitizer/sanitizer_common/Makefile.am
+++ b/libsanitizer/sanitizer_common/Makefile.am
@@ -29,5 +29,7 @@ sanitizer_common_files = \
 
 libsanitizer_common_la_SOURCES = $(sanitizer_common_files) 
 
+MAKEOVERRIDES=
+
 ## ################################################################
 
diff --git a/libsanitizer/sanitizer_common/Makefile.in b/libsanitizer/sanitizer_common/Makefile.in
index 8ef3d9a63f1..19c79ff4ac7 100644
--- a/libsanitizer/sanitizer_common/Makefile.in
+++ b/libsanitizer/sanitizer_common/Makefile.in
@@ -242,6 +242,7 @@ sanitizer_common_files = \
         sanitizer_win.cc
 
 libsanitizer_common_la_SOURCES = $(sanitizer_common_files) 
+MAKEOVERRIDES = 
 all: all-am
 
 .SUFFIXES:
diff --git a/libsanitizer/tsan/Makefile.am b/libsanitizer/tsan/Makefile.am
index d7719ae9d8f..a92ab34f4b6 100644
--- a/libsanitizer/tsan/Makefile.am
+++ b/libsanitizer/tsan/Makefile.am
@@ -37,5 +37,7 @@ libtsan_la_SOURCES = $(tsan_files)
 libtsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(LIBSTDCXX_RAW_CXX_LDLAGS)
 libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl
 
+MAKEOVERRIDES=
+
 ## ################################################################
 
diff --git a/libsanitizer/tsan/Makefile.in b/libsanitizer/tsan/Makefile.in
index 8d3f30e40cd..d2a4b1c0437 100644
--- a/libsanitizer/tsan/Makefile.in
+++ b/libsanitizer/tsan/Makefile.in
@@ -276,6 +276,7 @@ tsan_files = \
 libtsan_la_SOURCES = $(tsan_files) 
 libtsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(LIBSTDCXX_RAW_CXX_LDLAGS)
 libtsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lpthread -ldl
+MAKEOVERRIDES = 
 all: all-am
 
 .SUFFIXES: