From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 12 Jan 2016 11:15:34 +0000 (+0000)
Subject: perf: fix build errors on x86 and other platforms
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=9ab3a7c14270735308699b9c983034e34586de2a;p=openwrt-github%2F.git

perf: fix build errors on x86 and other platforms

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48218 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/devel/perf/musl-compat.h b/package/devel/perf/musl-compat.h
index ecfbec6a29..d0fa7810fa 100644
--- a/package/devel/perf/musl-compat.h
+++ b/package/devel/perf/musl-compat.h
@@ -1,6 +1,8 @@
 #ifndef __PERF_MUSL_COMPAT_H
 #define __PERF_MUSL_COMPAT_H
 
+#ifndef __ASSEMBLER__
+
 #include <sys/ioctl.h>
 #include <string.h>
 #include <unistd.h>
@@ -15,8 +17,14 @@
 #undef _IO
 
 /* Change XSI compliant version into GNU extension hackery */
-#define strerror_r(err, buf, buflen) \
-	(strerror_r(err, buf, buflen) ? NULL : buf)
+static inline char *
+gnu_strerror_r(int err, char *buf, size_t buflen)
+{
+	if (strerror_r(err, buf, buflen))
+		return NULL;
+	return buf;
+}
+#define strerror_r gnu_strerror_r
 
 #define _SC_LEVEL1_DCACHE_LINESIZE -1
 
@@ -60,3 +68,4 @@ static inline int compat_sched_getcpu(void)
 #define sched_getcpu compat_sched_getcpu
 
 #endif
+#endif