Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
roytam1 2021-03-25 09:26:26 +08:00
commit f9ded55f98
89 changed files with 168 additions and 3086 deletions

View file

@ -30,8 +30,6 @@
#ifndef JIT_SPEW_DIR
# if defined(_WIN32)
# define JIT_SPEW_DIR ""
# elif defined(__ANDROID__)
# define JIT_SPEW_DIR "/data/local/tmp/"
# else
# define JIT_SPEW_DIR "/tmp/"
# endif

View file

@ -28,12 +28,7 @@
// so also try /sdcard/.
#ifndef PERF_SPEW_DIR
# if defined(__ANDROID__)
# define PERF_SPEW_DIR "/data/local/tmp/"
# define PERF_SPEW_DIR_2 "/sdcard/"
# else
# define PERF_SPEW_DIR "/tmp/"
# endif
#endif
using namespace js;
@ -104,12 +99,6 @@ js::jit::CheckPerf() {
return;
}
#if defined(__ANDROID__)
if (openPerfMap(PERF_SPEW_DIR_2)) {
PerfChecked = true;
return;
}
#endif
fprintf(stderr, "Failed to open perf map file. Disabling IONPERF.\n");
PerfMode = PERF_MODE_NONE;
}

View file

@ -22,9 +22,8 @@ using mozilla::TimeStamp;
static const long NanoSecPerSec = 1000000000;
// Android 32-bit & macOS 10.12 has the clock functions, but not pthread_condattr_setclock.
#if defined(HAVE_CLOCK_MONOTONIC) && \
!(defined(__ANDROID__) && !defined(__LP64__)) && !defined(__APPLE__)
// MacOS 10.12 has the clock functions, but not pthread_condattr_setclock.
#if defined(HAVE_CLOCK_MONOTONIC) && !defined(__APPLE__)
# define USE_CLOCK_API
#endif