diff options
| author | Hans-Peter Nilsson <hp@axis.com> | 2005-04-19 16:01:38 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@gcc.gnu.org> | 2005-04-19 16:01:38 +0000 |
| commit | 2586bf38d81521841f2f743ebabd445b489c3060 (patch) | |
| tree | 045f7a91a4f24434c2a5434be785d111b787706f /boehm-gc/include | |
| parent | 9be3f9b143399e0e4d65faab5aa9bd46b898d735 (diff) | |
| download | gcc-2586bf38d81521841f2f743ebabd445b489c3060.zip gcc-2586bf38d81521841f2f743ebabd445b489c3060.tar.gz gcc-2586bf38d81521841f2f743ebabd445b489c3060.tar.bz2 | |
os_dep.c, gc_locks.h: Import CRIS port by Simon Posnjak from gc6.4.
* os_dep.c, include/private/gc_locks.h: Import CRIS port by
Simon Posnjak from gc6.4.
* include/private/gcconfig.h: Ditto. Add M32R note from gc6.4.
From-SVN: r98414
Diffstat (limited to 'boehm-gc/include')
| -rw-r--r-- | boehm-gc/include/private/gc_locks.h | 24 | ||||
| -rw-r--r-- | boehm-gc/include/private/gcconfig.h | 23 |
2 files changed, 46 insertions, 1 deletions
diff --git a/boehm-gc/include/private/gc_locks.h b/boehm-gc/include/private/gc_locks.h index 775176b..46605ca 100644 --- a/boehm-gc/include/private/gc_locks.h +++ b/boehm-gc/include/private/gc_locks.h @@ -215,6 +215,30 @@ } # define GC_TEST_AND_SET_DEFINED # endif /* ARM32 */ +# ifdef CRIS + inline static int GC_test_and_set(volatile unsigned int *addr) { + /* Ripped from linuxthreads/sysdeps/cris/pt-machine.h. */ + /* Included with Hans-Peter Nilsson's permission. */ + register unsigned long int ret; + + /* Note the use of a dummy output of *addr to expose the write. + * The memory barrier is to stop *other* writes being moved past + * this code. + */ + __asm__ __volatile__("clearf\n" + "0:\n\t" + "movu.b [%2],%0\n\t" + "ax\n\t" + "move.b %3,[%2]\n\t" + "bwf 0b\n\t" + "clearf" + : "=&r" (ret), "=m" (*addr) + : "r" (addr), "r" ((int) 1), "m" (*addr) + : "memory"); + return ret; + } +# define GC_TEST_AND_SET_DEFINED +# endif /* CRIS */ # ifdef S390 inline static int GC_test_and_set(volatile unsigned int *addr) { int ret; diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h index a9ed717..5013dbd 100644 --- a/boehm-gc/include/private/gcconfig.h +++ b/boehm-gc/include/private/gcconfig.h @@ -229,6 +229,12 @@ # define ARM32 # define mach_type_known # endif +# if defined(LINUX) && defined(__cris__) +# ifndef CRIS +# define CRIS +# endif +# define mach_type_known +# endif # if defined(LINUX) && (defined(powerpc) || defined(__powerpc__) || defined(powerpc64) || defined(__powerpc64__)) # define POWERPC # define mach_type_known @@ -476,6 +482,8 @@ /* POWERPC ==> IBM/Apple PowerPC */ /* (MACOS(<=9),DARWIN(incl.MACOSX),*/ /* LINUX, NETBSD, NOSYS variants) */ + /* CRIS ==> Axis Etrax */ + /* M32R ==> Renesas M32R */ /* @@ -1801,6 +1809,19 @@ # endif #endif +# ifdef CRIS +# define MACH_TYPE "CRIS" +# define CPP_WORDSZ 32 +# define ALIGNMENT 1 +# define OS_TYPE "LINUX" +# define DYNAMIC_LOADING +# define LINUX_STACKBOTTOM +# define USE_GENERIC_PUSH_REGS +# define SEARCH_FOR_DATA_START + extern int _end[]; +# define DATAEND (_end) +# endif + # ifdef SH # define MACH_TYPE "SH" # define ALIGNMENT 4 @@ -2066,7 +2087,7 @@ # endif # if defined(HP_PA) || defined(M88K) || defined(POWERPC) && !defined(DARWIN) \ - || defined(LINT) || defined(MSWINCE) || defined(ARM32) \ + || defined(LINT) || defined(MSWINCE) || defined(ARM32) || defined(CRIS) \ || (defined(I386) && defined(__LCC__)) /* Use setjmp based hack to mark from callee-save registers. */ /* The define should move to the individual platform */ |