Remove i386/epoll_pwait.S

Only i386 implements epoll_pwait in assembly code withot cancellation
support.  All other architectures implement epoll_pwait in epoll_pwait.c
with

int epoll_pwait (int epfd, struct epoll_event *events,
		 int maxevents, int timeout,
		 const sigset_t *set)
{
  return SYSCALL_CANCEL (epoll_pwait, epfd, events, maxevents,
			 timeout, set, _NSIG / 8);
}

Although there is no test for epoll_pwait in glibc, since SYSCALL_CANCEL
works on i386 and epoll_pwait.c works for other architectures, it is
safe to assume that epoll_pwait.c with SYSCALL_CANCEL also works on
i386.

	[BZ #19137]
	* sysdeps/unix/sysv/linux/i386/Makefile (CFLAGS-epoll_pwait.c):
	Add -fomit-frame-pointer.
	* sysdeps/unix/sysv/linux/i386/epoll_pwait.S: Remove file.

diff --git a/ChangeLog b/ChangeLog
index f220857b0644e184813f2eabc8c7abe99e5b2a16..63701d1bd2d3ef758b782c6d891b6d18713704a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+       [BZ #19137]
+       * sysdeps/unix/sysv/linux/i386/Makefile (CFLAGS-epoll_pwait.c):
+       Add -fomit-frame-pointer.
+       * sysdeps/unix/sysv/linux/i386/epoll_pwait.S: Remove file.
+
 2015-10-15  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/unix/sysv/linux/i386/libc-do-syscall.S

diff --git a/NEWS b/NEWS
index 0491a27a1e164e06b56de90dd51199623b24b563..861027ad4cff392d8332e3c015b75a1771679075 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -20,7 +20,7 @@ Version 2.23
   18961, 18966, 18967, 18969, 18970, 18977, 18980, 18981, 18985, 19003,
   19007, 19012, 19016, 19018, 19032, 19046, 19049, 19050, 19059, 19071,
   19074, 19076, 19077, 19078, 19079, 19085, 19086, 19088, 19094, 19095,
-  19124, 19125, 19129, 19134
+  19124, 19125, 19129, 19134, 19137
 
 * The LD_POINTER_GUARD environment variable can no longer be used to
   disable the pointer guard feature.  It is always enabled.

diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile
index 49ccf3e2e9fd94e6d1a28ae3136e8db830b3694a..b4842173e91ab27dde4665aa0eee59f022ff9d03 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/Makefile
+++ b/sysdeps/unix/sysv/linux/i386/Makefile
@@ -4,6 +4,7 @@ default-abi := 32
 ifeq ($(subdir),misc)
 sysdep_routines += ioperm iopl vm86
 # %ebp may be used to pass the 6th argument to syscall.
+CFLAGS-epoll_pwait.c += -fomit-frame-pointer
 CFLAGS-mmap.c += -fomit-frame-pointer
 CFLAGS-mmap64.c += -fomit-frame-pointer
 endif

diff --git a/sysdeps/unix/sysv/linux/i386/epoll_pwait.S b/sysdeps/unix/sysv/linux/i386/epoll_pwait.S
deleted file mode 100644 (file)
index 65cfb98..0000000
--- a/sysdeps/unix/sysv/linux/i386/epoll_pwait.S
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright (C) 2007-2015 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 <sysdep.h>
-#define _ERRNO_H
-#include <bits/errno.h>
-#define _SIGNAL_H
-#include <bits/signum.h>
-
-
-       .text
-ENTRY (epoll_pwait)
-
-#ifdef __NR_epoll_pwait
-
-       /* Save registers.  */
-       pushl %ebp
-       cfi_adjust_cfa_offset (4)
-       pushl %ebx
-       cfi_adjust_cfa_offset (4)
-       pushl %esi
-       cfi_adjust_cfa_offset (4)
-       pushl %edi
-       cfi_adjust_cfa_offset (4)
-       cfi_rel_offset (edi, 0)
-       cfi_rel_offset (esi, 4)
-       cfi_rel_offset (ebx, 8)
-       cfi_rel_offset (ebp, 12)
-
-       movl 20(%esp), %ebx
-       movl 24(%esp), %ecx
-       movl 28(%esp), %edx
-       movl 32(%esp), %esi
-       movl 36(%esp), %edi
-       movl $_NSIG/8, %ebp
-       movl $__NR_epoll_pwait, %eax
-
-       ENTER_KERNEL
-
-       /* Restore registers.  */
-       popl %edi
-       cfi_adjust_cfa_offset (-4)
-       cfi_restore (edi)
-       popl %esi
-       cfi_adjust_cfa_offset (-4)
-       cfi_restore (esi)
-       popl %ebx
-       cfi_adjust_cfa_offset (-4)
-       cfi_restore (ebx)
-       popl %ebp
-       cfi_adjust_cfa_offset (-4)
-       cfi_restore (ebp)
-
-       /* If 0 > %eax > -4096 there was an error.  */
-       cmpl $-4096, %eax
-       ja SYSCALL_ERROR_LABEL
-
-       /* Successful; return the syscall's value.  */
-#else
-       movl $-ENOSYS, %eax
-       jmp SYSCALL_ERROR_LABEL
-#endif
-       ret
-PSEUDO_END (epoll_pwait)