This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
PATCH: Move sysdeps/x86_64/Implies to sysdeps/x86_64/64
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Thu, 22 Mar 2012 10:53:15 -0700
- Subject: PATCH: Move sysdeps/x86_64/Implies to sysdeps/x86_64/64
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
Since sysdeps/x86_64/preconfigure now sets machine to x86_64/64,
sysdeps/x86_64/Implies should be moved to sysdeps/x86_64/64 to get the
proper search order. We need to add x86_64/fpu to Implies to search
x86_64/fpu first. Since wordsize-64 in sysdeps/x86_64/64/Implies puts
sysdeps/wordsize-64/bits/wordsize.h before
sysdeps/x86_64/bits/wordsize.h, this patch moves wordsize.h to
sysdeps/x86_64/common/bits/wordsize.h to make sure that the proper
wordsize.h is used. Tested on Linux/x86-64. OK to install?
Thanks.
H.J.
---
2012-03-22 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86_64/Implies: Moved to ...
* sysdeps/x86_64/64/Implies: Here. Add x86_64/common and
x86_64/fpu.
* sysdeps/x86_64/bits/wordsize.h: Moved to ...
* sysdeps/x86_64/common/bits/wordsize.h: Here.
diff --git a/sysdeps/x86_64/64/Implies b/sysdeps/x86_64/64/Implies
new file mode 100644
index 0000000..32b79f2
--- /dev/null
+++ b/sysdeps/x86_64/64/Implies
@@ -0,0 +1,7 @@
+x86_64/common
+x86_64/fpu
+wordsize-64
+ieee754/ldbl-96
+ieee754/dbl-64/wordsize-64
+ieee754/dbl-64
+ieee754/flt-32
diff --git a/sysdeps/x86_64/Implies b/sysdeps/x86_64/Implies
deleted file mode 100644
index 2e0a323..0000000
--- a/sysdeps/x86_64/Implies
+++ /dev/null
@@ -1,5 +0,0 @@
-wordsize-64
-ieee754/ldbl-96
-ieee754/dbl-64/wordsize-64
-ieee754/dbl-64
-ieee754/flt-32
diff --git a/sysdeps/x86_64/bits/wordsize.h b/sysdeps/x86_64/bits/wordsize.h
deleted file mode 100644
index a40a0d8..0000000
--- a/sysdeps/x86_64/bits/wordsize.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Determine the wordsize from the preprocessor defines. */
-
-#if defined __x86_64__
-# define __WORDSIZE 64
-# define __WORDSIZE_COMPAT32 1
-#else
-# define __WORDSIZE 32
-#endif
diff --git a/sysdeps/x86_64/common/bits/wordsize.h b/sysdeps/x86_64/common/bits/wordsize.h
new file mode 100644
index 0000000..a40a0d8
--- /dev/null
+++ b/sysdeps/x86_64/common/bits/wordsize.h
@@ -0,0 +1,8 @@
+/* Determine the wordsize from the preprocessor defines. */
+
+#if defined __x86_64__
+# define __WORDSIZE 64
+# define __WORDSIZE_COMPAT32 1
+#else
+# define __WORDSIZE 32
+#endif