From 1ae6c72dc10806d416a611ea8cc15640f972ffa7 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 20 Aug 2015 04:29:23 -0700 Subject: 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 instead of "multiarch/init-arch.h". * sysdeps/x86_64/multiarch/init-arch.h: Renamed to ... * sysdeps/x86/init-arch.h: This. --- ChangeLog | 9 +++++++++ sysdeps/i386/i686/multiarch/init-arch.h | 1 - sysdeps/unix/sysv/linux/x86/init-arch.h | 1 - sysdeps/x86/init-arch.h | 22 ++++++++++++++++++++++ sysdeps/x86_64/cacheinfo.c | 2 +- sysdeps/x86_64/multiarch/init-arch.h | 22 ---------------------- 6 files changed, 32 insertions(+), 25 deletions(-) delete mode 100644 sysdeps/i386/i686/multiarch/init-arch.h delete mode 100644 sysdeps/unix/sysv/linux/x86/init-arch.h create mode 100644 sysdeps/x86/init-arch.h delete mode 100644 sysdeps/x86_64/multiarch/init-arch.h diff --git a/ChangeLog b/ChangeLog index 52f163eb0c..1de3a2379e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-08-20 H.J. Lu + + * sysdeps/i386/i686/multiarch/init-arch.h: Removed. + * sysdeps/unix/sysv/linux/x86/init-arch.h: Likewise. + * sysdeps/x86_64/cacheinfo.c: Include instead + of "multiarch/init-arch.h". + * sysdeps/x86_64/multiarch/init-arch.h: Renamed to ... + * sysdeps/x86/init-arch.h: This. + 2015-08-20 H.J. Lu * sysdeps/i386/i686/multiarch/init-arch.c: Removed. diff --git a/sysdeps/i386/i686/multiarch/init-arch.h b/sysdeps/i386/i686/multiarch/init-arch.h deleted file mode 100644 index cd2d0befee..0000000000 --- a/sysdeps/i386/i686/multiarch/init-arch.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/x86/init-arch.h b/sysdeps/unix/sysv/linux/x86/init-arch.h deleted file mode 100644 index cd2d0befee..0000000000 --- a/sysdeps/unix/sysv/linux/x86/init-arch.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/x86/init-arch.h b/sysdeps/x86/init-arch.h new file mode 100644 index 0000000000..2b9988ebc3 --- /dev/null +++ b/sysdeps/x86/init-arch.h @@ -0,0 +1,22 @@ +/* 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 + . */ + +#ifdef __ASSEMBLER__ +# include +#else +# include +#endif diff --git a/sysdeps/x86_64/cacheinfo.c b/sysdeps/x86_64/cacheinfo.c index 0ff5309e61..e7c65f7dd0 100644 --- a/sysdeps/x86_64/cacheinfo.c +++ b/sysdeps/x86_64/cacheinfo.c @@ -21,7 +21,7 @@ #include #include #include -#include "multiarch/init-arch.h" +#include #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 2b9988ebc3..0000000000 --- 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 - . */ - -#ifdef __ASSEMBLER__ -# include -#else -# include -#endif -- cgit 1.4.1