diff options
| author | Ben Murdoch <benm@google.com> | 2014-10-22 18:55:17 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-10-22 18:55:17 +0100 |
| commit | 1675a649fd7a8b3cb80ffddae2dc181f122353c5 (patch) | |
| tree | eb1ec66a619d0b0680d83b54523dc381a74e04ae /build | |
| parent | b985a5157c04424e8c2fd5091938349a768d4329 (diff) | |
| download | chromium_org-1675a649fd7a8b3cb80ffddae2dc181f122353c5.tar.gz | |
Merge from Chromium at DEPS revision 39.0.2171.37
This commit was generated by merge_to_master.py.
Change-Id: I4ca18a1d6d089e98b0511ad83f49e89d62401760
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 3 | ||||
| -rw-r--r-- | build/util/LASTCHANGE | 2 | ||||
| -rw-r--r-- | build/util/LASTCHANGE.blink | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 17ca733131..f3f28c718a 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -4072,6 +4072,9 @@ # Else building libyuv gives clang's register allocator issues, # see llvm.org/PR15798 / crbug.com/233709 '-momit-leaf-frame-pointer', + # Align the stack on 16-byte boundaries, http://crbug.com/418554. + '-mstack-alignment=16', + '-mstackrealign', ], }], ['clang==1 and "<(GENERATOR)"=="ninja"', { diff --git a/build/util/LASTCHANGE b/build/util/LASTCHANGE index c7c12a9a93..63568e0085 100644 --- a/build/util/LASTCHANGE +++ b/build/util/LASTCHANGE @@ -1 +1 @@ -LASTCHANGE=8247efb6c913 +LASTCHANGE=48c6cda3d725 diff --git a/build/util/LASTCHANGE.blink b/build/util/LASTCHANGE.blink index f0643d6b08..36c9bfeb84 100644 --- a/build/util/LASTCHANGE.blink +++ b/build/util/LASTCHANGE.blink @@ -1 +1 @@ -LASTCHANGE=183629 +LASTCHANGE=184107 |