fc-arch/fcarch.tmpl.h | 67 +++++++++++++++++++++++++-------------------------
1 file changed, 34 insertions(+), 33 deletions(-)
New commits:
commit 1845f3100d15927cc536bc3d38f140c139fb5614
Author: Behdad Esfahbod <behdad@xxxxxxxxxx>
Date: Wed Nov 18 14:39:34 2009 -0500
[fc-arch] Rename architecture names to better reflect what they are
We only care about three properties in the arch:
- endianness
- pointer size
- for 32-bit archs, whether double is aligned on 4 or 8 bytes
This leads to the following 6 archs (old name -> new name):
x86 -> le32d4
mipsel -> le32d8
x86-64 -> le64
m68k -> be32d4
ppc -> be32d8
ppc64 -> be64
diff --git a/fc-arch/fcarch.tmpl.h b/fc-arch/fcarch.tmpl.h
index 8d592e9..363e11a 100644
--- a/fc-arch/fcarch.tmpl.h
+++ b/fc-arch/fcarch.tmpl.h
@@ -28,37 +28,38 @@
@@@ name. Architecture names are used to construct file names, so
@@@ use something reasonable and don't include any spaces
@@@
-@@@ So far the differences boil down to: endianness, 32 vs 64 bit, and on
-@@@ 32bit archs, whether double is aligned to one word or two words.
+@@@ So far the differences boil down to: endianness, 32 vs 64 bit pointers,
+@@@ and on @@@ 32bit ones, whether double is aligned to one word or two words.
+@@@ Those result in the 6 formats listed below.
@@@
-@@@ ,name
-@@@ | ,endian
-@@@ | | ,FcAlign
-@@@ | | | ,char
-@@@ | | | | ,char*
-@@@ | | | | | ,int
-@@@ | | | | | | ,intptr_t
-@@@ | | | | | | | ,Pattern
-@@@ | | | | | | | | ,EltPtr
-@@@ | | | | | | | | | ,Elt *
-@@@ | | | | | | | | | | ,Elt
-@@@ | | | | | | | | | | | ,ObjPtr
-@@@ | | | | | | | | | | | | ,ValueListPtr
-@@@ | | | | | | | | | | | | | ,Value
-@@@ | | | | | | | | | | | | | | ,ValueBinding
-@@@ | | | | | | | | | | | | | | | ,ValueList *
-@@@ | | | | | | | | | | | | | | | | ,StrSet *
-@@@ | | | | | | | | | | | | | | | | | ,CharSet
-@@@ | | | | | | | | | | | | | | | | | | ,CharLeaf **
-@@@ | | | | | | | | | | | | | | | | | | | ,Char16 *
-@@@ | | | | | | | | | | | | | | | | | | | | ,Char16
-@@@ | | | | | | | | | | | | | | | | | | | | | ,CharLeaf
-@@@ | | | | | | | | | | | | | | | | | | | | | | ,Char32
-@@@ | | | | | | | | | | | | | | | | | | | | | | | ,Cache
-@@@ | | | | | | | | | | | | | | | | | | | | | | | |
-x86 4321_08_01_04_04_04_10_04_04_08_04_04_0c_04_04_04_10_04_04_02_20_04_20
-mipsel 4321_08_01_04_04_04_10_04_04_08_04_04_10_04_04_04_10_04_04_02_20_04_20
-x86-64 4321_08_01_08_04_08_18_08_08_10_04_08_10_04_08_08_18_08_08_02_20_04_38
-m68k 1234_08_01_04_04_04_10_04_04_08_04_04_0c_04_04_04_10_04_04_02_20_04_20
-ppc 1234_08_01_04_04_04_10_04_04_08_04_04_10_04_04_04_10_04_04_02_20_04_20
-ppc64 1234_08_01_08_04_08_18_08_08_10_04_08_10_04_08_08_18_08_08_02_20_04_38
+@@@ ,name (endianness,pointer-size,double-alignment)
+@@@ | ,endian
+@@@ | | ,FcAlign
+@@@ | | | ,char
+@@@ | | | | ,char*
+@@@ | | | | | ,int
+@@@ | | | | | | ,intptr_t
+@@@ | | | | | | | ,Pattern
+@@@ | | | | | | | | ,EltPtr
+@@@ | | | | | | | | | ,Elt *
+@@@ | | | | | | | | | | ,Elt
+@@@ | | | | | | | | | | | ,ObjPtr
+@@@ | | | | | | | | | | | | ,ValueListPtr
+@@@ | | | | | | | | | | | | | ,Value
+@@@ | | | | | | | | | | | | | | ,ValueBinding
+@@@ | | | | | | | | | | | | | | | ,ValueList *
+@@@ | | | | | | | | | | | | | | | | ,StrSet *
+@@@ | | | | | | | | | | | | | | | | | ,CharSet
+@@@ | | | | | | | | | | | | | | | | | | ,CharLeaf **
+@@@ | | | | | | | | | | | | | | | | | | | ,Char16 *
+@@@ | | | | | | | | | | | | | | | | | | | | ,Char16
+@@@ | | | | | | | | | | | | | | | | | | | | | ,CharLeaf
+@@@ | | | | | | | | | | | | | | | | | | | | | | ,Char32
+@@@ | | | | | | | | | | | | | | | | | | | | | | | ,Cache
+@@@ | | | | | | | | | | | | | | | | | | | | | | | |
+le32d4 4321_08_01_04_04_04_10_04_04_08_04_04_0c_04_04_04_10_04_04_02_20_04_20
+le32d8 4321_08_01_04_04_04_10_04_04_08_04_04_10_04_04_04_10_04_04_02_20_04_20
+le64 4321_08_01_08_04_08_18_08_08_10_04_08_10_04_08_08_18_08_08_02_20_04_38
+be32d4 1234_08_01_04_04_04_10_04_04_08_04_04_0c_04_04_04_10_04_04_02_20_04_20
+be32d8 1234_08_01_04_04_04_10_04_04_08_04_04_10_04_04_04_10_04_04_02_20_04_20
+be64 1234_08_01_08_04_08_18_08_08_10_04_08_10_04_08_08_18_08_08_02_20_04_38
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/fontconfig
