diff options
| author | Markus Pfau <pfau@peakwork.de> | 2016-09-25 14:48:09 +0200 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2016-10-09 10:53:39 +0200 |
| commit | 14047ef08df5ef82acad0bf5a8f7e0cff5a642cf (patch) | |
| tree | d46d5b6d31aecc7300a15b10b1a77903852f898b /tools/depends/target/pcre | |
| parent | 3c635750d7ded89f28de507de5b574ec600b4fea (diff) | |
aarch64 compile stuff
Diffstat (limited to 'tools/depends/target/pcre')
| -rw-r--r-- | tools/depends/target/pcre/Makefile | 1 | ||||
| -rw-r--r-- | tools/depends/target/pcre/jit_aarch64.patch | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tools/depends/target/pcre/Makefile b/tools/depends/target/pcre/Makefile index 75848bb283..ff5aa49a82 100644 --- a/tools/depends/target/pcre/Makefile +++ b/tools/depends/target/pcre/Makefile @@ -27,6 +27,7 @@ $(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 < ../tvos-bitcode-fix.patch + cd $(PLATFORM); patch -p0 < ../jit_aarch64.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) diff --git a/tools/depends/target/pcre/jit_aarch64.patch b/tools/depends/target/pcre/jit_aarch64.patch new file mode 100644 index 0000000000..5f99207c69 --- /dev/null +++ b/tools/depends/target/pcre/jit_aarch64.patch @@ -0,0 +1,11 @@ +--- sljit/sljitConfigInternal.h.orig 2016-09-25 12:41:56.067863204 +0200 ++++ sljit/sljitConfigInternal.h 2016-09-25 12:42:22.155862977 +0200 +@@ -310,7 +310,7 @@ + #define SLJIT_CACHE_FLUSH(from, to) \ + sys_icache_invalidate((char*)(from), (char*)(to) - (char*)(from)) + +-#elif defined __ANDROID__ ++#elif (defined __ANDROID__ && !defined SLJIT_CONFIG_ARM_64) + + /* Android lacks __clear_cache; instead, cacheflush should be used. */ + |