diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-08-20 04:29:23 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-08-20 04:29:23 -0700 |
| commit | 1ae6c72dc10806d416a611ea8cc15640f972ffa7 (patch) | |
| tree | be2d04895be5bfe7996ac4aeaa7c0d5e4307b7d7 /sysdeps/x86_64 | |
| parent | a452ef24d56280f19a629555285ba23ddff055e6 (diff) | |
| download | glibc-1ae6c72dc10806d416a611ea8cc15640f972ffa7.zip glibc-1ae6c72dc10806d416a611ea8cc15640f972ffa7.tar.gz glibc-1ae6c72dc10806d416a611ea8cc15640f972ffa7.tar.bz2 | |
Move x86_64 init-arch.h to sysdeps/x86/init-arch.h
Move sysdeps/x86_64/multiarch/init-arch.h to sysdeps/x86/init-arch.h
which can be used for both i386 and x86_64.
* sysdeps/i386/i686/multiarch/init-arch.h: Removed.
* sysdeps/unix/sysv/linux/x86/init-arch.h: Likewise.
* sysdeps/x86_64/cacheinfo.c: Include <init-arch.h> instead
of "multiarch/init-arch.h".
* sysdeps/x86_64/multiarch/init-arch.h: Renamed to ...
* sysdeps/x86/init-arch.h: This.
Diffstat (limited to 'sysdeps/x86_64')
| -rw-r--r-- | sysdeps/x86_64/cacheinfo.c | 2 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/init-arch.h | 22 |
2 files changed, 1 insertions, 23 deletions
diff --git a/sysdeps/x86_64/cacheinfo.c b/sysdeps/x86_64/cacheinfo.c index 0ff5309..e7c65f7 100644 --- a/sysdeps/x86_64/cacheinfo.c +++ b/sysdeps/x86_64/cacheinfo.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <unistd.h> #include <cpuid.h> -#include "multiarch/init-arch.h" +#include <init-arch.h> #define is_intel GLRO(dl_x86_cpu_features).kind == arch_kind_intel #define is_amd GLRO(dl_x86_cpu_features).kind == arch_kind_amd diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h deleted file mode 100644 index 2b9988e..0000000 --- a/sysdeps/x86_64/multiarch/init-arch.h +++ /dev/null @@ -1,22 +0,0 @@ -/* This file is part of the GNU C Library. - Copyright (C) 2008-2015 Free Software Foundation, Inc. - - 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/>. */ - -#ifdef __ASSEMBLER__ -# include <cpu-features.h> -#else -# include <ldsodefs.h> -#endif |