diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2015-08-19 04:27:04 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2015-08-19 04:27:04 -0700 |
commit | 3552daa7ac08c8dd2fc59393fc57e0b4e7aec94e (patch) | |
tree | 191d35a0ae864bc34a3919c9d0d518cb6ecb1192 /sysdeps/unix/sysv/linux/x86_64 | |
parent | 477fa2c8433218ab84625e61932228781125ba54 (diff) | |
download | glibc-3552daa7ac08c8dd2fc59393fc57e0b4e7aec94e.tar glibc-3552daa7ac08c8dd2fc59393fc57e0b4e7aec94e.tar.gz glibc-3552daa7ac08c8dd2fc59393fc57e0b4e7aec94e.tar.bz2 glibc-3552daa7ac08c8dd2fc59393fc57e0b4e7aec94e.zip |
Use x86-64 cacheinfo.c and sysconf.c for x86
Since _dl_x86_cpu_features is always available, we can use x86-64
cacheinfo.c and sysconf.c for both i386 and x86-64.
* sysdeps/i386/i686/Makefile
[$(subdir) == string] (sysdep_routines): Moved to ...
* sysdeps/i386/Makefile: Here.
* sysdeps/i386/i686/cacheinfo.c: Moved to ...
* sysdeps/i386/cacheinfo.c: Here.
* sysdeps/unix/sysv/linux/i386/sysconf.c: Removed.
* sysdeps/unix/sysv/linux/i386/i686/sysconf.c: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sysconf.c: Moved to ...
* sysdeps/unix/sysv/linux/x86/sysconf.c: Here.
Diffstat (limited to 'sysdeps/unix/sysv/linux/x86_64')
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/sysconf.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/sysdeps/unix/sysv/linux/x86_64/sysconf.c b/sysdeps/unix/sysv/linux/x86_64/sysconf.c deleted file mode 100644 index 4a95f4d673..0000000000 --- a/sysdeps/unix/sysv/linux/x86_64/sysconf.c +++ /dev/null @@ -1,42 +0,0 @@ -/* Get file-specific information about a file. Linux version. - Copyright (C) 2003-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 <assert.h> -#include <stdbool.h> -#include <stdlib.h> -#include <unistd.h> - - -static long int linux_sysconf (int name); -extern long int __cache_sysconf (int) attribute_hidden; - - -/* Get the value of the system variable NAME. */ -long int -__sysconf (int name) -{ - if (name >= _SC_LEVEL1_ICACHE_SIZE && name <= _SC_LEVEL4_CACHE_LINESIZE) - return __cache_sysconf (name); - - return linux_sysconf (name); -} - -/* Now the generic Linux version. */ -#undef __sysconf -#define __sysconf static linux_sysconf -#include "../sysconf.c" |