diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-05-30 15:49:31 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-30 15:49:31 -0700 |
| commit | 404fe9d90e0d38a2713e57062444d994a650130e (patch) | |
| tree | 54679d04bf1d0fc8281d50659cc0c13934834f10 | |
| parent | d48d04460a971592cf80defcf3ea7471b96cef84 (diff) | |
| download | glibc-404fe9d90e0d38a2713e57062444d994a650130e.tar.gz glibc-404fe9d90e0d38a2713e57062444d994a650130e.tar.xz glibc-404fe9d90e0d38a2713e57062444d994a650130e.zip | |
Use x86_64 bits/select.h for i386/x86_64
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/i386/bits/select.h | 54 | ||||
| -rw-r--r-- | sysdeps/x86/bits/select.h (renamed from sysdeps/x86_64/bits/select.h) | 0 |
3 files changed, 4 insertions, 54 deletions
diff --git a/ChangeLog b/ChangeLog index 5669dddbda..808b2c7c79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 2012-05-30 H.J. Lu <hongjiu.lu@intel.com> [BZ #14117] + * sysdeps/i386/bits/select.h: Removed. + * sysdeps/x86_64/bits/select.h: Renamed to ... + * sysdeps/x86/bits/select.h: This. + * sysdeps/i386/bits/setjmp.h: Removed. * sysdeps/x86_64/bits/setjmp.h: Renamed to ... * sysdeps/x86/bits/setjmp.h: This. diff --git a/sysdeps/i386/bits/select.h b/sysdeps/i386/bits/select.h deleted file mode 100644 index 8684047633..0000000000 --- a/sysdeps/i386/bits/select.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright (C) 1997, 1998, 1999, 2001, 2011 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/>. */ - -#ifndef _SYS_SELECT_H -# error "Never use <bits/select.h> directly; include <sys/select.h> instead." -#endif - - -#if defined __GNUC__ && __GNUC__ >= 2 -# define __FD_ZERO(fdsp) \ - do { \ - int __d0, __d1; \ - __asm__ __volatile__ ("cld; rep; stosl" \ - : "=c" (__d0), "=D" (__d1) \ - : "a" (0), "0" (sizeof (fd_set) \ - / sizeof (__fd_mask)), \ - "1" (&__FDS_BITS (fdsp)[0]) \ - : "memory"); \ - } while (0) - -#else /* ! GNU CC */ - -/* We don't use `memset' because this would require a prototype and - the array isn't too big. */ -# define __FD_ZERO(set) \ - do { \ - unsigned int __i; \ - fd_set *__arr = (set); \ - for (__i = 0; __i < sizeof (fd_set) / sizeof (__fd_mask); ++__i) \ - __FDS_BITS (__arr)[__i] = 0; \ - } while (0) - -#endif /* GNU CC */ - -#define __FD_SET(d, set) \ - ((void) (__FDS_BITS (set)[__FD_ELT (d)] |= __FD_MASK (d))) -#define __FD_CLR(d, set) \ - ((void) (__FDS_BITS (set)[__FD_ELT (d)] &= ~__FD_MASK (d))) -#define __FD_ISSET(d, set) \ - ((__FDS_BITS (set)[__FD_ELT (d)] & __FD_MASK (d)) != 0) diff --git a/sysdeps/x86_64/bits/select.h b/sysdeps/x86/bits/select.h index 439a914bfc..439a914bfc 100644 --- a/sysdeps/x86_64/bits/select.h +++ b/sysdeps/x86/bits/select.h |