diff options
| author | John-Mark Bell <jmb@netsurf-browser.org> | 2016-10-05 22:13:08 +0000 |
|---|---|---|
| committer | John-Mark Bell <jmb@netsurf-browser.org> | 2016-10-05 23:50:42 +0000 |
| commit | 18b4a41b2bf7b3cd9a863563fe791eb41a66a14b (patch) | |
| tree | 32031419d0f0d42baf91e5d4b5437a04db1a0907 /sdk/recipes/patches | |
| parent | 9f08355d74157e94da3fa162677e3c001c6dffc6 (diff) | |
| download | toolchains-18b4a41b2bf7b3cd9a863563fe791eb41a66a14b.tar.gz toolchains-18b4a41b2bf7b3cd9a863563fe791eb41a66a14b.tar.bz2 | |
SDK: remove spidermonkey and nspr
Diffstat (limited to 'sdk/recipes/patches')
30 files changed, 0 insertions, 2138 deletions
diff --git a/sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p b/sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p deleted file mode 100644 index f3253ae..0000000 --- a/sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig 2012-12-11 13:03:16.440827000 +0000 -+++ mozilla/nsprpub/pr/src/pthreads/ptthread.c 2012-12-11 13:03:42.923932000 +0000 -@@ -1653,7 +1653,7 @@ - #endif - - *(void**)(&dynamic_pthread_setname_np) = -- dlsym(RTLD_DEFAULT, "pthread_setname_np"); -+ dlsym(RTLD_GLOBAL, "pthread_setname_np"); - if (!dynamic_pthread_setname_np) - return PR_SUCCESS; - diff --git a/sdk/recipes/patches/nspr/arm-unknown-riscos/thread_noops.p b/sdk/recipes/patches/nspr/arm-unknown-riscos/thread_noops.p deleted file mode 100644 index c97bf23..0000000 --- a/sdk/recipes/patches/nspr/arm-unknown-riscos/thread_noops.p +++ /dev/null @@ -1,135 +0,0 @@ -=== modified file 'mozilla/nsprpub/pr/include/private/primpl.h' ---- mozilla/nsprpub/pr/include/private/primpl.h 2012-11-04 17:32:26 +0000 -+++ mozilla/nsprpub/pr/include/private/primpl.h 2012-11-04 17:57:04 +0000 -@@ -501,8 +501,8 @@ - - #endif /* _PR_GLOBAL_THREADS_ONLY */ - --#define _PR_SET_RESCHED_FLAG() _PR_MD_CURRENT_CPU()->u.missed[3] = 1 --#define _PR_CLEAR_RESCHED_FLAG() _PR_MD_CURRENT_CPU()->u.missed[3] = 0 -+#define _PR_SET_RESCHED_FLAG() -+#define _PR_CLEAR_RESCHED_FLAG() - - extern _PRInterruptTable _pr_interruptTable[]; - - -=== modified file 'mozilla/nsprpub/pr/src/io/prlog.c' ---- mozilla/nsprpub/pr/src/io/prlog.c 2012-11-04 17:32:26 +0000 -+++ mozilla/nsprpub/pr/src/io/prlog.c 2012-11-04 17:43:20 +0000 -@@ -29,20 +29,9 @@ - #define _PR_UNLOCK_LOG() _PR_LOCK_UNLOCK(_pr_logLock); } - #else - --#define _PR_LOCK_LOG() \ --{ \ -- PRIntn _is; \ -- PRThread *_me = _PR_MD_CURRENT_THREAD(); \ -- if (!_PR_IS_NATIVE_THREAD(_me)) \ -- _PR_INTSOFF(_is); \ -- _PR_LOCK_LOCK(_pr_logLock) -+#define _PR_LOCK_LOG() - --#define _PR_UNLOCK_LOG() \ -- _PR_LOCK_UNLOCK(_pr_logLock); \ -- PR_ASSERT(_me == _PR_MD_CURRENT_THREAD()); \ -- if (!_PR_IS_NATIVE_THREAD(_me)) \ -- _PR_INTSON(_is); \ --} -+#define _PR_UNLOCK_LOG() - - #endif - - -=== modified file 'mozilla/nsprpub/pr/src/malloc/prmem.c' ---- mozilla/nsprpub/pr/src/malloc/prmem.c 2012-11-04 17:32:26 +0000 -+++ mozilla/nsprpub/pr/src/malloc/prmem.c 2012-11-04 17:45:50 +0000 -@@ -576,24 +576,10 @@ - } \ - } - #else /* IRIX */ --#define _PR_Lock_Malloc() { \ -- PRIntn _is; \ -- if(PR_TRUE == _PR_malloc_initialised) { \ -- if (_PR_MD_CURRENT_THREAD() && \ -- !_PR_IS_NATIVE_THREAD( \ -- _PR_MD_CURRENT_THREAD())) \ -- _PR_INTSOFF(_is); \ -- _PR_MD_LOCK(&_PR_MD_malloc_crustylock); \ -- } -- --#define _PR_Unlock_Malloc() if(PR_TRUE == _PR_malloc_initialised) { \ -- _PR_MD_UNLOCK(&_PR_MD_malloc_crustylock); \ -- if (_PR_MD_CURRENT_THREAD() && \ -- !_PR_IS_NATIVE_THREAD( \ -- _PR_MD_CURRENT_THREAD())) \ -- _PR_INTSON(_is); \ -- } \ -- } -+#define _PR_Lock_Malloc() -+ -+#define _PR_Unlock_Malloc() -+ - #endif /* IRIX */ - #endif /* _PR_PTHREADS */ - - -=== modified file 'mozilla/nsprpub/pr/src/md/unix/riscos.c' ---- mozilla/nsprpub/pr/src/md/unix/riscos.c 2012-11-04 17:32:26 +0000 -+++ mozilla/nsprpub/pr/src/md/unix/riscos.c 2012-11-04 17:55:17 +0000 -@@ -44,8 +44,6 @@ - * set the pointers to the stack-pointer and frame-pointer words in the - * context structure; this is for debugging use. - */ -- thread->md.sp = _MD_GET_SP_PTR(thread); -- thread->md.fp = _MD_GET_FP_PTR(thread); - return PR_SUCCESS; - } - - ---- mozilla/nsprpub/pr/include/md/_riscos.h 2012-03-06 13:13:53.000000000 +0000 -+++ mozilla/nsprpub/pr/include/md/_riscos.h 2012-12-10 01:29:32.341270324 +0000 -@@ -22,6 +22,10 @@ - #define _PR_STAT_HAS_ONLY_ST_ATIME - #define _PR_HAVE_POSIX_SEMAPHORES - -+#define _PR_STACK_VMBASE 0x50000000 -+#define _MD_MMAP_FLAGS MAP_PRIVATE -+#define _MD_DEFAULT_STACK_SIZE 65536L -+ - #include <sys/select.h> - #include <sys/poll.h> - #include <kernel.h> -@@ -47,7 +51,6 @@ - #define _PR_CONTEXT_TYPE jmp_buf - #define _PR_NUM_GCREGS _JBLEN - #define _MD_GET_SP(_t) (_t)->md.context[7] -- - #define CONTEXT(_th) ((_th)->md.context) - - -@@ -84,6 +87,7 @@ - _PR_CONTEXT_TYPE context; - int id; - int errcode; -+ int no_sched; - }; - - struct _MDThreadStack { -@@ -164,6 +168,7 @@ - #define _MD_SUSPEND_THREAD(thread) - #define _MD_RESUME_THREAD(thread) - #define _MD_CLEAN_THREAD(_thread) -+#define _MD_SET_CURRENT_THREAD_NAME(thread) - - /* - ** We wrapped the select() call. _MD_SELECT refers to the built-in, -@@ -174,4 +179,9 @@ - #include <sys/select.h> - #define _MD_SELECT select - -+#ifdef _PR_POLL_AVAILABLE -+#include <sys/poll.h> -+#define _MD_POLL poll -+#endif -+ - #endif /* nspr_riscos_defs_h___ */ diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/Makefile.ref.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/Makefile.ref.p deleted file mode 100644 index 9b13f6b..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/Makefile.ref.p +++ /dev/null @@ -1,33 +0,0 @@ ---- js/src/Makefile.ref.orig 2006-07-26 20:16:47.000000000 +0100 -+++ js/src/Makefile.ref 2012-12-16 12:32:02.331547000 +0000 -@@ -305,7 +305,7 @@ - $(OBJDIR)/jskwgen.$(OBJ_SUFFIX): jskwgen.c jskeyword.tbl - - $(OBJDIR)/jsautokw.h: $(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX) jskeyword.tbl -- $(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX) $@ -+# $(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX) $@ - - ifdef USE_MSVC - -@@ -349,8 +349,8 @@ - $(HFILES) $(CFILES): $(OBJDIR)/jsautocfg.h - - $(OBJDIR)/jsautocfg.h: $(OBJDIR)/jscpucfg -- rm -f $@ -- $(OBJDIR)/jscpucfg > $@ -+# rm -f $@ -+# $(OBJDIR)/jscpucfg > $@ - - $(OBJDIR)/jscpucfg: $(OBJDIR)/jscpucfg.o - $(CC) -o $@ $(OBJDIR)/jscpucfg.o ---- js/src/editline/Makefile.ref.orig 2005-02-12 20:10:33.000000000 +0000 -+++ js/src/editline/Makefile.ref 2012-12-16 12:36:54.983350000 +0000 -@@ -103,7 +103,7 @@ - LIBRARY = $(OBJDIR)/libedit.a - - define MAKE_OBJDIR --if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); fi -+if test ! -d $(@D); then rm -rf $(@D); mkdir -p $(@D); fi - endef - - all: $(LIBRARY) diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/RISCOS.mk.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/RISCOS.mk.p deleted file mode 100644 index f4afe55..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/RISCOS.mk.p +++ /dev/null @@ -1,69 +0,0 @@ ---- js/src/config/RISCOS.mk.orig 2012-12-16 12:03:22.369313976 +0000 -+++ js/src/config/RISCOS.mk 2012-12-16 12:03:16.485339267 +0000 -@@ -0,0 +1,66 @@ -+# -*- Mode: makefile -*- -+# -+# ***** BEGIN LICENSE BLOCK ***** -+# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+# -+# The contents of this file are subject to the Mozilla Public License Version -+# 1.1 (the "License"); you may not use this file except in compliance with -+# the License. You may obtain a copy of the License at -+# http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+# for the specific language governing rights and limitations under the -+# License. -+# -+# The Original Code is Mozilla Communicator client code, released -+# March 31, 1998. -+# -+# The Initial Developer of the Original Code is -+# Netscape Communications Corporation. -+# Portions created by the Initial Developer are Copyright (C) 1998 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# -+# Alternatively, the contents of this file may be used under the terms of -+# either the GNU General Public License Version 2 or later (the "GPL"), or -+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the MPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the MPL, the GPL or the LGPL. -+# -+# ***** END LICENSE BLOCK ***** -+ -+# -+# Config for all versions of Linux -+# -+ -+CCC := $(CXX) -+CC ?= gcc -+CCC ?= g++ -+CFLAGS += -static -Wall -Wno-format -+OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -+ -+RANLIB = echo -+MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS) -+ -+#.c.o: -+# $(CC) -c -MD $*.d $(CFLAGS) $< -+ -+CPU_ARCH = arm -+ -+GFX_ARCH = x -+ -+OS_LIBS = -lm -lc -+ -+ASFLAGS += -x assembler-with-cpp -+ -+# Use the editline library to provide line-editing support. -+JS_EDITLINE = 1 -+ diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/jsapi.h.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/jsapi.h.p deleted file mode 100644 index e62520b..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/jsapi.h.p +++ /dev/null @@ -1,37 +0,0 @@ ---- js/src/jsapi.h.orig 2014-10-15 16:23:17.799241148 +0100 -+++ js/src/jsapi.h 2014-10-15 16:25:08.771240608 +0100 -@@ -214,7 +214,7 @@ - * comment in jstypes.h regarding safe int64 usage. - */ - extern JS_PUBLIC_API(int64) --JS_Now(); -+JS_Now(void); - - /* Don't want to export data, so provide accessors for non-inline jsvals. */ - extern JS_PUBLIC_API(jsval) -@@ -971,11 +971,11 @@ - JSEqualityOp equality; - JSObjectOp outerObject; - JSObjectOp innerObject; -- void (*reserved0)(); -- void (*reserved1)(); -- void (*reserved2)(); -- void (*reserved3)(); -- void (*reserved4)(); -+ void (*reserved0)(void); -+ void (*reserved1)(void); -+ void (*reserved2)(void); -+ void (*reserved3)(void); -+ void (*reserved4)(void); - }; - - #define JSCLASS_HAS_PRIVATE (1<<0) /* objects have private slot */ -@@ -1962,7 +1962,7 @@ - * to get UTF-8 support. - */ - JS_PUBLIC_API(JSBool) --JS_CStringsAreUTF8(); -+JS_CStringsAreUTF8(void); - - /* - * Character encoding support. diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/jsautocfg.h.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/jsautocfg.h.p deleted file mode 100644 index 5ab277a..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/jsautocfg.h.p +++ /dev/null @@ -1,55 +0,0 @@ ---- js/src/RISCOS_OPT.OBJ/jsautocfg.h.orig 2012-12-16 12:41:07.537588600 +0000 -+++ js/src/RISCOS_OPT.OBJ/jsautocfg.h 2012-12-16 12:40:03.307277000 +0000 -@@ -0,0 +1,52 @@ -+#ifndef js_cpucfg___ -+#define js_cpucfg___ -+ -+/* AUTOMATICALLY GENERATED - DO NOT EDIT */ -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define JS_BYTES_PER_BYTE 1L -+#define JS_BYTES_PER_SHORT 2L -+#define JS_BYTES_PER_INT 4L -+#define JS_BYTES_PER_INT64 8L -+#define JS_BYTES_PER_LONG 4L -+#define JS_BYTES_PER_FLOAT 4L -+#define JS_BYTES_PER_DOUBLE 8L -+#define JS_BYTES_PER_WORD 4L -+#define JS_BYTES_PER_DWORD 8L -+ -+#define JS_BITS_PER_BYTE 8L -+#define JS_BITS_PER_SHORT 16L -+#define JS_BITS_PER_INT 32L -+#define JS_BITS_PER_INT64 64L -+#define JS_BITS_PER_LONG 32L -+#define JS_BITS_PER_FLOAT 32L -+#define JS_BITS_PER_DOUBLE 64L -+#define JS_BITS_PER_WORD 32L -+ -+#define JS_BITS_PER_BYTE_LOG2 3L -+#define JS_BITS_PER_SHORT_LOG2 4L -+#define JS_BITS_PER_INT_LOG2 5L -+#define JS_BITS_PER_INT64_LOG2 6L -+#define JS_BITS_PER_LONG_LOG2 5L -+#define JS_BITS_PER_FLOAT_LOG2 5L -+#define JS_BITS_PER_DOUBLE_LOG2 6L -+#define JS_BITS_PER_WORD_LOG2 5L -+ -+#define JS_ALIGN_OF_SHORT 2L -+#define JS_ALIGN_OF_INT 4L -+#define JS_ALIGN_OF_LONG 4L -+#define JS_ALIGN_OF_INT64 4L -+#define JS_ALIGN_OF_FLOAT 4L -+#define JS_ALIGN_OF_DOUBLE 4L -+#define JS_ALIGN_OF_POINTER 4L -+#define JS_ALIGN_OF_WORD 4L -+ -+#define JS_BYTES_PER_WORD_LOG2 2L -+#define JS_BYTES_PER_DWORD_LOG2 3L -+#define JS_WORDS_PER_DWORD_LOG2 1L -+ -+#define JS_STACK_GROWTH_DIRECTION (-1) -+ -+#endif /* js_cpucfg___ */ diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/jsautokw.h.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/jsautokw.h.p deleted file mode 100644 index 9c66cf4..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/jsautokw.h.p +++ /dev/null @@ -1,404 +0,0 @@ ---- js/src/RISCOS_OPT.OBJ/jsautokw.h.orig 2012-12-16 12:44:10.504922500 +0000 -+++ js/src/RISCOS_OPT.OBJ/jsautokw.h 2012-12-16 12:44:24.520490000 +0000 -@@ -0,0 +1,401 @@ -+ /* -+ * Generating switch for the list of 61 entries: -+ * break -+ * case -+ * continue -+ * default -+ * delete -+ * do -+ * else -+ * export -+ * false -+ * for -+ * function -+ * if -+ * in -+ * new -+ * null -+ * return -+ * switch -+ * this -+ * true -+ * typeof -+ * var -+ * void -+ * while -+ * with -+ * const -+ * try -+ * catch -+ * finally -+ * throw -+ * instanceof -+ * abstract -+ * boolean -+ * byte -+ * char -+ * class -+ * double -+ * extends -+ * final -+ * float -+ * goto -+ * implements -+ * import -+ * int -+ * interface -+ * long -+ * native -+ * package -+ * private -+ * protected -+ * public -+ * short -+ * static -+ * super -+ * synchronized -+ * throws -+ * transient -+ * volatile -+ * enum -+ * debugger -+ * yield -+ * let -+ */ -+ switch (JSKW_LENGTH()) { -+ case 2: -+ if (JSKW_AT(0) == 'd') { -+ if (JSKW_AT(1)=='o') { -+ JSKW_GOT_MATCH(5) /* do */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(0) == 'i') { -+ if (JSKW_AT(1) == 'f') { -+ JSKW_GOT_MATCH(11) /* if */ -+ } -+ if (JSKW_AT(1) == 'n') { -+ JSKW_GOT_MATCH(12) /* in */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 3: -+ switch (JSKW_AT(2)) { -+ case 'r': -+ if (JSKW_AT(0) == 'f') { -+ if (JSKW_AT(1)=='o') { -+ JSKW_GOT_MATCH(9) /* for */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(0) == 'v') { -+ if (JSKW_AT(1)=='a') { -+ JSKW_GOT_MATCH(20) /* var */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 't': -+ if (JSKW_AT(0) == 'i') { -+ if (JSKW_AT(1)=='n') { -+ JSKW_GOT_MATCH(42) /* int */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(0) == 'l') { -+ if (JSKW_AT(1)=='e') { -+ JSKW_GOT_MATCH(60) /* let */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 'w': -+ if (JSKW_AT(0)=='n' && JSKW_AT(1)=='e') { -+ JSKW_GOT_MATCH(13) /* new */ -+ } -+ JSKW_NO_MATCH() -+ case 'y': -+ if (JSKW_AT(0)=='t' && JSKW_AT(1)=='r') { -+ JSKW_GOT_MATCH(25) /* try */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 4: -+ switch (JSKW_AT(3)) { -+ case 'd': -+ if (JSKW_AT(0)=='v' && JSKW_AT(1)=='o' && JSKW_AT(2)=='i') { -+ JSKW_GOT_MATCH(21) /* void */ -+ } -+ JSKW_NO_MATCH() -+ case 'e': -+ if (JSKW_AT(2) == 's') { -+ if (JSKW_AT(0) == 'c') { -+ if (JSKW_AT(1)=='a') { -+ JSKW_GOT_MATCH(1) /* case */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(0) == 'e') { -+ if (JSKW_AT(1)=='l') { -+ JSKW_GOT_MATCH(6) /* else */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(2) == 't') { -+ if (JSKW_AT(0)=='b' && JSKW_AT(1)=='y') { -+ JSKW_GOT_MATCH(32) /* byte */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(2) == 'u') { -+ if (JSKW_AT(0)=='t' && JSKW_AT(1)=='r') { -+ JSKW_GOT_MATCH(18) /* true */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 'g': -+ if (JSKW_AT(0)=='l' && JSKW_AT(1)=='o' && JSKW_AT(2)=='n') { -+ JSKW_GOT_MATCH(44) /* long */ -+ } -+ JSKW_NO_MATCH() -+ case 'h': -+ if (JSKW_AT(0)=='w' && JSKW_AT(1)=='i' && JSKW_AT(2)=='t') { -+ JSKW_GOT_MATCH(23) /* with */ -+ } -+ JSKW_NO_MATCH() -+ case 'l': -+ if (JSKW_AT(0)=='n' && JSKW_AT(1)=='u' && JSKW_AT(2)=='l') { -+ JSKW_GOT_MATCH(14) /* null */ -+ } -+ JSKW_NO_MATCH() -+ case 'm': -+ if (JSKW_AT(0)=='e' && JSKW_AT(1)=='n' && JSKW_AT(2)=='u') { -+ JSKW_GOT_MATCH(57) /* enum */ -+ } -+ JSKW_NO_MATCH() -+ case 'o': -+ if (JSKW_AT(0)=='g' && JSKW_AT(1)=='o' && JSKW_AT(2)=='t') { -+ JSKW_GOT_MATCH(39) /* goto */ -+ } -+ JSKW_NO_MATCH() -+ case 'r': -+ if (JSKW_AT(0)=='c' && JSKW_AT(1)=='h' && JSKW_AT(2)=='a') { -+ JSKW_GOT_MATCH(33) /* char */ -+ } -+ JSKW_NO_MATCH() -+ case 's': -+ if (JSKW_AT(0)=='t' && JSKW_AT(1)=='h' && JSKW_AT(2)=='i') { -+ JSKW_GOT_MATCH(17) /* this */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 5: -+ switch (JSKW_AT(3)) { -+ case 'a': -+ if (JSKW_AT(0) == 'b') { -+ if (JSKW_AT(4)=='k' && JSKW_AT(1)=='r' && JSKW_AT(2)=='e') { -+ JSKW_GOT_MATCH(0) /* break */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(0) == 'f') { -+ if (JSKW_AT(4) == 'l') { -+ if (JSKW_AT(2)=='n' && JSKW_AT(1)=='i') { -+ JSKW_GOT_MATCH(37) /* final */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(4) == 't') { -+ if (JSKW_AT(2)=='o' && JSKW_AT(1)=='l') { -+ JSKW_GOT_MATCH(38) /* float */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 'c': -+ if (JSKW_AT(0)=='c' && JSKW_AT(1)=='a' && JSKW_AT(2)=='t' && JSKW_AT(4)=='h') { -+ JSKW_GOT_MATCH(26) /* catch */ -+ } -+ JSKW_NO_MATCH() -+ case 'e': -+ if (JSKW_AT(0)=='s' && JSKW_AT(1)=='u' && JSKW_AT(2)=='p' && JSKW_AT(4)=='r') { -+ JSKW_GOT_MATCH(52) /* super */ -+ } -+ JSKW_NO_MATCH() -+ case 'l': -+ if (JSKW_AT(0) == 'w') { -+ if (JSKW_AT(4)=='e' && JSKW_AT(1)=='h' && JSKW_AT(2)=='i') { -+ JSKW_GOT_MATCH(22) /* while */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(0) == 'y') { -+ if (JSKW_AT(4)=='d' && JSKW_AT(1)=='i' && JSKW_AT(2)=='e') { -+ JSKW_GOT_MATCH(59) /* yield */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 'o': -+ if (JSKW_AT(0)=='t' && JSKW_AT(1)=='h' && JSKW_AT(2)=='r' && JSKW_AT(4)=='w') { -+ JSKW_GOT_MATCH(28) /* throw */ -+ } -+ JSKW_NO_MATCH() -+ case 'r': -+ if (JSKW_AT(0)=='s' && JSKW_AT(1)=='h' && JSKW_AT(2)=='o' && JSKW_AT(4)=='t') { -+ JSKW_GOT_MATCH(50) /* short */ -+ } -+ JSKW_NO_MATCH() -+ case 's': -+ if (JSKW_AT(0) == 'c') { -+ if (JSKW_AT(4) == 's') { -+ if (JSKW_AT(2)=='a' && JSKW_AT(1)=='l') { -+ JSKW_GOT_MATCH(34) /* class */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(4) == 't') { -+ if (JSKW_AT(2)=='n' && JSKW_AT(1)=='o') { -+ JSKW_GOT_MATCH(24) /* const */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(0) == 'f') { -+ if (JSKW_AT(4)=='e' && JSKW_AT(1)=='a' && JSKW_AT(2)=='l') { -+ JSKW_GOT_MATCH(8) /* false */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 6: -+ switch (JSKW_AT(0)) { -+ case 'd': -+ if (JSKW_AT(1) == 'o') { -+ if (JSKW_AT(5)=='e' && JSKW_AT(4)=='l' && JSKW_AT(2)=='u' && JSKW_AT(3)=='b') { -+ JSKW_GOT_MATCH(35) /* double */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(1) == 'e') { -+ if (JSKW_AT(5)=='e' && JSKW_AT(4)=='t' && JSKW_AT(2)=='l' && JSKW_AT(3)=='e') { -+ JSKW_GOT_MATCH(4) /* delete */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 'e': -+ JSKW_TEST_GUESS(7) /* export */ -+ case 'i': -+ JSKW_TEST_GUESS(41) /* import */ -+ case 'n': -+ JSKW_TEST_GUESS(45) /* native */ -+ case 'p': -+ JSKW_TEST_GUESS(49) /* public */ -+ case 'r': -+ JSKW_TEST_GUESS(15) /* return */ -+ case 's': -+ if (JSKW_AT(1) == 't') { -+ if (JSKW_AT(5)=='c' && JSKW_AT(4)=='i' && JSKW_AT(2)=='a' && JSKW_AT(3)=='t') { -+ JSKW_GOT_MATCH(51) /* static */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(1) == 'w') { -+ if (JSKW_AT(5)=='h' && JSKW_AT(4)=='c' && JSKW_AT(2)=='i' && JSKW_AT(3)=='t') { -+ JSKW_GOT_MATCH(16) /* switch */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 't': -+ if (JSKW_AT(5) == 'f') { -+ if (JSKW_AT(4)=='o' && JSKW_AT(1)=='y' && JSKW_AT(2)=='p' && JSKW_AT(3)=='e') { -+ JSKW_GOT_MATCH(19) /* typeof */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(5) == 's') { -+ if (JSKW_AT(4)=='w' && JSKW_AT(1)=='h' && JSKW_AT(2)=='r' && JSKW_AT(3)=='o') { -+ JSKW_GOT_MATCH(54) /* throws */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 7: -+ switch (JSKW_AT(0)) { -+ case 'b': -+ JSKW_TEST_GUESS(31) /* boolean */ -+ case 'd': -+ JSKW_TEST_GUESS(3) /* default */ -+ case 'e': -+ JSKW_TEST_GUESS(36) /* extends */ -+ case 'f': -+ JSKW_TEST_GUESS(27) /* finally */ -+ case 'p': -+ if (JSKW_AT(1) == 'a') { -+ JSKW_TEST_GUESS(46) /* package */ -+ } -+ if (JSKW_AT(1) == 'r') { -+ JSKW_TEST_GUESS(47) /* private */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 8: -+ switch (JSKW_AT(4)) { -+ case 'g': -+ JSKW_TEST_GUESS(58) /* debugger */ -+ case 'i': -+ JSKW_TEST_GUESS(2) /* continue */ -+ case 'r': -+ JSKW_TEST_GUESS(30) /* abstract */ -+ case 't': -+ if (JSKW_AT(1) == 'o') { -+ JSKW_TEST_GUESS(56) /* volatile */ -+ } -+ if (JSKW_AT(1) == 'u') { -+ JSKW_TEST_GUESS(10) /* function */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 9: -+ if (JSKW_AT(1) == 'n') { -+ JSKW_TEST_GUESS(43) /* interface */ -+ } -+ if (JSKW_AT(1) == 'r') { -+ if (JSKW_AT(0) == 'p') { -+ JSKW_TEST_GUESS(48) /* protected */ -+ } -+ if (JSKW_AT(0) == 't') { -+ JSKW_TEST_GUESS(55) /* transient */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 10: -+ if (JSKW_AT(1) == 'n') { -+ JSKW_TEST_GUESS(29) /* instanceof */ -+ } -+ if (JSKW_AT(1) == 'm') { -+ JSKW_TEST_GUESS(40) /* implements */ -+ } -+ JSKW_NO_MATCH() -+ case 12: -+ JSKW_TEST_GUESS(53) /* synchronized */ -+ } -+ JSKW_NO_MATCH() diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/mozilla-js.pc.in.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/mozilla-js.pc.in.p deleted file mode 100644 index dfcbe5e..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/mozilla-js.pc.in.p +++ /dev/null @@ -1,9 +0,0 @@ ---- /dev/null 2012-12-14 09:53:07.266043019 +0000 -+++ js/src/mozilla-js.pc.in 2012-12-16 18:37:54.000000000 +0000 -@@ -0,0 +1,6 @@ -+ -+Name: JavaScript -+Description: The Mozilla JavaScript Library -+Version: 1.7.0 -+Libs: -L${prefix}/lib -ljs -+Cflags: -I${prefix}/include -DXP_UNIX diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/rules.mk.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/rules.mk.p deleted file mode 100644 index ffec132..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.7.0/rules.mk.p +++ /dev/null @@ -1,38 +0,0 @@ ---- js/src/rules.mk.orig 2012-12-16 18:31:06.000000000 +0000 -+++ js/src/rules.mk 2012-12-16 18:34:05.000000000 +0000 -@@ -58,7 +58,7 @@ - # TARGETS = $(LIBRARY) # $(PROGRAM) not supported for MSVC yet - TARGETS += $(SHARED_LIBRARY) $(PROGRAM) # it is now - else --TARGETS += $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) -+TARGETS += $(LIBRARY) $(PROGRAM) - endif - - all: -@@ -158,19 +158,21 @@ - - export: - +$(LOOP_OVER_PREDIRS) -- mkdir -p $(DIST)/include $(DIST)/$(LIBDIR) $(DIST)/bin -+ mkdir -p $(DIST)/include/mozjs $(DIST)/$(LIBDIR)/pkgconfig $(DIST)/bin - ifneq "$(strip $(HFILES))" "" -- $(CP) $(HFILES) $(DIST)/include -+ $(CP) $(HFILES) $(DIST)/include/mozjs/ - endif - ifneq "$(strip $(LIBRARY))" "" - $(CP) $(LIBRARY) $(DIST)/$(LIBDIR) -+ echo "prefix=$(DIST)" > $(DIST)/$(LIBDIR)/pkgconfig/mozilla-js.pc -+ cat mozilla-js.pc.in >> $(DIST)/$(LIBDIR)/pkgconfig/mozilla-js.pc - endif - ifneq "$(strip $(JARS))" "" - $(CP) $(JARS) $(DIST)/$(LIBDIR) - endif --ifneq "$(strip $(SHARED_LIBRARY))" "" -- $(CP) $(SHARED_LIBRARY) $(DIST)/$(LIBDIR) --endif -+#ifneq "$(strip $(SHARED_LIBRARY))" "" -+# $(CP) $(SHARED_LIBRARY) $(DIST)/$(LIBDIR) -+#endif - ifneq "$(strip $(PROGRAM))" "" - $(CP) $(PROGRAM) $(DIST)/bin - endif diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/ExecutableAllocator.h.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/ExecutableAllocator.h.p deleted file mode 100644 index 30b811f..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/ExecutableAllocator.h.p +++ /dev/null @@ -1,11 +0,0 @@ ---- js/src/assembler/jit/ExecutableAllocator.h.orig 2012-11-08 14:37:17.000000000 +0000 -+++ js/src/assembler/jit/ExecutableAllocator.h 2012-11-08 14:46:42.000000000 +0000 -@@ -370,7 +370,7 @@ - } - #elif WTF_CPU_ARM_TRADITIONAL && WTF_PLATFORM_LINUX && WTF_COMPILER_RVCT - static __asm void cacheFlush(void* code, size_t size); --#elif WTF_CPU_ARM_TRADITIONAL && (WTF_PLATFORM_LINUX || WTF_PLATFORM_ANDROID) && WTF_COMPILER_GCC -+#elif WTF_CPU_ARM_TRADITIONAL && (WTF_PLATFORM_LINUX || WTF_PLATFORM_ANDROID || WTF_PLATFORM_RISCOS) && WTF_COMPILER_GCC - static void cacheFlush(void* code, size_t size) - { - asm volatile ( diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/ExecutableAllocatorPosix.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/ExecutableAllocatorPosix.cpp.p deleted file mode 100644 index 2f31400..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/ExecutableAllocatorPosix.cpp.p +++ /dev/null @@ -1,11 +0,0 @@ ---- js/src/assembler/jit/ExecutableAllocatorPosix.cpp.orig 2012-11-08 16:02:56.000000000 +0000 -+++ js/src/assembler/jit/ExecutableAllocatorPosix.cpp 2012-11-08 15:34:03.000000000 +0000 -@@ -25,7 +25,7 @@ - - #include "ExecutableAllocator.h" - --#if ENABLE_ASSEMBLER && WTF_PLATFORM_UNIX && !WTF_PLATFORM_SYMBIAN -+#if ENABLE_ASSEMBLER && (WTF_PLATFORM_UNIX || WTF_PLATFORM_RISCOS) && !WTF_PLATFORM_SYMBIAN - - #include <sys/mman.h> - #include <unistd.h> diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/Makefile.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/Makefile.p deleted file mode 100644 index abe9df9..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/Makefile.p +++ /dev/null @@ -1,21 +0,0 @@ ---- js/src/Makefile.in.orig 2012-12-16 13:10:27.000000000 +0000 -+++ js/src/Makefile.in 2012-12-16 13:10:59.000000000 +0000 -@@ -878,7 +878,7 @@ - install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) - ifneq (,$(LIBRARY)) - $(SYSINSTALL) $(LIBRARY) $(DESTDIR)$(libdir) -- mv -f $(DESTDIR)$(libdir)/$(LIBRARY) $(subst $(STATIC_LIBRARY_NAME),mozjs185-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(LIBRARY)) -+ mv -f $(DESTDIR)$(libdir)/$(LIBRARY) $(subst $(STATIC_LIBRARY_NAME),mozjs185,$(DESTDIR)$(libdir)/$(LIBRARY)) - endif - ifneq (,$(SHARED_LIBRARY)) - ifeq (,$(HOST_BIN_SUFFIX)) -@@ -968,7 +968,8 @@ - # Needed to "configure" it correctly. Unfortunately these - # flags wind up being applied to all code in js/src, not just - # the code in js/src/assembler. --CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 -+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -+#-DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 - - INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr - diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/MethodJIT.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/MethodJIT.p deleted file mode 100644 index 2d7ddb0..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/MethodJIT.p +++ /dev/null @@ -1,67 +0,0 @@ ---- js/src/methodjit/MethodJIT.cpp 2012-12-10 19:03:08.000000000 +0000 -+++ js/src/methodjit/MethodJIT.cpp 2012-12-10 19:04:11.000000000 +0000 -@@ -433,7 +433,7 @@ - "ldr r1, [r11, #24]" "\n" /* fp->rval data */ - "ldr r2, [r11, #28]" "\n" /* fp->rval type */ - "ldr r11, [sp, #28]" "\n" /* load f.fp */ -- "bx lr" "\n" -+ "mov pc, lr" "\n" - ); - - asm volatile ( -@@ -487,12 +487,12 @@ - " mov r11, r1" "\n" - - " mov r0, sp" "\n" --" blx " SYMBOL_STRING_VMFRAME(SetVMFrameRegs) "\n" -+" bl " SYMBOL_STRING_VMFRAME(SetVMFrameRegs) "\n" - " mov r0, sp" "\n" --" blx " SYMBOL_STRING_VMFRAME(PushActiveVMFrame)"\n" -+" bl " SYMBOL_STRING_VMFRAME(PushActiveVMFrame)"\n" - - /* Call the compiled JavaScript function. */ --" bx r4" "\n" -+" mov pc, r4" "\n" - ); - - asm volatile ( -@@ -505,7 +505,7 @@ - - /* Tidy up. */ - " mov r0, sp" "\n" --" blx " SYMBOL_STRING_VMFRAME(PopActiveVMFrame) "\n" -+" bl " SYMBOL_STRING_VMFRAME(PopActiveVMFrame) "\n" - - /* Skip past the parameters we pushed (such as cx and the like). */ - " add sp, sp, #(4*7 + 4*4)" "\n" -@@ -524,17 +524,17 @@ - " mov r0, sp" "\n" - - /* Call the utility function that sets up the internal throw routine. */ --" blx " SYMBOL_STRING_RELOC(js_InternalThrow) "\n" -+" bl " SYMBOL_STRING_RELOC(js_InternalThrow) "\n" - - /* If js_InternalThrow found a scripted handler, jump to it. Otherwise, tidy - * up and return. */ - " cmp r0, #0" "\n" - " it ne" "\n" --" bxne r0" "\n" -+" movne pc, r0" "\n" - - /* Tidy up, then return '0' to represent an unhandled exception. */ - " mov r0, sp" "\n" --" blx " SYMBOL_STRING_VMFRAME(PopActiveVMFrame) "\n" -+" bl " SYMBOL_STRING_VMFRAME(PopActiveVMFrame) "\n" - " add sp, sp, #(4*7 + 4*4)" "\n" - " mov r0, #0" "\n" - " pop {r4-r11,pc}" "\n" -@@ -551,7 +551,8 @@ - * The arguments are identical to those for js_* except that the target function should be in - * 'ip'. */ - " push {ip,lr}" "\n" --" blx ip" "\n" -+" mov lr, pc" "\n" -+" mov pc, ip" "\n" - " pop {ip,pc}" "\n" - ); - diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/Platform.h.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/Platform.h.p deleted file mode 100644 index 29bc2c2..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/Platform.h.p +++ /dev/null @@ -1,32 +0,0 @@ ---- js/src/assembler/wtf/Platform.h.orig 2011-03-31 20:08:36.000000000 +0100 -+++ js/src/assembler/wtf/Platform.h 2012-11-08 14:48:57.000000000 +0000 -@@ -188,6 +188,7 @@ - #elif !defined(__ARM_EABI__) \ - && !defined(__EABI__) \ - && !defined(__VFP_FP__) \ -+ && !defined(__riscos__) \ - && !defined(ANDROID) - #define WTF_CPU_MIDDLE_ENDIAN 1 - -@@ -232,6 +233,7 @@ - - #endif - -+#ifndef __riscos__ - /* Set WTF_THUMB_ARCH_VERSION */ - #if defined(__ARM_ARCH_4T__) - #define WTF_THUMB_ARCH_VERSION 1 -@@ -263,6 +265,13 @@ - #define WTF_THUMB_ARCH_VERSION 0 - #endif - -+#else -+ -+#define WTF_THUMB_ARCH_VERSION 0 -+#define WTF_PLATFORM_RISCOS 1 -+#define WTF_CPU_ARM_TRADITIONAL 0 -+ -+#endif - - /* CPU(ARMV5_OR_LOWER) - ARM instruction set v5 or earlier */ - /* On ARMv5 and below the natural alignment is required. diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/configure.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/configure.p deleted file mode 100644 index fcd012a..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/configure.p +++ /dev/null @@ -1,30 +0,0 @@ ---- js/src/configure 2011-03-31 20:08:36.000000000 +0100 -+++ js/src/configure 2012-12-10 00:34:27.312881924 +0000 -@@ -7779,6 +7785,10 @@ - HOST_NSPR_MDCPUCFG='\"md/_os2.cfg\"' - ;; - -+*-riscos*) -+ TARGET_NSPR_MDCPUCFG='\"md/_riscos.cfg\"' -+ ;; -+ - *-android*) - cat >> confdefs.h <<\EOF - #define NO_PW_GECOS 1 -@@ -13341,6 +13341,16 @@ - { echo "configure: error: --with-cpu-arch=armv7 is not supported for non-ARM CPU architectures" 1>&2; exit 1; } - ;; - esac -+elif test "$MOZ_ARM_ARCH" = "armv3"; then -+ case "$target_cpu" in -+ arm*) -+ if test "$GNU_CC"; then -+ CFLAGS="$CFLAGS -march=armv3 -mno-thumb-interwork -msoft-float" -+ CXXFLAGS="$CXXFLAGS -march=armv3 -mno-thumb-interwork -msoft-float" -+ ASFLAGS="$ASFLAGS -march=armv3 -mno-thumb-interwork -msoft-float" -+ fi -+ ;; -+ esac - else - case "$target_cpu" in - arm*) diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jscntxt.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jscntxt.cpp.p deleted file mode 100644 index d61d860..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jscntxt.cpp.p +++ /dev/null @@ -1,11 +0,0 @@ ---- js/src/jscntxt.cpp.orig 2012-11-08 14:49:30.000000000 +0000 -+++ js/src/jscntxt.cpp 2012-11-08 14:50:19.000000000 +0000 -@@ -179,7 +179,7 @@ - #elif defined(XP_OS2) - DosFreeMem(base); - #else --#ifdef SOLARIS -+#if defined(SOLARIS) || defined(__riscos__) - munmap((caddr_t)base, CAPACITY_BYTES); - #else - munmap(base, CAPACITY_BYTES); diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jsgcchunk.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jsgcchunk.cpp.p deleted file mode 100644 index b8720e4..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jsgcchunk.cpp.p +++ /dev/null @@ -1,27 +0,0 @@ ---- js/src/jsgcchunk.cpp 2012-12-10 00:50:18.369597597 +0000 -+++ js/src/jsgcchunk.cpp 2012-12-10 00:51:36.317984488 +0000 -@@ -322,13 +322,13 @@ - * We don't use MAP_FIXED here, because it can cause the *replacement* - * of existing mappings, and we only want to create new mappings. - */ -- void *p = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -+ void *p = mmap((caddr_t)addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, - -1, 0); - if (p == MAP_FAILED) - return NULL; - if (addr && p != addr) { - /* We succeeded in mapping memory, but not in the right place. */ -- JS_ALWAYS_TRUE(munmap(p, size) == 0); -+ JS_ALWAYS_TRUE(munmap((caddr_t)p, size) == 0); - return NULL; - } - return p; -@@ -342,7 +342,7 @@ - #ifdef SOLARIS - JS_ALWAYS_TRUE(munmap((caddr_t) addr, size) == 0); - #else -- JS_ALWAYS_TRUE(munmap(addr, size) == 0); -+ JS_ALWAYS_TRUE(munmap((caddr_t)addr, size) == 0); - #endif - } - diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jsnativestack.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jsnativestack.cpp.p deleted file mode 100644 index 0e042a9..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jsnativestack.cpp.p +++ /dev/null @@ -1,22 +0,0 @@ ---- js/src/jsnativestack.cpp.orig 2012-11-08 14:53:01.000000000 +0000 -+++ js/src/jsnativestack.cpp 2012-11-08 14:53:58.000000000 +0000 -@@ -204,7 +204,9 @@ - * FIXME: this function is non-portable; - * other POSIX systems may have different np alternatives - */ -+#ifndef __riscos__ - pthread_getattr_np(thread, &sattr); -+#endif - # endif - - void *stackBase = 0; -@@ -212,7 +214,9 @@ - # ifdef DEBUG - int rc = - # endif -+#ifndef __riscos__ - pthread_attr_getstack(&sattr, &stackBase, &stackSize); -+#endif - JS_ASSERT(!rc); - JS_ASSERT(stackBase); - pthread_attr_destroy(&sattr); diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jstypedarray.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jstypedarray.cpp.p deleted file mode 100644 index 0f4cfa9..0000000 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jstypedarray.cpp.p +++ /dev/null @@ -1,11 +0,0 @@ ---- js/src/jstypedarray.cpp.orig 2012-11-08 16:22:50.000000000 +0000 -+++ js/src/jstypedarray.cpp 2012-11-08 16:23:25.000000000 +0000 -@@ -454,7 +454,7 @@ - inline operator uint8() const { - return val; - } --}; -+} __attribute__((packed)); - - /* Make sure the compiler isn't doing some funky stuff */ - JS_STATIC_ASSERT(sizeof(uint8_clamped) == 1); diff --git a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/Makefile.ref.p b/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/Makefile.ref.p deleted file mode 100644 index 482907b..0000000 --- a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/Makefile.ref.p +++ /dev/null @@ -1,436 +0,0 @@ ---- js/src/Makefile.ref 2006-07-26 19:16:47 -+++ js-amiga/src/makefile.ref 2012-09-04 23:15:44 -@@ -1,375 +1,57 @@ --# -*- Mode: makefile -*- --# vim: ft=make --# --# ***** BEGIN LICENSE BLOCK ***** --# Version: MPL 1.1/GPL 2.0/LGPL 2.1 --# --# The contents of this file are subject to the Mozilla Public License Version --# 1.1 (the "License"); you may not use this file except in compliance with --# the License. You may obtain a copy of the License at --# http://www.mozilla.org/MPL/ --# --# Software distributed under the License is distributed on an "AS IS" basis, --# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License --# for the specific language governing rights and limitations under the --# License. --# --# The Original Code is Mozilla Communicator client code, released --# March 31, 1998. --# --# The Initial Developer of the Original Code is --# Netscape Communications Corporation. --# Portions created by the Initial Developer are Copyright (C) 1998 --# the Initial Developer. All Rights Reserved. --# --# Contributor(s): --# Michael Ang <mang@subcarrier.org> --# Kevin Buhr <buhr@stat.wisc.edu> --# --# Alternatively, the contents of this file may be used under the terms of --# either of the GNU General Public License Version 2 or later (the "GPL"), --# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), --# in which case the provisions of the GPL or the LGPL are applicable instead --# of those above. If you wish to allow use of your version of this file only --# under the terms of either the GPL or the LGPL, and not to allow others to --# use your version of this file under the terms of the MPL, indicate your --# decision by deleting the provisions above and replace them with the notice --# and other provisions required by the GPL or the LGPL. If you do not delete --# the provisions above, a recipient may use your version of this file under --# the terms of any one of the MPL, the GPL or the LGPL. --# --# ***** END LICENSE BLOCK ***** -- --# --# JSRef GNUmake makefile. --# --# Note: dependency rules are missing for some files (some --# .h, all .msg, etc.) Re-make clean if in doubt. --# -- -- --DEPTH = . -- --include config.mk -- --#NS_USE_NATIVE = 1 -- --ifdef NARCISSUS --DEFINES += -DNARCISSUS --endif -- --# Look in OBJDIR to find jsautocfg.h and jsautokw.h --INCLUDES += -I$(OBJDIR) -- --ifdef JS_THREADSAFE --DEFINES += -DJS_THREADSAFE --INCLUDES += -I$(DIST)/include/nspr --ifdef USE_MSVC --OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib --else --OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX) --endif --endif -- --ifdef JS_NO_THIN_LOCKS --DEFINES += -DJS_USE_ONLY_NSPR_LOCKS --endif -- --ifdef JS_HAS_FILE_OBJECT --DEFINES += -DJS_HAS_FILE_OBJECT --endif -- --# --# XCFLAGS may be set in the environment or on the gmake command line --# --CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) -- --LDFLAGS = $(XLDFLAGS) -- --ifndef NO_LIBM --LDFLAGS += -lm --endif -- --# Prevent floating point errors caused by VC++ optimizations --ifeq ($(OS_ARCH),WINNT) --_MSC_VER = $(shell $(CC) 2>&1 | sed -n 's/.*Compiler Version \([0-9]*\)\.\([0-9]*\).*/\1\2/p') --ifeq (,$(filter-out 1200 1300 1310,$(_MSC_VER))) --CFLAGS += -Op --else --CFLAGS += -fp:precise --endif --endif # WINNT -- --# --# Ask perl what flags it was built with, so we can build js with similar flags --# and link properly. Viva gmake. --# --ifdef JS_PERLCONNECT --DEFINES += -DPERLCONNECT -D_GNU_SOURCE -- --PERLCFLAGS := $(shell perl -MExtUtils::Embed -e ccopts) --PERLLDFLAGS := $(shell perl -MExtUtils::Embed -e ldopts) -- --# perl erroneously reports compiler flag -rdynamic (interpreted by ld --# as -r) when it really meant -export-dynamic. --PERLLDFLAGS := $(subst -rdynamic,-export-dynamic,$(PERLLDFLAGS)) -- --CFLAGS += $(PERLCFLAGS) --#LDFLAGS += $(PERLLDFLAGS) #PH removed this assgnment --INCLUDES += -I. #needed for perlconnect/jsperl.c --endif -- --# --# Server-related changes : --# --ifdef NES40 --DEFINES += -DNES40 --endif -- --# --# Line editing support. --# Define JS_READLINE or JS_EDITLINE to enable line editing in the --# js command-line interpreter. --# --ifdef JS_READLINE --# For those platforms with the readline library installed. --DEFINES += -DEDITLINE --PROG_LIBS += -lreadline -ltermcap --else --ifdef JS_EDITLINE --# Use the editline library, built locally. --PREDIRS += editline --DEFINES += -DEDITLINE --PROG_LIBS += editline/$(OBJDIR)/libedit.a --endif --endif -- --# For purify --PURE_CFLAGS = -DXP_UNIX $(OPTIMIZER) $(PURE_OS_CFLAGS) $(DEFINES) \ -- $(INCLUDES) $(XCFLAGS) -- --# --# JS file lists --# --JS_HFILES = \ -- jsarray.h \ -- jsatom.h \ -- jsbool.h \ -- jsconfig.h \ -- jscntxt.h \ -- jsdate.h \ -- jsemit.h \ -- jsexn.h \ -- jsfun.h \ -- jsgc.h \ -- jsinterp.h \ -- jsiter.h \ -- jslibmath.h \ -- jslock.h \ -- jsmath.h \ -- jsnum.h \ -- jsobj.h \ -- jsopcode.h \ -- jsparse.h \ -- jsarena.h \ -- jsclist.h \ -- jsdhash.h \ -- jsdtoa.h \ -- jshash.h \ -- jslong.h \ -- jsosdep.h \ -- jstypes.h \ -- jsprvtd.h \ -- jspubtd.h \ -- jsregexp.h \ -- jsscan.h \ -- jsscope.h \ -- jsscript.h \ -- jsstr.h \ -- jsxdrapi.h \ -- jsxml.h \ -- $(NULL) -- --API_HFILES = \ -- jsapi.h \ -- jsdbgapi.h \ -- $(NULL) -- --OTHER_HFILES = \ -- jsbit.h \ -- jscompat.h \ -- jscpucfg.h \ -- jsotypes.h \ -- jsstddef.h \ -- prmjtime.h \ -- resource.h \ -- jsopcode.tbl \ -- jsproto.tbl \ -- js.msg \ -- jsshell.msg \ -- jskeyword.tbl \ -- $(NULL) -- --ifndef PREBUILT_CPUCFG --OTHER_HFILES += $(OBJDIR)/jsautocfg.h --endif --OTHER_HFILES += $(OBJDIR)/jsautokw.h -- --HFILES = $(JS_HFILES) $(API_HFILES) $(OTHER_HFILES) -- --JS_CFILES = \ -- jsapi.c \ -- jsarena.c \ -- jsarray.c \ -- jsatom.c \ -- jsbool.c \ -- jscntxt.c \ -- jsdate.c \ -- jsdbgapi.c \ -- jsdhash.c \ -- jsdtoa.c \ -- jsemit.c \ -- jsexn.c \ -- jsfun.c \ -- jsgc.c \ -- jshash.c \ -- jsinterp.c \ -- jsiter.c \ -- jslock.c \ -- jslog2.c \ -- jslong.c \ -- jsmath.c \ -- jsnum.c \ -- jsobj.c \ -- jsopcode.c \ -- jsparse.c \ -- jsprf.c \ -- jsregexp.c \ -- jsscan.c \ -- jsscope.c \ -- jsscript.c \ -- jsstr.c \ -- jsutil.c \ -- jsxdrapi.c \ -- jsxml.c \ -- prmjtime.c \ -- $(NULL) -- --ifdef JS_LIVECONNECT --DIRS += liveconnect --endif -- --ifdef JS_PERLCONNECT --JS_CFILES += perlconnect/jsperl.c --endif -- --ifdef JS_HAS_FILE_OBJECT --JS_CFILES += jsfile.c --JS_HFILES += jsfile.h --endif -- --LIB_CFILES = $(JS_CFILES) --LIB_ASFILES := $(wildcard *_$(OS_ARCH).s) --PROG_CFILES = js.c -- --ifdef USE_MSVC --LIBRARY = $(OBJDIR)/js32.lib --SHARED_LIBRARY = $(OBJDIR)/js32.dll --PROGRAM = $(OBJDIR)/js.exe --else --LIBRARY = $(OBJDIR)/libjs.a --SHARED_LIBRARY = $(OBJDIR)/libjs.$(SO_SUFFIX) --PROGRAM = $(OBJDIR)/js --ifdef JS_PERLCONNECT --PROG_LIBS += $(PERLLDFLAGS) --endif --endif -- --include rules.mk -- --MOZ_DEPTH = ../.. --include jsconfig.mk -- --nsinstall-target: -- cd ../../config; $(MAKE) OBJDIR=$(OBJDIR) OBJDIR_NAME=$(OBJDIR) -- --# --# Rules for keyword switch generation --# -- --GARBAGE += $(OBJDIR)/jsautokw.h $(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX) --GARBAGE += $(OBJDIR)/jskwgen.$(OBJ_SUFFIX) -- --$(OBJDIR)/jsscan.$(OBJ_SUFFIX): $(OBJDIR)/jsautokw.h jskeyword.tbl -- --$(OBJDIR)/jskwgen.$(OBJ_SUFFIX): jskwgen.c jskeyword.tbl -- --$(OBJDIR)/jsautokw.h: $(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX) jskeyword.tbl -- $(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX) $@ -- --ifdef USE_MSVC -- --$(OBJDIR)/jskwgen.obj: jskwgen.c jskeyword.tbl -- @$(MAKE_OBJDIR) -- $(CC) -Fo$(OBJDIR)/ -c $(CFLAGS) $< -- --$(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX): $(OBJDIR)/jskwgen.$(OBJ_SUFFIX) -- link.exe -out:"$@" $(EXE_LINK_FLAGS) $^ -- --else -- --$(OBJDIR)/jskwgen.o: jskwgen.c jskeyword.tbl -- @$(MAKE_OBJDIR) -- $(CC) -o $@ -c $(CFLAGS) $< -- --$(OBJDIR)/jskwgen$(HOST_BIN_SUFFIX): $(OBJDIR)/jskwgen.$(OBJ_SUFFIX) -- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ -- --endif -- --# --# JS shell executable --# -- --ifdef USE_MSVC --$(PROGRAM): $(PROG_OBJS) $(LIBRARY) -- link.exe -out:"$@" $(EXE_LINK_FLAGS) $^ --else --$(PROGRAM): $(PROG_OBJS) $(LIBRARY) -- $(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \ -- $(PROG_LIBS) --endif -- --$(PROGRAM).pure: $(PROG_OBJS) $(LIBRARY) -- purify $(PUREFLAGS) \ -- $(CC) -o $@ $(PURE_OS_CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) \ -- $(OTHER_LIBS) $(PROG_LIBS) -- --ifndef PREBUILT_CPUCFG --$(HFILES) $(CFILES): $(OBJDIR)/jsautocfg.h -- --$(OBJDIR)/jsautocfg.h: $(OBJDIR)/jscpucfg -- rm -f $@ -- $(OBJDIR)/jscpucfg > $@ -- --$(OBJDIR)/jscpucfg: $(OBJDIR)/jscpucfg.o -- $(CC) -o $@ $(OBJDIR)/jscpucfg.o -- --# Add to TARGETS for clobber rule --TARGETS += $(OBJDIR)/jsautocfg.h $(OBJDIR)/jscpucfg \ -- $(OBJDIR)/jscpucfg.o --endif -- --# --# Hardwire dependencies on jsopcode.tbl --# --jsopcode.h jsopcode.c: jsopcode.tbl -- ---include $(DEPENDENCIES) -- --TARNAME = jsref.tar --TARFILES = files `cat files` -- --SUFFIXES: .i --%.i: %.c -- $(CC) -C -E $(CFLAGS) $< > $*.i -+CFLAGS= -O2 -DXP_AMIGA -DHAVE_VA_COPY -DVA_COPY=va_copy -fvisibility=hidden -DHAVE_VISIBILITY_ATTRIBUTE -+AR = ppc-amigaos-ar -+CC = ppc-amigaos-gcc -+STRIP = ppc-amigaos-strip -+LIBS =-Lfdlibm -lfdlibm -lm -+RM = rm -+MKDIR = mkdir -+OBJDIR = objAOS4 -+BINDIR = binAOS4 -+CP = cp -+ -+#OBJS = js.o jsapi.o jsarena.o jsarray.o jsatom.o jsbool.o \ -+# jscntxt.o jsdate.o jsdbgapi.o jsdhash.o jsdtoa.o \ -+# jsemit.o jsexn.o jsfile.o jsfun.o jsgc.o jshash.o \ -+# jsinterp.o jslock.o jslong.o jsmath.o jsnum.o \ -+# jsobj.o jsopcode.o jsparse.o jsprf.o jsregexp.o \ -+# jsscan.o jsscope.o jsscript.o jsstr.o jsutil.o \ -+# jsxdrapi.o prmjtime.o jslog2.o -+ -+OBJS = prmjtime.o jsapi.o jsarena.o jsarray.o jsatom.o \ -+ jsbool.o jscntxt.o jsdate.o jsdbgapi.o jsdhash.o \ -+ jsdtoa.o jsemit.o jsexn.o jsfile.o jsfun.o jsgc.o \ -+ jshash.o jsinterp.o jslock.o jslong.o jsmath.o \ -+ jsnum.o jsobj.o jsopcode.o jsparse.o jsprf.o \ -+ jsregexp.o jsscan.o jsscope.o jsscript.o jsstr.o \ -+ jsutil.o jsxdrapi.o jslog2.o jsxml.o jsiter.o -+ -+all : $(OBJDIR) $(BINDIR) libjs.a -+ -+$(OBJDIR): -+ -$(MKDIR) $(OBJDIR) -+ -+$(BINDIR): -+ -$(MKDIR) $(BINDIR) -+ -+libjs.a: $(addprefix $(OBJDIR)/,$(OBJS)) -+ $(AR) cru $@ $^ -+# $(STRIP) -o $@ $@.db -+ -+$(OBJDIR)/jsdate.o: jsdate.c prmjtime.c -+ $(CC) $(CFLAGS) -c $< -o $@ -+ -+clean: -+ $(RM) $(addprefix $(OBJDIR)/,$(OBJS)) -+ -+#jsdtoa.o: jsdtoa.c -+# $(CC) -D__STDC__ $(CFLAGS) -c $< -o $@ -+ -+$(OBJDIR)/%.o : %.c -+ $(CC) $(CFLAGS) -c $< -o $@ -+ -+export: -+ $(MKDIR) -p $(JS_DIST)/include/js -+ $(CP) -f libjs.a $(JS_DIST)/lib -+ $(CP) -f *.h $(JS_DIST)/include/js -+ $(CP) -f *.tbl $(JS_DIST)/include/js -+ - diff --git a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/js.c.p b/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/js.c.p deleted file mode 100644 index 0009e4a..0000000 --- a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/js.c.p +++ /dev/null @@ -1,14 +0,0 @@ ---- js/src/js.c 2007-04-20 18:45:18 -+++ js-amiga/src/js.c 2012-07-06 21:15:11 -@@ -88,6 +88,10 @@ - #include <sys/wait.h> - #endif - -+#ifdef XP_AMIGA -+#include <fcntl.h> -+#endif -+ - #if defined(XP_WIN) || defined(XP_OS2) - #include <io.h> /* for isatty() */ - #endif - diff --git a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsapi.h.p b/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsapi.h.p deleted file mode 100644 index e62520b..0000000 --- a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsapi.h.p +++ /dev/null @@ -1,37 +0,0 @@ ---- js/src/jsapi.h.orig 2014-10-15 16:23:17.799241148 +0100 -+++ js/src/jsapi.h 2014-10-15 16:25:08.771240608 +0100 -@@ -214,7 +214,7 @@ - * comment in jstypes.h regarding safe int64 usage. - */ - extern JS_PUBLIC_API(int64) --JS_Now(); -+JS_Now(void); - - /* Don't want to export data, so provide accessors for non-inline jsvals. */ - extern JS_PUBLIC_API(jsval) -@@ -971,11 +971,11 @@ - JSEqualityOp equality; - JSObjectOp outerObject; - JSObjectOp innerObject; -- void (*reserved0)(); -- void (*reserved1)(); -- void (*reserved2)(); -- void (*reserved3)(); -- void (*reserved4)(); -+ void (*reserved0)(void); -+ void (*reserved1)(void); -+ void (*reserved2)(void); -+ void (*reserved3)(void); -+ void (*reserved4)(void); - }; - - #define JSCLASS_HAS_PRIVATE (1<<0) /* objects have private slot */ -@@ -1962,7 +1962,7 @@ - * to get UTF-8 support. - */ - JS_PUBLIC_API(JSBool) --JS_CStringsAreUTF8(); -+JS_CStringsAreUTF8(void); - - /* - * Character encoding support. diff --git a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsautocfg.h.p b/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsautocfg.h.p deleted file mode 100644 index 2b763b2..0000000 --- a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsautocfg.h.p +++ /dev/null @@ -1,56 +0,0 @@ ---- js/src/jsautocfg.h 1978-01-01 00:00:00 -+++ js-amiga/src/jsautocfg.h 2012-07-06 23:28:26 -@@ -0,0 +1,52 @@ -+#ifndef js_cpucfg___ -+#define js_cpucfg___ -+ -+/* AUTOMATICALLY GENERATED - DO NOT EDIT */ -+ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+ -+#define JS_BYTES_PER_BYTE 1L -+#define JS_BYTES_PER_SHORT 2L -+#define JS_BYTES_PER_INT 4L -+#define JS_BYTES_PER_INT64 8L -+#define JS_BYTES_PER_LONG 4L -+#define JS_BYTES_PER_FLOAT 4L -+#define JS_BYTES_PER_DOUBLE 8L -+#define JS_BYTES_PER_WORD 4L -+#define JS_BYTES_PER_DWORD 8L -+ -+#define JS_BITS_PER_BYTE 8L -+#define JS_BITS_PER_SHORT 16L -+#define JS_BITS_PER_INT 32L -+#define JS_BITS_PER_INT64 64L -+#define JS_BITS_PER_LONG 32L -+#define JS_BITS_PER_FLOAT 32L -+#define JS_BITS_PER_DOUBLE 64L -+#define JS_BITS_PER_WORD 32L -+ -+#define JS_BITS_PER_BYTE_LOG2 3L -+#define JS_BITS_PER_SHORT_LOG2 4L -+#define JS_BITS_PER_INT_LOG2 5L -+#define JS_BITS_PER_INT64_LOG2 6L -+#define JS_BITS_PER_LONG_LOG2 5L -+#define JS_BITS_PER_FLOAT_LOG2 5L -+#define JS_BITS_PER_DOUBLE_LOG2 6L -+#define JS_BITS_PER_WORD_LOG2 5L -+ -+#define JS_ALIGN_OF_SHORT 2L -+#define JS_ALIGN_OF_INT 4L -+#define JS_ALIGN_OF_LONG 4L -+#define JS_ALIGN_OF_INT64 8L -+#define JS_ALIGN_OF_FLOAT 4L -+#define JS_ALIGN_OF_DOUBLE 8L -+#define JS_ALIGN_OF_POINTER 4L -+#define JS_ALIGN_OF_WORD 4L -+ -+#define JS_BYTES_PER_WORD_LOG2 2L -+#define JS_BYTES_PER_DWORD_LOG2 3L -+#define JS_WORDS_PER_DWORD_LOG2 1L -+ -+#define JS_STACK_GROWTH_DIRECTION (-1) -+ -+#endif /* js_cpucfg___ */ - diff --git a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsautokw.h.p b/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsautokw.h.p deleted file mode 100644 index 926516b..0000000 --- a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsautokw.h.p +++ /dev/null @@ -1,405 +0,0 @@ ---- js/src/jsautokw.h 1978-01-01 00:00:00 -+++ js-amiga/src/jsautokw.h 2012-07-06 23:13:05 -@@ -0,0 +1,401 @@ -+ /* -+ * Generating switch for the list of 61 entries: -+ * break -+ * case -+ * continue -+ * default -+ * delete -+ * do -+ * else -+ * export -+ * false -+ * for -+ * function -+ * if -+ * in -+ * new -+ * null -+ * return -+ * switch -+ * this -+ * true -+ * typeof -+ * var -+ * void -+ * while -+ * with -+ * const -+ * try -+ * catch -+ * finally -+ * throw -+ * instanceof -+ * abstract -+ * boolean -+ * byte -+ * char -+ * class -+ * double -+ * extends -+ * final -+ * float -+ * goto -+ * implements -+ * import -+ * int -+ * interface -+ * long -+ * native -+ * package -+ * private -+ * protected -+ * public -+ * short -+ * static -+ * super -+ * synchronized -+ * throws -+ * transient -+ * volatile -+ * enum -+ * debugger -+ * yield -+ * let -+ */ -+ switch (JSKW_LENGTH()) { -+ case 2: -+ if (JSKW_AT(0) == 'd') { -+ if (JSKW_AT(1)=='o') { -+ JSKW_GOT_MATCH(5) /* do */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(0) == 'i') { -+ if (JSKW_AT(1) == 'f') { -+ JSKW_GOT_MATCH(11) /* if */ -+ } -+ if (JSKW_AT(1) == 'n') { -+ JSKW_GOT_MATCH(12) /* in */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 3: -+ switch (JSKW_AT(2)) { -+ case 'r': -+ if (JSKW_AT(0) == 'f') { -+ if (JSKW_AT(1)=='o') { -+ JSKW_GOT_MATCH(9) /* for */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(0) == 'v') { -+ if (JSKW_AT(1)=='a') { -+ JSKW_GOT_MATCH(20) /* var */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 't': -+ if (JSKW_AT(0) == 'i') { -+ if (JSKW_AT(1)=='n') { -+ JSKW_GOT_MATCH(42) /* int */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(0) == 'l') { -+ if (JSKW_AT(1)=='e') { -+ JSKW_GOT_MATCH(60) /* let */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 'w': -+ if (JSKW_AT(0)=='n' && JSKW_AT(1)=='e') { -+ JSKW_GOT_MATCH(13) /* new */ -+ } -+ JSKW_NO_MATCH() -+ case 'y': -+ if (JSKW_AT(0)=='t' && JSKW_AT(1)=='r') { -+ JSKW_GOT_MATCH(25) /* try */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 4: -+ switch (JSKW_AT(3)) { -+ case 'd': -+ if (JSKW_AT(0)=='v' && JSKW_AT(1)=='o' && JSKW_AT(2)=='i') { -+ JSKW_GOT_MATCH(21) /* void */ -+ } -+ JSKW_NO_MATCH() -+ case 'e': -+ if (JSKW_AT(2) == 's') { -+ if (JSKW_AT(0) == 'c') { -+ if (JSKW_AT(1)=='a') { -+ JSKW_GOT_MATCH(1) /* case */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(0) == 'e') { -+ if (JSKW_AT(1)=='l') { -+ JSKW_GOT_MATCH(6) /* else */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(2) == 't') { -+ if (JSKW_AT(0)=='b' && JSKW_AT(1)=='y') { -+ JSKW_GOT_MATCH(32) /* byte */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(2) == 'u') { -+ if (JSKW_AT(0)=='t' && JSKW_AT(1)=='r') { -+ JSKW_GOT_MATCH(18) /* true */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 'g': -+ if (JSKW_AT(0)=='l' && JSKW_AT(1)=='o' && JSKW_AT(2)=='n') { -+ JSKW_GOT_MATCH(44) /* long */ -+ } -+ JSKW_NO_MATCH() -+ case 'h': -+ if (JSKW_AT(0)=='w' && JSKW_AT(1)=='i' && JSKW_AT(2)=='t') { -+ JSKW_GOT_MATCH(23) /* with */ -+ } -+ JSKW_NO_MATCH() -+ case 'l': -+ if (JSKW_AT(0)=='n' && JSKW_AT(1)=='u' && JSKW_AT(2)=='l') { -+ JSKW_GOT_MATCH(14) /* null */ -+ } -+ JSKW_NO_MATCH() -+ case 'm': -+ if (JSKW_AT(0)=='e' && JSKW_AT(1)=='n' && JSKW_AT(2)=='u') { -+ JSKW_GOT_MATCH(57) /* enum */ -+ } -+ JSKW_NO_MATCH() -+ case 'o': -+ if (JSKW_AT(0)=='g' && JSKW_AT(1)=='o' && JSKW_AT(2)=='t') { -+ JSKW_GOT_MATCH(39) /* goto */ -+ } -+ JSKW_NO_MATCH() -+ case 'r': -+ if (JSKW_AT(0)=='c' && JSKW_AT(1)=='h' && JSKW_AT(2)=='a') { -+ JSKW_GOT_MATCH(33) /* char */ -+ } -+ JSKW_NO_MATCH() -+ case 's': -+ if (JSKW_AT(0)=='t' && JSKW_AT(1)=='h' && JSKW_AT(2)=='i') { -+ JSKW_GOT_MATCH(17) /* this */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 5: -+ switch (JSKW_AT(3)) { -+ case 'a': -+ if (JSKW_AT(0) == 'b') { -+ if (JSKW_AT(4)=='k' && JSKW_AT(1)=='r' && JSKW_AT(2)=='e') { -+ JSKW_GOT_MATCH(0) /* break */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(0) == 'f') { -+ if (JSKW_AT(4) == 'l') { -+ if (JSKW_AT(2)=='n' && JSKW_AT(1)=='i') { -+ JSKW_GOT_MATCH(37) /* final */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(4) == 't') { -+ if (JSKW_AT(2)=='o' && JSKW_AT(1)=='l') { -+ JSKW_GOT_MATCH(38) /* float */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 'c': -+ if (JSKW_AT(0)=='c' && JSKW_AT(1)=='a' && JSKW_AT(2)=='t' && JSKW_AT(4)=='h') { -+ JSKW_GOT_MATCH(26) /* catch */ -+ } -+ JSKW_NO_MATCH() -+ case 'e': -+ if (JSKW_AT(0)=='s' && JSKW_AT(1)=='u' && JSKW_AT(2)=='p' && JSKW_AT(4)=='r') { -+ JSKW_GOT_MATCH(52) /* super */ -+ } -+ JSKW_NO_MATCH() -+ case 'l': -+ if (JSKW_AT(0) == 'w') { -+ if (JSKW_AT(4)=='e' && JSKW_AT(1)=='h' && JSKW_AT(2)=='i') { -+ JSKW_GOT_MATCH(22) /* while */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(0) == 'y') { -+ if (JSKW_AT(4)=='d' && JSKW_AT(1)=='i' && JSKW_AT(2)=='e') { -+ JSKW_GOT_MATCH(59) /* yield */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 'o': -+ if (JSKW_AT(0)=='t' && JSKW_AT(1)=='h' && JSKW_AT(2)=='r' && JSKW_AT(4)=='w') { -+ JSKW_GOT_MATCH(28) /* throw */ -+ } -+ JSKW_NO_MATCH() -+ case 'r': -+ if (JSKW_AT(0)=='s' && JSKW_AT(1)=='h' && JSKW_AT(2)=='o' && JSKW_AT(4)=='t') { -+ JSKW_GOT_MATCH(50) /* short */ -+ } -+ JSKW_NO_MATCH() -+ case 's': -+ if (JSKW_AT(0) == 'c') { -+ if (JSKW_AT(4) == 's') { -+ if (JSKW_AT(2)=='a' && JSKW_AT(1)=='l') { -+ JSKW_GOT_MATCH(34) /* class */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(4) == 't') { -+ if (JSKW_AT(2)=='n' && JSKW_AT(1)=='o') { -+ JSKW_GOT_MATCH(24) /* const */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(0) == 'f') { -+ if (JSKW_AT(4)=='e' && JSKW_AT(1)=='a' && JSKW_AT(2)=='l') { -+ JSKW_GOT_MATCH(8) /* false */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 6: -+ switch (JSKW_AT(0)) { -+ case 'd': -+ if (JSKW_AT(1) == 'o') { -+ if (JSKW_AT(5)=='e' && JSKW_AT(4)=='l' && JSKW_AT(2)=='u' && JSKW_AT(3)=='b') { -+ JSKW_GOT_MATCH(35) /* double */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(1) == 'e') { -+ if (JSKW_AT(5)=='e' && JSKW_AT(4)=='t' && JSKW_AT(2)=='l' && JSKW_AT(3)=='e') { -+ JSKW_GOT_MATCH(4) /* delete */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 'e': -+ JSKW_TEST_GUESS(7) /* export */ -+ case 'i': -+ JSKW_TEST_GUESS(41) /* import */ -+ case 'n': -+ JSKW_TEST_GUESS(45) /* native */ -+ case 'p': -+ JSKW_TEST_GUESS(49) /* public */ -+ case 'r': -+ JSKW_TEST_GUESS(15) /* return */ -+ case 's': -+ if (JSKW_AT(1) == 't') { -+ if (JSKW_AT(5)=='c' && JSKW_AT(4)=='i' && JSKW_AT(2)=='a' && JSKW_AT(3)=='t') { -+ JSKW_GOT_MATCH(51) /* static */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(1) == 'w') { -+ if (JSKW_AT(5)=='h' && JSKW_AT(4)=='c' && JSKW_AT(2)=='i' && JSKW_AT(3)=='t') { -+ JSKW_GOT_MATCH(16) /* switch */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 't': -+ if (JSKW_AT(5) == 'f') { -+ if (JSKW_AT(4)=='o' && JSKW_AT(1)=='y' && JSKW_AT(2)=='p' && JSKW_AT(3)=='e') { -+ JSKW_GOT_MATCH(19) /* typeof */ -+ } -+ JSKW_NO_MATCH() -+ } -+ if (JSKW_AT(5) == 's') { -+ if (JSKW_AT(4)=='w' && JSKW_AT(1)=='h' && JSKW_AT(2)=='r' && JSKW_AT(3)=='o') { -+ JSKW_GOT_MATCH(54) /* throws */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 7: -+ switch (JSKW_AT(0)) { -+ case 'b': -+ JSKW_TEST_GUESS(31) /* boolean */ -+ case 'd': -+ JSKW_TEST_GUESS(3) /* default */ -+ case 'e': -+ JSKW_TEST_GUESS(36) /* extends */ -+ case 'f': -+ JSKW_TEST_GUESS(27) /* finally */ -+ case 'p': -+ if (JSKW_AT(1) == 'a') { -+ JSKW_TEST_GUESS(46) /* package */ -+ } -+ if (JSKW_AT(1) == 'r') { -+ JSKW_TEST_GUESS(47) /* private */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 8: -+ switch (JSKW_AT(4)) { -+ case 'g': -+ JSKW_TEST_GUESS(58) /* debugger */ -+ case 'i': -+ JSKW_TEST_GUESS(2) /* continue */ -+ case 'r': -+ JSKW_TEST_GUESS(30) /* abstract */ -+ case 't': -+ if (JSKW_AT(1) == 'o') { -+ JSKW_TEST_GUESS(56) /* volatile */ -+ } -+ if (JSKW_AT(1) == 'u') { -+ JSKW_TEST_GUESS(10) /* function */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 9: -+ if (JSKW_AT(1) == 'n') { -+ JSKW_TEST_GUESS(43) /* interface */ -+ } -+ if (JSKW_AT(1) == 'r') { -+ if (JSKW_AT(0) == 'p') { -+ JSKW_TEST_GUESS(48) /* protected */ -+ } -+ if (JSKW_AT(0) == 't') { -+ JSKW_TEST_GUESS(55) /* transient */ -+ } -+ JSKW_NO_MATCH() -+ } -+ JSKW_NO_MATCH() -+ case 10: -+ if (JSKW_AT(1) == 'n') { -+ JSKW_TEST_GUESS(29) /* instanceof */ -+ } -+ if (JSKW_AT(1) == 'm') { -+ JSKW_TEST_GUESS(40) /* implements */ -+ } -+ JSKW_NO_MATCH() -+ case 12: -+ JSKW_TEST_GUESS(53) /* synchronized */ -+ } -+ JSKW_NO_MATCH() - diff --git a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jscpucfg.c.p b/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jscpucfg.c.p deleted file mode 100644 index 436e25d..0000000 --- a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jscpucfg.c.p +++ /dev/null @@ -1,21 +0,0 @@ ---- js/src/jscpucfg.c 2007-06-29 20:30:27 -+++ js-amiga/src/jscpucfg.c 2012-07-06 23:27:54 -@@ -53,6 +53,10 @@ - - /* Generate cpucfg.h */ - -+#ifdef XP_AMIGA -+#include <exec/types.h> -+#define INT64 ULONG -+#else - #if defined(XP_WIN) || defined(XP_OS2) - #ifdef WIN32 - #if defined(__GNUC__) -@@ -70,6 +74,7 @@ - #define INT64 long long - #endif - #endif -+#endif - - #endif /* CROSS_COMPILE */ - diff --git a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jslibmath.h.p b/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jslibmath.h.p deleted file mode 100644 index b1256c2..0000000 --- a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jslibmath.h.p +++ /dev/null @@ -1,16 +0,0 @@ ---- js/src/jslibmath.h 2006-07-13 07:01:04 -+++ js-amiga/src/jslibmath.h 2012-07-06 23:06:50 -@@ -58,6 +58,12 @@ - * - fdlibm broken on OSF1/alpha - */ - -+ -+#if defined(XP_AMIGA) -+#define JS_USE_FDLIBM_MATH 0 -+#endif -+ -+ - #ifndef JS_USE_FDLIBM_MATH - #define JS_USE_FDLIBM_MATH 0 - #endif - diff --git a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsnum.c.p b/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsnum.c.p deleted file mode 100644 index 5f01c21..0000000 --- a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsnum.c.p +++ /dev/null @@ -1,12 +0,0 @@ ---- js/src/jsnum.c 2007-04-06 20:53:22 -+++ js-amiga/src/jsnum.c 2012-07-06 21:14:25 -@@ -42,7 +42,7 @@ - * JS number type and wrapper class. - */ - #include "jsstddef.h" --#if defined(XP_WIN) || defined(XP_OS2) -+#if defined(XP_WIN) || defined(XP_OS2) || defined(XP_AMIGA) - #include <float.h> - #endif - #include <locale.h> - diff --git a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsosdep.h.p b/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsosdep.h.p deleted file mode 100644 index 4ece807..0000000 --- a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jsosdep.h.p +++ /dev/null @@ -1,14 +0,0 @@ ---- js/src/jsosdep.h 2006-07-07 02:12:02 -+++ js-amiga/src/jsosdep.h 2012-07-06 21:18:43 -@@ -56,6 +56,11 @@ - #define JS_HAVE_LONG_LONG - #endif - -+#ifdef XP_AMIGA -+#undef JS_HAVE_LONG_LONG -+ -+#include <stddef.h> -+#endif - - #ifdef XP_UNIX - diff --git a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jstypes.h.p b/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jstypes.h.p deleted file mode 100644 index 2c6f79f..0000000 --- a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/jstypes.h.p +++ /dev/null @@ -1,39 +0,0 @@ ---- js/src/jstypes.h 2006-08-14 20:32:06 -+++ js-amiga/src/jstypes.h 2012-07-29 12:14:05 -@@ -117,6 +117,21 @@ - #define JS_STATIC_DLL_CALLBACK(__x) __x JS_DLL_CALLBACK - #endif /* _WINDLL */ - -+#elif defined(XP_AMIGA) -+#ifdef HAVE_VISIBILITY_ATTRIBUTE -+#define JS_EXTERNAL_VIS __attribute__((visibility ("default"))) -+#else -+#define JS_EXTERNAL_VIS -+#endif -+ -+#define JS_EXTERN_API(__type) extern __type -+#define JS_EXPORT_API(__type) __type -+#define JS_EXTERN_DATA(__type) extern __type -+#define JS_EXPORT_DATA(__type) __type -+ -+#define JS_DLL_CALLBACK -+#define JS_STATIC_DLL_CALLBACK(__x) static __x -+ - #else /* Unix */ - - #ifdef HAVE_VISIBILITY_ATTRIBUTE -@@ -241,11 +256,11 @@ - - #if (defined(XP_WIN) && !defined(CROSS_COMPILE)) || defined (WINCE) - # include "jscpucfg.h" /* Use standard Mac or Windows configuration */ --#elif defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2) || defined(CROSS_COMPILE) -+#elif defined(XP_UNIX) || defined(XP_AMIGA) || defined(XP_BEOS) || defined(XP_OS2) || defined(CROSS_COMPILE) - # include "jsautocfg.h" /* Use auto-detected configuration */ - # include "jsosdep.h" /* ...and platform-specific flags */ - #else --# error "Must define one of XP_BEOS, XP_OS2, XP_WIN or XP_UNIX" -+# error "Must define one of XP_BEOS, XP_OS2, XP_AMIGA, XP_WIN or XP_UNIX" - #endif - - JS_BEGIN_EXTERN_C - diff --git a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/prmjtime.c.p b/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/prmjtime.c.p deleted file mode 100644 index 616fe81..0000000 --- a/sdk/recipes/patches/spidermonkey/ppc-amigaos-1.7.0/prmjtime.c.p +++ /dev/null @@ -1,54 +0,0 @@ ---- js/src/prmjtime.c 2005-07-07 22:35:39 -+++ js-amiga/src/prmjtime.c 2012-07-06 21:22:31 -@@ -89,13 +89,17 @@ static void PRMJ_basetime(JSInt64 tsecs, - JSInt32 - PRMJ_LocalGMTDifference() - { --#if defined(XP_UNIX) || defined(XP_WIN) || defined(XP_OS2) || defined(XP_BEOS) -+#if defined(XP_UNIX) || defined(XP_WIN) || defined(XP_OS2) || defined(XP_BEOS) || defined(XP_AMIGA) - struct tm ltime; - - /* get the difference between this time zone and GMT */ - memset((char *)<ime,0,sizeof(ltime)); - ltime.tm_mday = 2; -+#ifdef XP_AMIGA -+ ltime.tm_year = 78; -+#else - ltime.tm_year = 70; -+#endif - #ifdef SUNOS4 - ltime.tm_zone = 0; - ltime.tm_gmtoff = 0; -@@ -158,11 +162,21 @@ PRMJ_Now(void) - ten = JSLL_INIT(0, 10); - FILETIME time, midnight; - #endif --#if defined(XP_UNIX) || defined(XP_BEOS) -+#if defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_AMIGA) - struct timeval tv; - JSInt64 s, us, s2us; - #endif /* XP_UNIX */ - -+#if defined(XP_AMIGA) -+ gettimeofday(&tv, 0); -+ JSLL_UI2L(s2us, PRMJ_USEC_PER_SEC); -+ JSLL_UI2L(s, tv.tv_sec); -+ JSLL_UI2L(us, tv.tv_usec); -+ JSLL_MUL(s, s, s2us); -+ JSLL_ADD(s, s, us); -+ return s; -+#endif -+ - #ifdef XP_OS2 - ftime(&b); - JSLL_UI2L(ms2us, PRMJ_USEC_PER_MSEC); -@@ -268,7 +282,7 @@ PRMJ_DSTOffset(JSInt64 local_time) - size_t - PRMJ_FormatTime(char *buf, int buflen, char *fmt, PRMJTime *prtm) - { --#if defined(XP_UNIX) || defined(XP_WIN) || defined(XP_OS2) || defined(XP_BEOS) -+#if defined(XP_UNIX) || defined(XP_WIN) || defined(XP_OS2) || defined(XP_BEOS) || defined(XP_AMIGA) - struct tm a; - - /* Zero out the tm struct. Linux, SunOS 4 struct tm has extra members int - |