summaryrefslogtreecommitdiff
path: root/misc.c
diff options
context:
space:
mode:
authorivmai <ivmai>2011-04-26 12:47:02 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:58 +0200
commit782c5a03ff94e2e2c4ec90ab40e6302a083e8abf (patch)
treeed5e6d1672cacabacd71de8cc06df4bd46e07e6c /misc.c
parent6b733bad5f8e5c496333ab85774a532ca5b73349 (diff)
2011-04-26 Ivan Maidanski <ivmai@mail.ru>
* alloc.c: Don't include sys/types.h for ArmCC. * dyn_load.c: Ditto. * os_dep.c: Ditto. * mach_dep.c (_setjmp, _longjmp): Redirect to setjmp/longjmp for ArmCC. * mark.c (GC_noop): Define specially for ArmCC. * include/private/gc_priv.h (GC_noop): Ditto. * misc.c (GC_init): Don't test pointers comparison for ArmCC. * misc.c: Don't include unistd.h for ArmCC. * os_dep.c (pages_executable): Rename to GC_pages_executable; make STATIC. * os_dep.c (GC_unix_mmap_get_mem): Don't define for ArmCC. * ptr_chck.c (GC_is_visible): Explicitly cast (GC_DS_PER_OBJECT-GC_INDIR_PER_OBJ_BIAS) to word (to suppress a compiler warning). * include/private/gcconfig.h: Recognize __arm. * include/private/gcconfig.h (HBLKPTR): Define for ArmCC. * include/private/gcconfig.h (HBLKPTR): Add parentheses for "bytes" argument.
Diffstat (limited to 'misc.c')
-rw-r--r--misc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/misc.c b/misc.c
index ee6fa96..bd8730f 100644
--- a/misc.c
+++ b/misc.c
@@ -951,9 +951,9 @@ GC_API void GC_CALL GC_init(void)
GC_STATIC_ASSERT((word)(-1) > (word)0);
/* word should be unsigned */
# endif
-# if !defined(__BORLANDC__) /* Workaround for Borland C */
- GC_STATIC_ASSERT((ptr_t)(word)(-1) > (ptr_t)0);
- /* Ptr_t comparisons should behave as unsigned comparisons. */
+# if !defined(__BORLANDC__) && !defined(__CC_ARM) /* Workaround */
+ GC_STATIC_ASSERT((ptr_t)(word)(-1) > (ptr_t)0);
+ /* Ptr_t comparisons should behave as unsigned comparisons. */
# endif
GC_STATIC_ASSERT((signed_word)(-1) < (signed_word)0);
# ifndef GC_DISABLE_INCREMENTAL
@@ -1245,7 +1245,7 @@ GC_API void GC_CALL GC_enable_incremental(void)
# define WRITE(f, buf, len) (GC_set_files(), GC_write(f, buf, len))
#else
-# if !defined(AMIGA)
+# if !defined(AMIGA) && !defined(__CC_ARM)
# include <unistd.h>
# endif