diff options
author | Vincent Sanders <vince@kyllikki.org> | 2012-12-16 13:56:54 +0000 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2012-12-16 13:56:54 +0000 |
commit | 842cbbe2deac7546b6e860bf413e03b6ad565c82 (patch) | |
tree | 7ba1d41ce26c78ae7727b6be4b1e229e1512df06 /sdk | |
parent | 77e33af042e8cae74fab188ecd94e6adbcd844fc (diff) | |
download | toolchains-842cbbe2deac7546b6e860bf413e03b6ad565c82.tar.gz toolchains-842cbbe2deac7546b6e860bf413e03b6ad565c82.tar.bz2 |
make spidermonkey 1.8.5 build without JIT on RISC OS
add support for spidermonkey 1.7.0 source
Diffstat (limited to 'sdk')
-rw-r--r-- | sdk/Makefile | 25 | ||||
-rw-r--r-- | sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/ExecutableAllocator.h.p (renamed from sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocator.h.p) | 0 | ||||
-rw-r--r-- | sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/ExecutableAllocatorPosix.cpp.p (renamed from sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocatorPosix.cpp.p) | 0 | ||||
-rw-r--r-- | sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/Makefile.p | 21 | ||||
-rw-r--r-- | sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/MethodJIT.p (renamed from sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p) | 0 | ||||
-rw-r--r-- | sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/Platform.h.p (renamed from sdk/recipes/patches/spidermonkey/arm-unknown-riscos/Platform.h.p) | 2 | ||||
-rw-r--r-- | sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/configure.p (renamed from sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p) | 0 | ||||
-rw-r--r-- | sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jscntxt.cpp.p (renamed from sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jscntxt.cpp.p) | 0 | ||||
-rw-r--r-- | sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jsgcchunk.cpp.p (renamed from sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsgcchunk.cpp.p) | 0 | ||||
-rw-r--r-- | sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jsnativestack.cpp.p (renamed from sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsnativestack.cpp.p) | 0 | ||||
-rw-r--r-- | sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jstypedarray.cpp.p (renamed from sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jstypedarray.cpp.p) | 0 |
11 files changed, 42 insertions, 6 deletions
diff --git a/sdk/Makefile b/sdk/Makefile index 895ee90..a2d589d 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -84,6 +84,9 @@ ifeq ($(TARGET),arm-unknown-riscos) SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) spidermonkey.d) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares $(LIBCURL_DISABLES) + ifeq ($(VERSION_SPIDERMONKEY),1.8.5) + EXTRAARGS_SPIDERMONKEY := --disable-tracejit --disable-thumb2 --without-thumb --enable-static --disable-shared --disable-shared-js --with-cpu-arch=armv3 --disable-tests --disable-methodjit + endif endif ifeq ($(TARGET),m68k-atari-mint) @@ -106,6 +109,7 @@ ifeq ($(TARGET),ppc-amigaos) SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS)) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random + #VERSION_SPIDERMONKEY := 1.7.0 endif ifeq ($(TARGET),i686-w64-mingw32) @@ -483,10 +487,14 @@ $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz: wget -q -O $@ https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(VERSION_NSPR)/src/nspr-$(VERSION_NSPR).tar.gz -# spidermonkey (libmozjs) --disable-methodjit +# spidermonkey (libmozjs) $(BUILDSTEPS)/spidermonkey.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr.d $(BUILDSTEPS)/spidermonkey-src.d - cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --disable-tracejit --disable-thumb2 --without-thumb --enable-static --with-system-nspr --with-nspr-prefix=$(GCCSDK_INSTALL_ENV) --disable-shared --disable-shared-js --with-cpu-arch=armv3 --disable-tests - cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) make +ifeq ($(VERSION_SPIDERMONKEY),1.7.0) + $(env) make -C $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src -f Makefile.ref +else + cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --with-system-nspr --with-nspr-prefix=$(GCCSDK_INSTALL_ENV) $(EXTRAARGS_SPIDERMONKEY) + cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) make +endif cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) make install touch $@ @@ -494,8 +502,15 @@ $(BUILDSTEPS)/spidermonkey-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/spiderm $(RM) -rf $(BUILDDIR)/spidermonkey mkdir -p $(BUILDDIR)/spidermonkey cd $(BUILDDIR)/spidermonkey && tar xaf $(SOURCEDIR)/spidermonkey-$(VERSION_SPIDERMONKEY).tar.gz - for p in `ls $(RECIPES)/patches/spidermonkey/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY) -p0 <$$p ; done +ifeq ($(VERSION_SPIDERMONKEY),1.7.0) + mkdir $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY) + mv $(BUILDDIR)/spidermonkey/js $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/ +endif + for p in `ls $(RECIPES)/patches/spidermonkey/$(TARGET)-$(VERSION_SPIDERMONKEY)/*.p` ; do patch -d $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY) -p0 <$$p ; done touch $@ -$(SOURCEDIR)/spidermonkey-$(VERSION_SPIDERMONKEY).tar.gz: +$(SOURCEDIR)/spidermonkey-1.8.5.tar.gz: wget -q -O $@ http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz + +$(SOURCEDIR)/spidermonkey-1.7.0.tar.gz: + wget -q -O $@ http://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocator.h.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/ExecutableAllocator.h.p index 30b811f..30b811f 100644 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocator.h.p +++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/ExecutableAllocator.h.p diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocatorPosix.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/ExecutableAllocatorPosix.cpp.p index 2f31400..2f31400 100644 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocatorPosix.cpp.p +++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/ExecutableAllocatorPosix.cpp.p 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 new file mode 100644 index 0000000..abe9df9 --- /dev/null +++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/Makefile.p @@ -0,0 +1,21 @@ +--- 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/MethodJIT.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/MethodJIT.p index 2d7ddb0..2d7ddb0 100644 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p +++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/MethodJIT.p diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/Platform.h.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/Platform.h.p index 9d91ac8..29bc2c2 100644 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/Platform.h.p +++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/Platform.h.p @@ -24,7 +24,7 @@ + +#define WTF_THUMB_ARCH_VERSION 0 +#define WTF_PLATFORM_RISCOS 1 -+#define WTF_CPU_ARM_TRADITIONAL 1 ++#define WTF_CPU_ARM_TRADITIONAL 0 + +#endif diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/configure.p index fcd012a..fcd012a 100644 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p +++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/configure.p diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jscntxt.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jscntxt.cpp.p index d61d860..d61d860 100644 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jscntxt.cpp.p +++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jscntxt.cpp.p diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsgcchunk.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jsgcchunk.cpp.p index b8720e4..b8720e4 100644 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsgcchunk.cpp.p +++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jsgcchunk.cpp.p diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsnativestack.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jsnativestack.cpp.p index 0e042a9..0e042a9 100644 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsnativestack.cpp.p +++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jsnativestack.cpp.p diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jstypedarray.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jstypedarray.cpp.p index 0f4cfa9..0f4cfa9 100644 --- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jstypedarray.cpp.p +++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos-1.8.5/jstypedarray.cpp.p |