diff --git a/[refs] b/[refs]
index a7d33b67a83f..e4f68b27b8eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9f526ecdc09a851f4f5567ebcf9bc553778f6c2
+refs/heads/master: d6e66832a710c0e6d1376e8d39ee108636a177e7
diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile
index 31a07f95fd98..5216ade909d0 100644
--- a/trunk/tools/perf/Makefile
+++ b/trunk/tools/perf/Makefile
@@ -743,11 +743,9 @@ ifeq ($(NO_PERF_REGS),0)
 	BASIC_CFLAGS += -DHAVE_PERF_REGS
 endif
 
-ifdef NO_STRLCPY
-	BASIC_CFLAGS += -DNO_STRLCPY
-else
-	ifneq ($(call try-cc,$(SOURCE_STRLCPY),),y)
-		BASIC_CFLAGS += -DNO_STRLCPY
+ifndef NO_STRLCPY
+	ifeq ($(call try-cc,$(SOURCE_STRLCPY),),y)
+		BASIC_CFLAGS += -DHAVE_STRLCPY
 	endif
 endif
 
diff --git a/trunk/tools/perf/util/cache.h b/trunk/tools/perf/util/cache.h
index 07aec06e4443..2bd51370ad28 100644
--- a/trunk/tools/perf/util/cache.h
+++ b/trunk/tools/perf/util/cache.h
@@ -107,7 +107,7 @@ extern char *perf_path(const char *fmt, ...) __attribute__((format (printf, 1, 2
 extern char *perf_pathdup(const char *fmt, ...)
 	__attribute__((format (printf, 1, 2)));
 
-#ifdef NO_STRLCPY
+#ifndef HAVE_STRLCPY
 extern size_t strlcpy(char *dest, const char *src, size_t size);
 #endif
 
diff --git a/trunk/tools/perf/util/path.c b/trunk/tools/perf/util/path.c
index bd7497711424..a8c49548ca48 100644
--- a/trunk/tools/perf/util/path.c
+++ b/trunk/tools/perf/util/path.c
@@ -22,7 +22,7 @@ static const char *get_perf_dir(void)
 	return ".";
 }
 
-#ifdef NO_STRLCPY
+#ifndef HAVE_STRLCPY
 size_t strlcpy(char *dest, const char *src, size_t size)
 {
 	size_t ret = strlen(src);