diff options
| -rw-r--r-- | include/mupdf/fitz/system.h | 11 | ||||
| -rw-r--r-- | platform/java/mupdf_native.c | 4 |
2 files changed, 3 insertions, 12 deletions
diff --git a/include/mupdf/fitz/system.h b/include/mupdf/fitz/system.h index 8a617e5b..c7cd3713 100644 --- a/include/mupdf/fitz/system.h +++ b/include/mupdf/fitz/system.h @@ -201,12 +201,6 @@ int fz_android_fprintf(void *file, const char *fmt, ...); /* ARM assembly specific defines */ #ifdef ARCH_ARM -#ifdef NDK_PROFILER -extern void __gnu_mcount_nc(void); -#define ENTER_PG "push {lr}\nbl __gnu_mcount_nc\n" -#else -#define ENTER_PG -#endif /* If we're compiling as thumb code, then we need to tell the compiler * to enter and exit ARM mode around our assembly sections. If we move @@ -217,12 +211,13 @@ extern void __gnu_mcount_nc(void); * 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 +#define ENTER_ARM ".balign 4\nmov r12,pc\nbx r12\n0:.arm\n" +#define ENTER_THUMB "9:.thumb\n" #else #define ENTER_ARM #define ENTER_THUMB #endif + #endif #ifdef CLUSTER diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c index 6efa4f7f..561ba1dc 100644 --- a/platform/java/mupdf_native.c +++ b/platform/java/mupdf_native.c @@ -5,10 +5,6 @@ #include <pthread.h> #endif -#ifdef NDK_PROFILER -#include "prof.h" -#endif - #include "mupdf/fitz.h" #include "mupdf/ucdn.h" #include "mupdf/pdf.h" |