]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Move x86_64 init-arch.h to sysdeps/x86/init-arch.h
authorH.J. Lu <hjl.tools@gmail.com>
Thu, 20 Aug 2015 11:29:23 +0000 (04:29 -0700)
committerH.J. Lu <hjl.tools@gmail.com>
Thu, 20 Aug 2015 11:29:23 +0000 (04:29 -0700)
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.

ChangeLog
sysdeps/i386/i686/multiarch/init-arch.h [deleted file]
sysdeps/unix/sysv/linux/x86/init-arch.h [deleted file]
sysdeps/x86/init-arch.h [moved from sysdeps/x86_64/multiarch/init-arch.h with 100% similarity]
sysdeps/x86_64/cacheinfo.c

index 52f163eb0ccd86e571dd8d188106f9094a2476bb..1de3a2379efd4f9c1255a345cdb0f8e8f011b06f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-08-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * 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.
+
 2015-08-20  H.J. Lu  <hongjiu.lu@intel.com>
 
        * 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 (file)
index cd2d0be..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/x86_64/multiarch/init-arch.h>
diff --git a/sysdeps/unix/sysv/linux/x86/init-arch.h b/sysdeps/unix/sysv/linux/x86/init-arch.h
deleted file mode 100644 (file)
index cd2d0be..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/x86_64/multiarch/init-arch.h>
index 0ff5309e61e9a890b5c5c1a289e0d2d6e032b2d5..e7c65f7dd056c65c9ba7228282c36692dd9b7c0a 100644 (file)
@@ -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