diff options
| author | wtchang%redhat.com <devnull@localhost> | 2005-07-21 18:22:54 +0000 |
|---|---|---|
| committer | wtchang%redhat.com <devnull@localhost> | 2005-07-21 18:22:54 +0000 |
| commit | fa02e01a60376e51469f0c6f7507cc941323dc1e (patch) | |
| tree | 0c225b739baf3e480a11734a49a7b5fac7c424b8 | |
| parent | a9f91f4e6421d1ddbc71f360f326dfbedeccca1c (diff) | |
| download | nspr-hg-fa02e01a60376e51469f0c6f7507cc941323dc1e.tar.gz | |
Bugzilla Bug 298674: checked in the remaining changes for the RISC OS port.
The patch is contributed by Peter Naulls <peter@chocky.org>. r=wtc
Modified Files: _pth.h _riscos.cfg _riscos.h prmem.c prsystem.c
| -rw-r--r-- | pr/include/md/_pth.h | 2 | ||||
| -rw-r--r-- | pr/include/md/_riscos.cfg | 9 | ||||
| -rw-r--r-- | pr/include/md/_riscos.h | 8 | ||||
| -rw-r--r-- | pr/src/malloc/prmem.c | 1 | ||||
| -rw-r--r-- | pr/src/misc/prsystem.c | 2 |
5 files changed, 15 insertions, 7 deletions
diff --git a/pr/include/md/_pth.h b/pr/include/md/_pth.h index e867026e..aadb45e0 100644 --- a/pr/include/md/_pth.h +++ b/pr/include/md/_pth.h @@ -294,7 +294,7 @@ extern int (*_PT_aix_yield_fcn)(); #elif defined(HPUX) || defined(LINUX) || defined(SOLARIS) \ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ || defined(BSDI) || defined(NTO) || defined(DARWIN) \ - || defined(UNIXWARE) + || defined(UNIXWARE) || defined(RISCOS) #define _PT_PTHREAD_YIELD() sched_yield() #else #error "Need to define _PT_PTHREAD_YIELD for this platform" diff --git a/pr/include/md/_riscos.cfg b/pr/include/md/_riscos.cfg index 7a241fa5..86b88eb5 100644 --- a/pr/include/md/_riscos.cfg +++ b/pr/include/md/_riscos.cfg @@ -80,6 +80,15 @@ #define PR_BITS_PER_DOUBLE_LOG2 6 #define PR_BITS_PER_WORD_LOG2 5 +#define PR_ALIGN_OF_SHORT 2 +#define PR_ALIGN_OF_INT 4 +#define PR_ALIGN_OF_LONG 4 +#define PR_ALIGN_OF_INT64 4 +#define PR_ALIGN_OF_FLOAT 4 +#define PR_ALIGN_OF_DOUBLE 4 +#define PR_ALIGN_OF_POINTER 4 +#define PR_ALIGN_OF_WORD 4 + #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 #define PR_WORDS_PER_DWORD_LOG2 1 diff --git a/pr/include/md/_riscos.h b/pr/include/md/_riscos.h index 714a9ad9..5a0309eb 100644 --- a/pr/include/md/_riscos.h +++ b/pr/include/md/_riscos.h @@ -54,18 +54,14 @@ #define _PR_STAT_HAS_ONLY_ST_ATIME #define _PR_HAVE_POSIX_SEMAPHORES -#define uint unsigned int - -#undef atoll - #include <sys/select.h> #include <sys/poll.h> #include <kernel.h> #undef HAVE_STACK_GROWING_UP -#undef HAVE_DLL -#undef USE_DLFCN +#undef HAVE_DLL +#undef USE_DLFCN #define NEED_STRFTIME_LOCK #define NEED_TIME_R #define PT_NO_SIGTIMEDWAIT diff --git a/pr/src/malloc/prmem.c b/pr/src/malloc/prmem.c index 9243158f..73fa59bc 100644 --- a/pr/src/malloc/prmem.c +++ b/pr/src/malloc/prmem.c @@ -172,6 +172,7 @@ pr_FindSymbolInProg(const char *name) { /* can't be implemented */ return NULL; +} #endif /* HAVE_DLL */ diff --git a/pr/src/misc/prsystem.c b/pr/src/misc/prsystem.c index d0775d34..f931e3af 100644 --- a/pr/src/misc/prsystem.c +++ b/pr/src/misc/prsystem.c @@ -255,6 +255,8 @@ PR_IMPLEMENT(PRInt32) PR_GetNumberOfProcessors( void ) } #elif defined(IRIX) numCpus = sysconf( _SC_NPROC_ONLN ); +#elif defined(RISCOS) + numCpus = 1; #elif defined(XP_UNIX) numCpus = sysconf( _SC_NPROCESSORS_ONLN ); #else |