Version 4.3.61.18 (cherry-pick)

Version 4.3.61.18 (cherry-pick)

Merged 8ceb90356b0098c7df01678359535e4ed4bf05e8

Fix FreeBSD build.

BUG=v8:4079
LOG=N
NOTRY=true
NOPRESUBMIT=true
R=titzer@chromium.org

[titzer, 2015-05-11 07:00:08]

lgtm

[titzer, 2015-05-11 07:00:12]

The CQ bit was checked by titzer@chromium.org

[commit-bot: I haz the power, 2015-05-11 07:00:33]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1126233002/1

[commit-bot: I haz the power, 2015-05-11 07:00:35]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-05-11 07:00:37]

CLs for remote refs other than refs/pending/heads/master must contain NOTRY=true
and NOPRESUBMIT=true in order for the CQ to process them

[bnoordhuis, 2015-05-11 09:48:50]

The CQ bit was checked by ben@strongloop.com

[commit-bot: I haz the power, 2015-05-11 09:49:02]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1126233002/1

[commit-bot: I haz the power, 2015-05-11 09:49:15]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-05-11 09:49:17]

Failed to apply patch for include/v8-version.h:
While running git apply --index -3 -p1;
  error: patch failed: include/v8-version.h:11
  Falling back to three-way merge...
  Applied patch to 'include/v8-version.h' with conflicts.
  U include/v8-version.h

Patch:       include/v8-version.h
Index: include/v8-version.h
diff --git a/include/v8-version.h b/include/v8-version.h
index
19729b09b6a63f642bb308b5bf0fcfbb6a107358..ee03ba8c194211e5dc15d4b9b374962207d1e18d
100644
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 4
 #define V8_MINOR_VERSION 3
 #define V8_BUILD_NUMBER 61
-#define V8_PATCH_LEVEL 17
+#define V8_PATCH_LEVEL 18
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)

[commit-bot: I haz the power, 2015-05-11 09:49:18]

The CQ bit was unchecked by commit-bot@chromium.org

[bnoordhuis, 2015-05-11 09:53:28]

I'll file a new CL later today.