diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-06-21 15:16:39 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-06-21 15:23:36 +0100 |
| commit | 82131246a46ed4547c978b0081d4e0db9d6f3942 (patch) | |
| tree | debd12abf0e2f5c3ce977e3813db7c0f7238fa31 /include | |
| parent | e2673a829b61d77d7884ecabac2424fdb28309e8 (diff) | |
| download | mupdf-82131246a46ed4547c978b0081d4e0db9d6f3942.tar.xz | |
Fix Android builds.
Had to rejig the thumb entry/exit veneers to allow for NDK_PROFILER
operation, but this seems to have negated the need for Core2.mk, so
removed that here.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mupdf/fitz/system.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/mupdf/fitz/system.h b/include/mupdf/fitz/system.h index 6056984c..53d400dc 100644 --- a/include/mupdf/fitz/system.h +++ b/include/mupdf/fitz/system.h @@ -191,7 +191,10 @@ extern void __gnu_mcount_nc(void); * the ARM functions to a separate file and arrange for it to be compiled * without thumb mode, we can save some time on entry. */ -#ifdef ARCH_THUMB +/* This is slightly suboptimal; __thumb__ and __thumb2__ become defined + * and undefined by #pragma arm/#pragma thumb - but we can't define a + * macro to track that. */ +#if defined(__thumb__) || defined(__thumb2__) #define ENTER_ARM ".balign 4\nmov r12,pc\nbx r12\n0:.arm\n" ENTER_PG #define ENTER_THUMB "9:.thumb\n" ENTER_PG #else |