Reviewers: Sven Panne,

Description:
Version 4.1.0.23 (cherry-pick)

Merged 68d5f916d885462621d52ceafdd605ce1fd28c24

Fix build on solaris platforms

BUG=3935
LOG=N
[email protected]

Please review this at https://codereview.chromium.org/1021563003/

Base URL: https://chromium.googlesource.com/v8/[email protected]

Affected files (+4, -1 lines):
  M AUTHORS
  M include/v8-version.h
  M src/base/platform/platform-posix.cc


Index: AUTHORS
diff --git a/AUTHORS b/AUTHORS
index 89caae648c628639afcf6323df2e1b5336bdc3f5..6cda4f239730b0fb992483d061b919ec32c3ab88 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -45,6 +45,7 @@ Jan de Mooij <[email protected]>
 Jay Freeman <[email protected]>
 James Pike <[email protected]>
 Joel Stanley <[email protected]>
+Johan Bergström <[email protected]>
 John Jozwiak <[email protected]>
 Jonathan Liu <[email protected]>
 Kun Zhang <[email protected]>
Index: include/v8-version.h
diff --git a/include/v8-version.h b/include/v8-version.h
index edc4169342f4813571993fe4b138ecc72a348a19..54c859c5ff5ad3e0c1fae022a57663e8629ff9f4 100644
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 4
 #define V8_MINOR_VERSION 1
 #define V8_BUILD_NUMBER 0
-#define V8_PATCH_LEVEL 22
+#define V8_PATCH_LEVEL 23

 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
Index: src/base/platform/platform-posix.cc
diff --git a/src/base/platform/platform-posix.cc b/src/base/platform/platform-posix.cc index 64aed2b8d1f2d0c3d3c86ef86cfd6d8fccd573e9..2cb3bbefd2cd219e54c2a71c350ca6eaba7c5a2c 100644
--- a/src/base/platform/platform-posix.cc
+++ b/src/base/platform/platform-posix.cc
@@ -260,6 +260,8 @@ int OS::GetCurrentThreadId() {
   return static_cast<int>(syscall(__NR_gettid));
 #elif V8_OS_ANDROID
   return static_cast<int>(gettid());
+#elif V8_OS_SOLARIS
+  return static_cast<int>(pthread_self());
 #else
   return static_cast<int>(reinterpret_cast<intptr_t>(pthread_self()));
 #endif


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to