This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Move x86 multiarch files to sysdeps/x86/multiarch
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Thu, 13 Dec 2012 20:27:14 -0800
- Subject: [PATCH] Move x86 multiarch files to sysdeps/x86/multiarch
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
This patch moves x86 multiarch files to sysdeps/x86/multiarch. Tested
on ia32, x86-64 and x32. OK for 2.18?
Thanks.
H.J.
---
sysdeps/i386/i686/multiarch/Implies | 1 +
sysdeps/i386/i686/multiarch/Makefile | 6 ------
sysdeps/i386/i686/multiarch/init-arch.c | 1 -
sysdeps/i386/i686/multiarch/init-arch.h | 1 -
sysdeps/i386/i686/multiarch/test-multiarch.c | 1 -
sysdeps/x86/multiarch/Makefile | 5 +++++
sysdeps/{x86_64 => x86}/multiarch/init-arch.c | 0
sysdeps/{x86_64 => x86}/multiarch/init-arch.h | 0
sysdeps/{x86_64 => x86}/multiarch/test-multiarch.c | 0
sysdeps/x86_64/multiarch/Implies | 1 +
sysdeps/x86_64/multiarch/Makefile | 6 ------
12 files changed, 25 insertions(+), 15 deletions(-)
create mode 100644 ChangeLog.x86
create mode 100644 sysdeps/i386/i686/multiarch/Implies
delete mode 100644 sysdeps/i386/i686/multiarch/init-arch.c
delete mode 100644 sysdeps/i386/i686/multiarch/init-arch.h
delete mode 100644 sysdeps/i386/i686/multiarch/test-multiarch.c
create mode 100644 sysdeps/x86/multiarch/Makefile
rename sysdeps/{x86_64 => x86}/multiarch/init-arch.c (100%)
rename sysdeps/{x86_64 => x86}/multiarch/init-arch.h (100%)
rename sysdeps/{x86_64 => x86}/multiarch/test-multiarch.c (100%)
create mode 100644 sysdeps/x86_64/multiarch/Implies
2012-12-13 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/i386/i686/multiarch/Makefile (aux): Don't add init-arch.
(tests): Don't add test-multiarch.
(gen-as-const-headers): Don't add ifunc-defines.sym.
* sysdeps/x86_64/multiarch/Makefile: Likewise.
* sysdeps/i386/i686/multiarch/init-arch.c: Removed.
* sysdeps/i386/i686/multiarch/init-arch.h: Likewise.
* sysdeps/i386/i686/multiarch/test-multiarch.c: Likewise.
* sysdeps/i386/i686/multiarch/Implies: New file.
* sysdeps/x86/multiarch/Makefile: Likewise.
* sysdeps/x86_64/multiarch/Implies: Likewise.
* sysdeps/x86_64/multiarch/init-arch.c: Moved to ...
* sysdeps/x86/multiarch/init-arch.c: This.
* sysdeps/x86_64/multiarch/init-arch.h: Moved to ...
* sysdeps/x86/multiarch/init-arch.h: This.
* sysdeps/x86_64/multiarch/test-multiarch.c: Moved to ...
* sysdeps/x86/multiarch/test-multiarch.c: This.
diff --git a/sysdeps/i386/i686/multiarch/Implies b/sysdeps/i386/i686/multiarch/Implies
new file mode 100644
index 0000000..9f98fd1
--- /dev/null
+++ b/sysdeps/i386/i686/multiarch/Implies
@@ -0,0 +1 @@
+x86/multiarch
diff --git a/sysdeps/i386/i686/multiarch/Makefile b/sysdeps/i386/i686/multiarch/Makefile
index 8946bfa..e6e8c11 100644
--- a/sysdeps/i386/i686/multiarch/Makefile
+++ b/sysdeps/i386/i686/multiarch/Makefile
@@ -1,9 +1,3 @@
-ifeq ($(subdir),csu)
-aux += init-arch
-tests += test-multiarch
-gen-as-const-headers += ifunc-defines.sym
-endif
-
ifeq ($(subdir),string)
gen-as-const-headers += locale-defines.sym
sysdep_routines += bzero-sse2 memset-sse2 memcpy-ssse3 mempcpy-ssse3 \
diff --git a/sysdeps/i386/i686/multiarch/init-arch.c b/sysdeps/i386/i686/multiarch/init-arch.c
deleted file mode 100644
index 00a94d8..0000000
--- a/sysdeps/i386/i686/multiarch/init-arch.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/x86_64/multiarch/init-arch.c>
diff --git a/sysdeps/i386/i686/multiarch/init-arch.h b/sysdeps/i386/i686/multiarch/init-arch.h
deleted file mode 100644
index cd2d0be..0000000
--- a/sysdeps/i386/i686/multiarch/init-arch.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/x86_64/multiarch/init-arch.h>
diff --git a/sysdeps/i386/i686/multiarch/test-multiarch.c b/sysdeps/i386/i686/multiarch/test-multiarch.c
deleted file mode 100644
index 593cfec..0000000
--- a/sysdeps/i386/i686/multiarch/test-multiarch.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/x86_64/multiarch/test-multiarch.c>
diff --git a/sysdeps/x86/multiarch/Makefile b/sysdeps/x86/multiarch/Makefile
new file mode 100644
index 0000000..3b3af7d
--- /dev/null
+++ b/sysdeps/x86/multiarch/Makefile
@@ -0,0 +1,5 @@
+ifeq ($(subdir),csu)
+aux += init-arch
+tests += test-multiarch
+gen-as-const-headers += ifunc-defines.sym
+endif
diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86/multiarch/init-arch.c
similarity index 100%
rename from sysdeps/x86_64/multiarch/init-arch.c
rename to sysdeps/x86/multiarch/init-arch.c
diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86/multiarch/init-arch.h
similarity index 100%
rename from sysdeps/x86_64/multiarch/init-arch.h
rename to sysdeps/x86/multiarch/init-arch.h
diff --git a/sysdeps/x86_64/multiarch/test-multiarch.c b/sysdeps/x86/multiarch/test-multiarch.c
similarity index 100%
rename from sysdeps/x86_64/multiarch/test-multiarch.c
rename to sysdeps/x86/multiarch/test-multiarch.c
diff --git a/sysdeps/x86_64/multiarch/Implies b/sysdeps/x86_64/multiarch/Implies
new file mode 100644
index 0000000..9f98fd1
--- /dev/null
+++ b/sysdeps/x86_64/multiarch/Implies
@@ -0,0 +1 @@
+x86/multiarch
diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile
index dd6c27d..d2ff24e 100644
--- a/sysdeps/x86_64/multiarch/Makefile
+++ b/sysdeps/x86_64/multiarch/Makefile
@@ -1,9 +1,3 @@
-ifeq ($(subdir),csu)
-aux += init-arch
-tests += test-multiarch
-gen-as-const-headers += ifunc-defines.sym
-endif
-
ifeq ($(subdir),string)
sysdep_routines += strncat-c stpncpy-c strncpy-c strcmp-ssse3 strncmp-ssse3 \
--
1.7.11.7