Version 3.29.88.8 (merged r24189, r24226, r24271)

Version 3.29.88.8 (merged r24189, r24226, r24271)

X87: fixed branch distances.

X87: fix the bug which is introduced by R24169.

X87:  fix the Sqrt issue.

R=jkummerow@chromium.org
BUG=

Committed: https://code.google.com/p/v8/source/detail?r=24586

[Jakob Kummerow, 2014-10-14 08:51:55]

lgtm

[Weiliang, 2014-10-14 08:52:19]

weiliang.lin@intel.com changed reviewers:
+ danno@chromium.org

[Weiliang, 2014-10-14 08:52:20]

Hi Jakob,
sorry for another merge due to x87 debug test failure at 3.29 branch. 

Could you please have a look?

Thanks~

[Weiliang, 2014-10-14 08:53:05]

Committed patchset #1 (id:1) manually as 24586.

[Weiliang, 2014-10-14 09:01:30]

weiliang.lin@intel.com changed reviewers:
- danno@chromium.org

[Weiliang, 2014-10-14 09:07:31]

Hi Jakob, 
The merge script fails as below. Do you know how to fix it?

$ tools/push-to-trunk/merge_to_branch.py -s 10 --branch 3.29 24189 24226 24271
>>> Step 10: Determine svn commit revision.
Command:  git svn fetch
in /home/user/work/v8-git-svn/v8.git
Traceback (most recent call last):
  File "tools/push-to-trunk/merge_to_branch.py", line 327, in <module>
    sys.exit(MergeToBranch().Run())
  File
"/home/user/work/v8-git-svn/v8.git/tools/push-to-trunk/common_includes.py", line
706, in Run
    return self.RunSteps(self._Steps(), args)
  File
"/home/user/work/v8-git-svn/v8.git/tools/push-to-trunk/common_includes.py", line
701, in RunSteps
    if step.Run():
  File
"/home/user/work/v8-git-svn/v8.git/tools/push-to-trunk/common_includes.py", line
296, in Run
    return self.RunStep()
  File "tools/push-to-trunk/merge_to_branch.py", line 222, in RunStep
    commit_hash = self.GitLog(n=1, format="%H", grep=self["new_commit_msg"],
  File
"/home/user/work/v8-git-svn/v8.git/tools/push-to-trunk/common_includes.py", line
278, in __getitem__
    return self._state[key]
KeyError: 'new_commit_msg'

[Michael Achenbach, 2014-10-14 09:15:38]

The merge script is simply a pain when restarted in the middle, as you are on
another branch and use an older version of the script itself. The script changes
over time and refers to state that is not there now... the only fix here is to
copy the newest version of the script from master into a different folder
outside version control to restart a step (best copy the whole
tools/push-to-trunk folder to e.g. tools/push-to-trunk-pinned).