From c0d78c1de1f2607c874020d27b72cf989c5ce092 Mon Sep 17 00:00:00 2001
From: Alexey Samsonov <samsonov@google.com>
Date: Mon, 4 Jun 2012 13:27:49 +0000
Subject: [Sanitizer]: move internal_strcmp to sanitizer_common

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@157926 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/tsan/rtl/tsan_defs.h           | 1 -
 lib/tsan/rtl/tsan_interceptors.cc  | 4 ----
 lib/tsan/rtl/tsan_interface_ann.cc | 2 ++
 lib/tsan/rtl/tsan_rtl_report.cc    | 3 +++
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/tsan/rtl')

diff --git a/lib/tsan/rtl/tsan_defs.h b/lib/tsan/rtl/tsan_defs.h
index 74ed733af..608b58e34 100644
--- a/lib/tsan/rtl/tsan_defs.h
+++ b/lib/tsan/rtl/tsan_defs.h
@@ -162,7 +162,6 @@ T RoundUp(T p, int align) {
 void internal_memset(void *ptr, int c, uptr size);
 void internal_memcpy(void *dst, const void *src, uptr size);
 int internal_memcmp(const void *s1, const void *s2, uptr size);
-int internal_strcmp(const char *s1, const char *s2);
 int internal_strncmp(const char *s1, const char *s2, uptr size);
 void internal_strcpy(char *s1, const char *s2);
 uptr internal_strlen(const char *s);
diff --git a/lib/tsan/rtl/tsan_interceptors.cc b/lib/tsan/rtl/tsan_interceptors.cc
index 69ae8ca2e..6c4f9b0b6 100644
--- a/lib/tsan/rtl/tsan_interceptors.cc
+++ b/lib/tsan/rtl/tsan_interceptors.cc
@@ -1532,10 +1532,6 @@ int internal_memcmp(const void *s1, const void *s2, uptr size) {
   return REAL(memcmp)(s1, s2, size);
 }
 
-int internal_strcmp(const char *s1, const char *s2) {
-  return REAL(strcmp)(s1, s2);
-}
-
 int internal_strncmp(const char *s1, const char *s2, uptr size) {
   return REAL(strncmp)(s1, s2, size);
 }
diff --git a/lib/tsan/rtl/tsan_interface_ann.cc b/lib/tsan/rtl/tsan_interface_ann.cc
index a04a207b5..853770e2d 100644
--- a/lib/tsan/rtl/tsan_interface_ann.cc
+++ b/lib/tsan/rtl/tsan_interface_ann.cc
@@ -10,6 +10,7 @@
 // This file is a part of ThreadSanitizer (TSan), a race detector.
 //
 //===----------------------------------------------------------------------===//
+#include "sanitizer_common/sanitizer_libc.h"
 #include "tsan_interface_ann.h"
 #include "tsan_mutex.h"
 #include "tsan_placement_new.h"
@@ -20,6 +21,7 @@
 
 #define CALLERPC ((uptr)__builtin_return_address(0))
 
+using namespace __sanitizer;  // NOLINT
 using namespace __tsan;  // NOLINT
 
 namespace __tsan {
diff --git a/lib/tsan/rtl/tsan_rtl_report.cc b/lib/tsan/rtl/tsan_rtl_report.cc
index b3f8390bc..f8e07ff7e 100644
--- a/lib/tsan/rtl/tsan_rtl_report.cc
+++ b/lib/tsan/rtl/tsan_rtl_report.cc
@@ -11,6 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "sanitizer_common/sanitizer_libc.h"
 #include "tsan_platform.h"
 #include "tsan_rtl.h"
 #include "tsan_suppressions.h"
@@ -21,6 +22,8 @@
 #include "tsan_flags.h"
 #include "tsan_placement_new.h"
 
+using namespace __sanitizer;  // NOLINT
+
 namespace __tsan {
 
 // Can be overriden by an application/test to intercept reports.
-- 
cgit v1.2.3