e4452a2d19
Among other localplt test failures when building with -Os, there are libc.so PLT references for __cmsg_nxthdr. This is a simple case of a function that is inlined for -O2 but not for -Os; this patch adds libc_hidden_proto / libc_hidden_def for it to avoid a localplt failure even when it is not inlined. Tested for x86_64 (both that it removes this particular localplt failure for -Os - but other such failures remain so the bug can't yet be closed - and that the testsuite continues to pass without -Os). [BZ #15105] * include/sys/socket.h [!_ISOMAC] (__cmsg_nxthdr): Use libc_hidden_proto. * sysdeps/unix/sysv/linux/cmsg_nxthdr.c (__cmsg_nxthdr): Use libc_hidden_def.
41 lines
1.5 KiB
C
41 lines
1.5 KiB
C
/* Return point to next ancillary data entry in message header.
|
|
Copyright (C) 1997-2018 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <stddef.h>
|
|
#include <sys/socket.h>
|
|
|
|
|
|
struct cmsghdr *
|
|
__cmsg_nxthdr (struct msghdr *mhdr, struct cmsghdr *cmsg)
|
|
{
|
|
if ((size_t) cmsg->cmsg_len < sizeof (struct cmsghdr))
|
|
/* The kernel header does this so there may be a reason. */
|
|
return NULL;
|
|
|
|
cmsg = (struct cmsghdr *) ((unsigned char *) cmsg
|
|
+ CMSG_ALIGN (cmsg->cmsg_len));
|
|
if ((unsigned char *) (cmsg + 1) > ((unsigned char *) mhdr->msg_control
|
|
+ mhdr->msg_controllen)
|
|
|| ((unsigned char *) cmsg + CMSG_ALIGN (cmsg->cmsg_len)
|
|
> ((unsigned char *) mhdr->msg_control + mhdr->msg_controllen)))
|
|
/* No more entries. */
|
|
return NULL;
|
|
return cmsg;
|
|
}
|
|
libc_hidden_def (__cmsg_nxthdr)
|