1*4882a593SmuzhiyunFrom c25f8d1f7a6203dfeb10b39f80ffd314bb84a58d Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Baruch Siach <baruch@tkos.co.il> 3*4882a593SmuzhiyunDate: Thu, 22 Dec 2016 15:26:30 +0200 4*4882a593SmuzhiyunSubject: [PATCH] libc-compat.h: add musl workaround 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe libc-compat.h kernel header uses glibc specific macros (__GLIBC__ and 7*4882a593Smuzhiyun__USE_MISC) to solve conflicts with libc provided headers. This patch makes 8*4882a593Smuzhiyunlibc-compat.h work for musl libc as well. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunUpstream-Status: Pending 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunTaken From: 13*4882a593Smuzhiyunhttps://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSigned-off-by: Baruch Siach <baruch@tkos.co.il> 16*4882a593SmuzhiyunSigned-off-by: Maxin B. John <maxin.john@intel.com> 17*4882a593Smuzhiyun 18*4882a593Smuzhiyun--- 19*4882a593Smuzhiyun include/uapi/linux/libc-compat.h | 4 +++- 20*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 1 deletion(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h 23*4882a593Smuzhiyunindex a159991..22198fa 100644 24*4882a593Smuzhiyun--- a/include/uapi/linux/libc-compat.h 25*4882a593Smuzhiyun+++ b/include/uapi/linux/libc-compat.h 26*4882a593Smuzhiyun@@ -50,10 +50,12 @@ 27*4882a593Smuzhiyun #define _LIBC_COMPAT_H 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun /* We have included glibc headers... */ 30*4882a593Smuzhiyun-#if defined(__GLIBC__) 31*4882a593Smuzhiyun+#if 1 32*4882a593Smuzhiyun+#define __USE_MISC 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun /* Coordinate with glibc net/if.h header. */ 35*4882a593Smuzhiyun #if defined(_NET_IF_H) && defined(__USE_MISC) 36*4882a593Smuzhiyun+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun /* GLIBC headers included first so don't define anything 39*4882a593Smuzhiyun * that would already be defined. */ 40