diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2017-11-21 20:18:01 +0100 |
|---|---|---|
| committer | Rechi <Rechi@users.noreply.github.com> | 2017-11-21 20:18:01 +0100 |
| commit | e5ba4ab0c64b8dd5c6b7878725d0b9a0f4e2ddf7 (patch) | |
| tree | 6a1dc96d26b75895d2bbba019c4e4fb88f8bc8ca /tools/depends/target/libffi | |
| parent | 34fb2229c710c8847959057430bc1cb778cdf3d0 (diff) | |
[depends] libffi: fix arm assembler syntax
Diffstat (limited to 'tools/depends/target/libffi')
| -rw-r--r-- | tools/depends/target/libffi/Makefile | 8 | ||||
| -rw-r--r-- | tools/depends/target/libffi/armAssembler.patch | 11 |
2 files changed, 13 insertions, 6 deletions
diff --git a/tools/depends/target/libffi/Makefile b/tools/depends/target/libffi/Makefile index 1f7fcb9d6e..1b3d01d759 100644 --- a/tools/depends/target/libffi/Makefile +++ b/tools/depends/target/libffi/Makefile @@ -1,5 +1,5 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile +DEPS= ../../Makefile.include Makefile armAssembler.patch # lib name, version LIBNAME=libffi @@ -9,11 +9,6 @@ ARCHIVE=$(SOURCE).tar.gz # configuration settings CONFIGURE= ./configure --prefix=$(PREFIX) --disable-shared --disable-builddir -ifeq ($(OS), ios) -ifneq ($(CPU), arm64) -CONFIGURE+=CCASFLAGS=-no-integrated-as -endif -endif LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).a @@ -26,6 +21,7 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + cd $(PLATFORM); patch -p1 -i ../armAssembler.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) diff --git a/tools/depends/target/libffi/armAssembler.patch b/tools/depends/target/libffi/armAssembler.patch new file mode 100644 index 0000000000..3fff6ed693 --- /dev/null +++ b/tools/depends/target/libffi/armAssembler.patch @@ -0,0 +1,11 @@ +--- a/src/arm/sysv.S ++++ b/src/arm/sysv.S +@@ -396,7 +396,7 @@ + beq LSYM(Lepilogue_vfp) + + cmp r3, #FFI_TYPE_SINT64 +- stmeqia r2, {r0, r1} ++ stmiaeq r2, {r0, r1} + beq LSYM(Lepilogue_vfp) + + cmp r3, #FFI_TYPE_FLOAT |