Set GC_GRANULE_BYTES/GC_GRANULE_WORDS for x32

(Apply commit 4a0675b from 'master' branch)

        * include/gc_tiny_fl.h (GC_GRANULE_BYTES): Set to 8 for x32.
        (GC_GRANULE_WORDS): Set to 2 for x32.

diff --git a/include/gc_tiny_fl.h b/include/gc_tiny_fl.h
index 91b77fdf2277fac468d994fd909d06412c18cc45..7758151e8f55840f4d2e6702cf990082c9fb9e2a 100644 (file)
--- a/include/gc_tiny_fl.h
+++ b/include/gc_tiny_fl.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (c) 1999-2005 Hewlett-Packard Development Company, L.P.
  *
  * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
@@ -20,7 +20,7 @@
  * However, global free lists are known to the GC.  "Tiny" free lists
  * are basically private to the client.  Their contents are viewed as
  * "in use" and marked accordingly by the core of the GC.
- * 
+ *
  * Note that inlined code might know about the layout of these and the constants
  * involved.  Thus any change here may invalidate clients, and such changes should
  * be avoided.  Hence we keep this as simple as possible.
@@ -47,7 +47,8 @@
   /* library that may be shared between applications, since it affects   */
   /* the binary interface to the library.                                */
 # if defined(__LP64__) || defined (_LP64) || defined(_WIN64) \
-       || defined(__s390x__) || defined(__x86_64__) \
+        || defined(__s390x__) \
+        || (defined(__x86_64__) && !defined(__ILP32__)) \
        || defined(__alpha__) || defined(__powerpc64__) \
        || defined(__arch64__)
 #  define GC_GRANULE_BYTES 16