diff options
Diffstat (limited to 'deps/v8/src/platform-linux.cc')
| -rw-r--r-- | deps/v8/src/platform-linux.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/deps/v8/src/platform-linux.cc b/deps/v8/src/platform-linux.cc index fbcad8f6d1..527b9f616d 100644 --- a/deps/v8/src/platform-linux.cc +++ b/deps/v8/src/platform-linux.cc @@ -53,7 +53,8 @@ // GLibc on ARM defines mcontext_t has a typedef for 'struct sigcontext'. // Old versions of the C library <signal.h> didn't define the type. #if defined(__ANDROID__) && !defined(__BIONIC_HAVE_UCONTEXT_T) && \ - defined(__arm__) && !defined(__BIONIC_HAVE_STRUCT_SIGCONTEXT) + (defined(__arm__) || defined(__aarch64__)) && \ + !defined(__BIONIC_HAVE_STRUCT_SIGCONTEXT) #include <asm/sigcontext.h> #endif @@ -117,7 +118,7 @@ bool OS::ArmUsingHardFloat() { #endif // def __arm__ -const char* OS::LocalTimezone(double time) { +const char* OS::LocalTimezone(double time, TimezoneCache* cache) { if (std::isnan(time)) return ""; time_t tv = static_cast<time_t>(std::floor(time/msPerSecond)); struct tm* t = localtime(&tv); @@ -126,7 +127,7 @@ const char* OS::LocalTimezone(double time) { } -double OS::LocalTimeOffset() { +double OS::LocalTimeOffset(TimezoneCache* cache) { time_t tv = time(NULL); struct tm* t = localtime(&tv); // tm_gmtoff includes any daylight savings offset, so subtract it. |