| commit | e4d153170d2c3e803e3bc2dac0de150df5dedb4c | [log] [tgz] |
|---|---|---|
| author | Mark Seaborn <mseaborn@chromium.org> | Sat Mar 01 18:39:31 2014 |
| committer | Mark Seaborn <mseaborn@chromium.org> | Sat Mar 01 18:39:31 2014 |
| tree | 40d326fa32b6f135ad7bb52d76de6d971da301b4 | |
| parent | d346cc0b6029ce81a5ef0bf6245fbedaedad0f9c [diff] | |
| parent | a5131ab23d77936eecc793a1b7096b9383c0f792 [diff] |
Merge LLVM/Clang 3.4 into PNaCl's branch This fixes up various merge conflicts. The PNaCl branch of Clang contained various changes cherry-picked from between 3.3 and 3.4, so these no longer appear as localmods after the merge. This includes changes to: * atomics * C++ method pointers for le32 * use of pow() intrinsic BUG=https://code.google.com/p/nativeclient/issues/detail?id=3757 TEST=PNaCl toolchain trybots Review URL: https://groups.google.com/forum/#!topic/native-client-reviews/OD-h-xSTCu4