From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/10725 Path: news.gmane.org!.POSTED!not-for-mail From: Rich Felker Newsgroups: gmane.linux.kernel.api,gmane.linux.lib.musl.general Subject: Re: [musl] [PATCH] uapi libc compat: allow non-glibc to opt out of uapi definitions Date: Thu, 10 Nov 2016 23:54:01 -0500 Message-ID: <20161111045401.GM1555@brightrain.aerifal.cx> References: <20161111014044.GA26269@nyan> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: blaine.gmane.org 1478840075 5370 195.159.176.226 (11 Nov 2016 04:54:35 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 11 Nov 2016 04:54:35 +0000 (UTC) User-Agent: Mutt/1.5.21 (2010-09-15) To: Felix Janda , linux-devel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, "David S. Miller" , linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, musl-ZwoEplunGu1jrUoiu81ncdBPR1lH4CV8@public.gmane.org Original-X-From: linux-api-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Fri Nov 11 05:54:26 2016 Return-path: Envelope-to: glka-linux-api@m.gmane.org Original-Received: from vger.kernel.org ([209.132.180.67]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c53r2-0000iL-5y for glka-linux-api@m.gmane.org; Fri, 11 Nov 2016 05:54:20 +0100 Original-Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand id S965154AbcKKEyW (ORCPT ); Thu, 10 Nov 2016 23:54:22 -0500 Original-Received: from 216-12-86-13.cv.mvl.ntelos.net ([216.12.86.13]:58396 "EHLO brightrain.aerifal.cx" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965128AbcKKEyW (ORCPT ); Thu, 10 Nov 2016 23:54:22 -0500 Original-Received: from dalias by brightrain.aerifal.cx with local (Exim 3.15 #2) id 1c53qj-0002MA-00; Fri, 11 Nov 2016 04:54:01 +0000 Content-Disposition: inline In-Reply-To: <20161111014044.GA26269@nyan> Original-Sender: linux-api-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Precedence: bulk List-ID: X-Mailing-List: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Xref: news.gmane.org gmane.linux.kernel.api:21821 gmane.linux.lib.musl.general:10725 Archived-At: On Thu, Nov 10, 2016 at 08:40:44PM -0500, Felix Janda wrote: > Currently, libc-compat.h detects inclusion of specific glibc headers, > and defines corresponding _UAPI_DEF_* macros, which in turn are used in > uapi headers to prevent definition of conflicting structures/constants. > There is no such detection for other c libraries, for them the > _UAPI_DEF_* macros are always defined as 1, and so none of the possibly > conflicting definitions are suppressed. > > This patch enables non-glibc c libraries to request the suppression of > any specific interface by defining the corresponding _UAPI_DEF_* macro > as 0. > > This patch together with the recent musl libc commit > > http://git.musl-libc.org/cgit/musl/commit/?id=04983f2272382af92eb8f8838964ff944fbb8258 > > fixes the following compiler errors when is included > after musl : > > ../linux/in6.h:32:8: error: redefinition of 'struct in6_addr' > ../linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6' > ../linux/in6.h:59:8: error: redefinition of 'struct ipv6_mreq' > > Signed-off-by: Felix Janda Acked-by: Rich Felker > --- > include/uapi/linux/libc-compat.h | 52 ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 52 insertions(+) > > diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h > index 44b8a6b..c316725 100644 > --- a/include/uapi/linux/libc-compat.h > +++ b/include/uapi/linux/libc-compat.h > @@ -171,42 +171,94 @@ > #else /* !defined(__GLIBC__) */ Note that right now, the content above this line in libc-compat.h makes assumptions about what glibc does and doesn't define that are specific to current glibc versions. I think it would be nice to make the whole remainder of the file unconditional rather than being the #else path for !defined(__GLIBC__). Then future versions of glibc can properly define their own __UAPI_DEF_* macros to tell the kernel headers about anything new the define. But I don't think that has to be part of the same change you're proposing now. Rich > /* Definitions for if.h */ > +#if !defined(__UAPI_DEF_IF_IFCONF) > #define __UAPI_DEF_IF_IFCONF 1 > +#endif > +#if !defined(__UAPI_DEF_IF_IFMAP) > #define __UAPI_DEF_IF_IFMAP 1 > +#endif > +#if !defined(__UAPI_DEF_IFNAMSIZ) > #define __UAPI_DEF_IF_IFNAMSIZ 1 > +#endif > +#if !defined(__UAPI_DEF_IFREQ) > #define __UAPI_DEF_IF_IFREQ 1 > +#endif > /* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ > +#if !defined(__UAPI_DEF_IF_NET_DEVICE_FLAGS) > #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 > +#endif > /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ > +#if !defined(__UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO) > #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 > +#endif > > /* Definitions for in.h */ > +#if !defined(__UAPI_DEF_IN_ADDR) > #define __UAPI_DEF_IN_ADDR 1 > +#endif > +#if !defined(__UAPI_DEF_IN_IPPROTO) > #define __UAPI_DEF_IN_IPPROTO 1 > +#endif > +#if !defined(__UAPI_DEF_IN_PKTINFO) > #define __UAPI_DEF_IN_PKTINFO 1 > +#endif > +#if !defined(__UAPI_DEF_IP_MREQ) > #define __UAPI_DEF_IP_MREQ 1 > +#endif > +#if !defined(__UAPI_DEF_SOCKADDR_IN) > #define __UAPI_DEF_SOCKADDR_IN 1 > +#endif > +#if !defined(__UAPI_DEF_IN_CLASS) > #define __UAPI_DEF_IN_CLASS 1 > +#endif > > /* Definitions for in6.h */ > +#if !defined(__UAPI_DEF_IN6_ADDR) > #define __UAPI_DEF_IN6_ADDR 1 > +#endif > +#if !defined(__UAPI_DEF_IN6_ADDR_ALT) > #define __UAPI_DEF_IN6_ADDR_ALT 1 > +#endif > +#if !defined(__UAPI_DEF_SOCKADDR_IN6) > #define __UAPI_DEF_SOCKADDR_IN6 1 > +#endif > +#if !defined(__UAPI_DEF_IPV6_MREQ) > #define __UAPI_DEF_IPV6_MREQ 1 > +#endif > +#if !defined(__UAPI_DEF_IPPROTO_V6) > #define __UAPI_DEF_IPPROTO_V6 1 > +#endif > +#if !defined(__UAPI_DEF_IPV6_OPTIONS) > #define __UAPI_DEF_IPV6_OPTIONS 1 > +#endif > +#if !defined(__UAPI_DEF_IN6_PKTINFO) > #define __UAPI_DEF_IN6_PKTINFO 1 > +#endif > +#if !defined(__UAPI_DEF_IP6_MTUINFO) > #define __UAPI_DEF_IP6_MTUINFO 1 > +#endif > > /* Definitions for ipx.h */ > +#if !defined(__UAPI_DEF_SOCKADDR_IPX) > #define __UAPI_DEF_SOCKADDR_IPX 1 > +#endif > +#if !defined(__UAPI_DEF_IPX_ROUTE_DEFINITION) > #define __UAPI_DEF_IPX_ROUTE_DEFINITION 1 > +#endif > +#if !defined(__UAPI_DEF_IPX_INTERFACE_DEFINITION) > #define __UAPI_DEF_IPX_INTERFACE_DEFINITION 1 > +#endif > +#if !defined(__UAPI_DEF_IPX_CONFIG_DATA) > #define __UAPI_DEF_IPX_CONFIG_DATA 1 > +#endif > +#if !defined(__UAPI_DEF_IPX_ROUTE_DEF) > #define __UAPI_DEF_IPX_ROUTE_DEF 1 > +#endif > > /* Definitions for xattr.h */ > +#if !defined(__UAPI_DEF_XATTR) > #define __UAPI_DEF_XATTR 1 > +#endif > > #endif /* __GLIBC__ */ > > -- > 2.7.3