diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-08-30 04:24:03 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2006-08-30 04:24:03 -0700 |
| commit | e3096d90fd3e0ba8b62d2c6df4cfb24f08a0766c (patch) | |
| tree | d7455161369f9b55e0a0d10cc9d7dabd86dadf2b /fc-arch | |
| parent | 7ce196733129b0e664c1bdc20f973f15167292f7 (diff) | |
Fix build problems caused by cache rework.
Pagesize no longer matters in architecture decisions, the entire cache file
is mmaped into the library. However, lots of intptr_t values are in use now,
so that value is important.
fc-lang now requires fcserialize.c, which has been added to the repository.
Diffstat (limited to 'fc-arch')
| -rw-r--r-- | fc-arch/fc-arch.c | 14 | ||||
| -rw-r--r-- | fc-arch/fcarch.tmpl.h | 4 |
2 files changed, 5 insertions, 13 deletions
diff --git a/fc-arch/fc-arch.c b/fc-arch/fc-arch.c index 01790346..2fa6b18e 100644 --- a/fc-arch/fc-arch.c +++ b/fc-arch/fc-arch.c @@ -26,9 +26,6 @@ #define ENDIAN_TEST 0x12345678 #define MACHINE_SIGNATURE_SIZE (9*21 + 1) -#define MACHINE_ARCH_SIZE 32 -/* for when we don't have sysconf: */ -#define FC_HARDCODED_PAGESIZE 8192 static char * FcCacheMachineSignature (void) @@ -44,11 +41,12 @@ FcCacheMachineSignature (void) (unsigned int)sizeof (char), (unsigned int)sizeof (char *), (unsigned int)sizeof (int), + (unsigned int)sizeof (intptr_t), (unsigned int)sizeof (FcPattern), (unsigned int)sizeof (FcPatternEltPtr), (unsigned int)sizeof (struct FcPatternElt *), (unsigned int)sizeof (FcPatternElt), - (unsigned int)sizeof (FcObjectPtr), + (unsigned int)sizeof (FcObject), (unsigned int)sizeof (FcValueListPtr), (unsigned int)sizeof (FcValue), (unsigned int)sizeof (FcValueBinding), @@ -59,13 +57,7 @@ FcCacheMachineSignature (void) (unsigned int)sizeof (FcChar16), (unsigned int)sizeof (FcCharLeaf), (unsigned int)sizeof (FcChar32), - (unsigned int)sizeof (FcCache), -#if defined (HAVE_SYSCONF) - (unsigned int)sysconf(_SC_PAGESIZE) -#else - (unsigned int)FC_HARDCODED_PAGESIZE -#endif - ); + (unsigned int)sizeof (FcCache)); return buf; } diff --git a/fc-arch/fcarch.tmpl.h b/fc-arch/fcarch.tmpl.h index 4cf483f0..b0712e5b 100644 --- a/fc-arch/fcarch.tmpl.h +++ b/fc-arch/fcarch.tmpl.h @@ -28,8 +28,8 @@ @@@ name. Architecture names are used to construct file names, so @@@ use something reasonable and don't include any spaces @@@ -@@@ name endian char char* int Pattern EltPtr Elt * Elt ObjPtr VLPtr Value Binding VL * CharSet Leaf** Char16 * Char16 Leaf Char32 Cache PageSize -x86 78563412_00000001_00000004_00000004_00000018_00000008_00000004_0000000c_00000004_00000008_0000000c_00000004_00000004_00000014_00000004_00000004_00000002_00000020_00000004_00000038_00001000 +@@@ name endian char char* int intptr_t Pattern EltPtr Elt * Elt ObjPtr VLPtr Value Binding VL * CharSet Leaf** Char16 * Char16 Leaf Char32 Cache +x86 78563412_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_0000000c_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_00000018 x86-64 78563412_00000001_00000008_00000004_00000020_00000010_00000008_00000018_00000004_00000010_00000010_00000004_00000008_00000020_00000008_00000008_00000002_00000020_00000004_00000040_00001000 ppc-4k 12345678_00000001_00000004_00000004_00000018_00000008_00000004_0000000c_00000004_00000008_00000010_00000004_00000004_00000014_00000004_00000004_00000002_00000020_00000004_00000038_00001000 ppc-64k 12345678_00000001_00000004_00000004_00000018_00000008_00000004_0000000c_00000004_00000008_00000010_00000004_00000004_00000014_00000004_00000004_00000002_00000020_00000004_00000038_00010000 |