aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "llvm: fix build"Colin Cross2014-06-053-5/+5
|\
| * llvm: fix buildColin Cross2014-06-043-5/+5
|/ | | | | | | | The previous patch renamed some variables used by the build system from arm64 to aarch64. Rename them back so that LLVM can be built for arm64 again. Change-Id: I760aff378411b46841819b30723eb1fa9e166519
* Merge "Updated the makefiles to use AArch64 name."Stephen Hines2014-06-0411-89/+89
|\
| * Updated the makefiles to use AArch64 name.Chris Wailes2014-06-0411-89/+89
|/ | | | | | | | The makefiles had previously used the name Arm64 for the AArch64 libraries. This patch changes all of makefiles to use the correct name for the backend. Change-Id: Ida062b1173b719b6d2519618827c3a67ede8b479
* Merge "[MIPS64] Enable mips64 build"Stephen Hines2014-06-042-1/+2
|\
| * [MIPS64] Enable mips64 buildDuane Sand2014-06-042-1/+2
| | | | | | | | Change-Id: Ib3f8c3389a51cd36bcec952ade577e9858c528e7
* | Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream ↵Tim Murray2014-06-045-29/+29
|\ \ | |/ |/| | | LLVM."
| * Switch name from tblgen -> llvm-tblgen for consistency with upstream LLVM.Stephen Hines2014-06-035-29/+29
|/ | | | Change-Id: I7735fd88104ff95001dd5f88a1c387df9af993ad
* am cd06393a: Merge "Update LLVM for 3.5 rebase (r209712)."Stephen Hines2014-05-303628-222089/+231220
|\ | | | | | | | | * commit 'cd06393abba35e4415f01f9873ad3c0791da0776': Update LLVM for 3.5 rebase (r209712).
| * Merge "Update LLVM for 3.5 rebase (r209712)."Stephen Hines2014-05-303628-222089/+231220
| |\
| | * Update LLVM for 3.5 rebase (r209712).Stephen Hines2014-05-293628-222089/+231220
| |/ | | | | | | Change-Id: I149556c940fb7dc92d075273c87ff584f400941f
* | am 220b921a: Merge "We need to build the ARM components for AArch64 as well."Stephen Hines2014-05-076-5/+11
|\ \ | |/ | | | | | | * commit '220b921aed042f9e520c26cffd8282a94c66c3d5': We need to build the ARM components for AArch64 as well.
| * Merge "We need to build the ARM components for AArch64 as well."Stephen Hines2014-05-076-5/+11
| |\
| | * We need to build the ARM components for AArch64 as well.Stephen Hines2014-05-066-5/+11
| | | | | | | | | | | | | | | Bug: 14474874 Change-Id: I37d5a95db83c31bb77cf2e2b5686d8aa329fd7d8
* | | am a15b2316: Merge "Don\'t try to use Clang on Windows yet."Stephen Hines2014-05-051-1/+4
|\ \ \ | |/ / | | | | | | | | | * commit 'a15b2316e7c7871d79475302d650167692f15657': Don't try to use Clang on Windows yet.
| * | Merge "Don't try to use Clang on Windows yet."Stephen Hines2014-05-051-1/+4
| |\ \ | | |/ | |/|
| | * Don't try to use Clang on Windows yet.Tim Murray2014-04-011-1/+4
| | | | | | | | | | | | | | | | | | bug 13588226 Change-Id: I8a3e4293a3cb9acaa193779b8a548497b74c69fa
* | | Merge commit '2136801bbd32f5e9554aa8009d0e5f862744162b' into HEADBill Yi2014-04-290-0/+0
|\ \ \
| * \ \ am 15492aa7: am 4afc3292: Merge "Enable x86_64 build"Tim Murray2014-03-175-5/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '15492aa781bfda21531c05562e138e16657d37b9': Enable x86_64 build
| * \ \ \ am 91cda01e: am d3e2a437: Merge "Make LLVM build on AArch64."Tim Murray2014-03-1521-7/+455
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '91cda01e1343429d296a9cdd46e13d64c988d525': Make LLVM build on AArch64.
| * \ \ \ \ am 0f9fcaae: am 130045ba: Merge "Avoid redefinition of __STDC_CONSTANT_MACROS."Ian Rogers2014-03-131-1/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f9fcaae9798d616aa14c2f85faa3eec28ee1da2': Avoid redefinition of __STDC_CONSTANT_MACROS.
| * \ \ \ \ \ am 3183a4b8: am 4829c014: Merge "x86_64 isn\'t a currently supported LLVM ↵Elliott Hughes2014-03-111-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | architecture in our build system." * commit '3183a4b8b8f277aab18269c69e8a0f282aedad77': x86_64 isn't a currently supported LLVM architecture in our build system.
| * \ \ \ \ \ \ am 9fedb398: am bd3e4ce9: am b7485134: am 449fc261: Merge "llvm: convert ↵Colin Cross2014-03-100-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | makefiles to support multilib build" * commit '9fedb398dcf64fcaeb9ed524d70a9ee678b5cf83':
| * \ \ \ \ \ \ \ am 3fb031f5: am cfe73f37: Fix Windows configuration for LLVM 3.4.Stephen Hines2014-03-101-1/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3fb031f524f55c1497994b92ad21397bb87e303b': Fix Windows configuration for LLVM 3.4.
| * \ \ \ \ \ \ \ \ am df51e525: am 4d459ec2: Don\'t build DFSan functionality for Android.Stephen Hines2014-03-101-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'df51e525f1fc57a405bc80dd0c2fe593839deded': Don't build DFSan functionality for Android.
| * \ \ \ \ \ \ \ \ \ am f8f49b49: am 373aa5c6: Update LLVM for merge to 3.4.Stephen Hines2014-03-1020-28/+38
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f8f49b49d3d2507de9e8e2d057aced73e95ace51': Update LLVM for merge to 3.4.
| * \ \ \ \ \ \ \ \ \ \ am 008f5bfe: am ce9904c6: Merge remote-tracking branch ↵Stephen Hines2014-03-103749-73815/+299046
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'upstream/release_34\' into merge-20140211 * commit '008f5bfe7c33a9fe53e3ffddd08e820195c8b60b': (3284 commits) Merging r197483: ------------------------------------------------------------------------ r197483 | yrnkrn | 2013-12-17 00:40:11 -0800 (Tue, 17 Dec 2013) | 8 lines Small reformatting changes. Remove help notes from the ReleaseNotes. Merging r197492: ------------------------------------------------------------------------ r197492 | dyatkovskiy | 2013-12-17 04:07:33 -0800 (Tue, 17 Dec 2013) | 26 lines Merging r197718: ------------------------------------------------------------------------ r197718 | hans | 2013-12-19 12:32:44 -0800 (Thu, 19 Dec 2013) | 10 lines Update notes. Merging r197449: ------------------------------------------------------------------------ r197449 | arnolds | 2013-12-16 17:11:01 -0800 (Mon, 16 Dec 2013) | 7 lines Merging r195411: ------------------------------------------------------------------------ r195411 | mgottesman | 2013-11-21 21:00:51 -0800 (Thu, 21 Nov 2013) | 1 line Merging r197047: ------------------------------------------------------------------------ r197047 | d0k | 2013-12-11 08:36:09 -0800 (Wed, 11 Dec 2013) | 3 lines Merging r195710: ------------------------------------------------------------------------ Merging r197216: ------------------------------------------------------------------------ r197216 | chandlerc | 2013-12-13 00:00:01 -0800 (Fri, 13 Dec 2013) | 9 lines Merging r197215: ------------------------------------------------------------------------ r197215 | chandlerc | 2013-12-12 23:59:56 -0800 (Thu, 12 Dec 2013) | 24 lines Add release notes for the PowerPC backend Merging r197178: ------------------------------------------------------------------------ r197178 | hfinkel | 2013-12-12 12:45:24 -0800 (Thu, 12 Dec 2013) | 9 lines Merging r197228: ------------------------------------------------------------------------ r197228 | d0k | 2013-12-13 05:40:24 -0800 (Fri, 13 Dec 2013) | 8 lines Fix URL. Merging r-197100: ------------------------------------------------------------------------ r197100 | hfinkel | 2013-12-11 16:23:29 -0800 (Wed, 11 Dec 2013) | 1 line Merging r197100: ------------------------------------------------------------------------ r197100 | hfinkel | 2013-12-11 16:23:29 -0800 (Wed, 11 Dec 2013) | 1 line Merging r197089: ------------------------------------------------------------------------ r197089 | hfinkel | 2013-12-11 15:12:25 -0800 (Wed, 11 Dec 2013) | 6 lines Add LibBeauty blurb. ...
| * \ \ \ \ \ \ \ \ \ \ \ am a01b0ad9: am c27b10b1: am 1fb20b43: am edba52bc: Merge "[MIPS64] ↵Elliott Hughes2014-03-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary placeholder build, to allow other projects to build" * commit 'a01b0ad93de74dd759034d334aec613f703f6e13':
| * \ \ \ \ \ \ \ \ \ \ \ \ am c150d210: am 877a6e14: am e5c96aeb: am 94af5fd9: Merge "Avoid ↵Ian Rogers2014-03-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | redefinition of __STD_FORMAT_MACROS." * commit 'c150d2107e21b3ce83203b848ddd7c9cc8216f67':
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 2e072618: am 5fdf6cf6: am 16a8fd80: Avoid redefinition of ↵Ian Rogers2014-03-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __STD_FORMAT_MACROS. * commit '2e07261879c9286bfb1ceb34d1c43d2e39258742': Avoid redefinition of __STD_FORMAT_MACROS.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2ef279b3: am 8d2ad1af: Avoid redefinition of __STD_FORMAT_MACROS.Ian Rogers2014-03-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2ef279b3430fe84414acb9b1fb54e18c3db7917b': Avoid redefinition of __STD_FORMAT_MACROS.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ef5a4427: am 13607273: am 78c0f17f: Merge "llvm: rename aarch64 target to ↵Colin Cross2014-03-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arm64" * commit 'ef5a442708d16f9d126f6d170fa232dd82429a16':
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b2713ca8: am c27b99f0: am 95015e5c: Merge "Remove unused files."Stephen Hines2014-03-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2713ca8e072880347775f3e3b4b6714a748a9fc':
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 987f85d3: am 6562c95b: am 0000ef0b: Merge "AArch64: Temporarily disable ↵Ben Cheng2014-03-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AArch64 build" * commit '987f85d37d720a72dedc2fa917dccca4cff87b27':
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am da96b641: am 0de283df: Fixes for LLDB build to work around host 4.6.2+ ↵Todd Fiala2014-03-101-0/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compiler issues. * commit 'da96b6415b686fa06bb8435b12538053137d8e5a': Fixes for LLDB build to work around host 4.6.2+ compiler issues.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5803f741: am ba309b04: Added libs to the host\'s libLLVM.so.Todd Fiala2014-03-106-1/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5803f741fe6a5ecf954e9e49ab5bac6252093acf': Added libs to the host's libLLVM.so.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ef13f53c: am 1255ecdd: am a91a22bc: am 8e708faf: am 5edef2e8: Merge ↵Stephen Hines2014-03-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "x86_64/x32: Avoid early fail on x32 or x86_64 build" * commit 'ef13f53cf00019c167ba31ab5e073d521a2b8abf':
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fbafaf4f: am c0c7ba11: Merge "Only build HOST LLVM when forced to do so."Stephen Hines2014-03-102-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fbafaf4f03a8e5a5a63bc134a3ad29fd0f1e0bfa': Only build HOST LLVM when forced to do so.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 82b5399b: am 917ae8fb: Fix LLVM version number (3.3).Stephen Hines2014-03-101-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '82b5399b94150ebb811b312cb9e36666b8982ea7': Fix LLVM version number (3.3).
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f36bad31: (-s ours) am 0210adda: (-s ours) am d79086a1: (-s ours) am ↵Stephen Hines2014-03-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3acb57db: (-s ours) am f31eb8ab: (-s ours) Merge "DO NOT MERGE - Allow global-merge option to be accessed externally." * commit 'f36bad3128edafb52dfbc21b6d344e89f3f75fba':
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7e3bc2d7: Merge "CleanSpec for clang 3.5"Brian Carlstrom2014-04-291-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e3bc2d73a00a663afe78dbf4ff37374b05326d5': CleanSpec for clang 3.5
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "CleanSpec for clang 3.5"Brian Carlstrom2014-04-291-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | CleanSpec for clang 3.5Brian Carlstrom2014-04-281-0/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I301d2e56f013d7f9012372fd6c8c3995b88ea4a7
* | | | | | | | | | | | | | | | | | | | | | | | | | am 37a6adeb: Merge "Update to LLVM 3.5a."Stephen Hines2014-04-254942-309447/+335155
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '37a6adeb1525309c655d8acb341019d475b2a6a5': Update to LLVM 3.5a.
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update to LLVM 3.5a."Stephen Hines2014-04-254942-309447/+335155
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | Update to LLVM 3.5a.Stephen Hines2014-04-244942-309447/+335155
| |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifadecab779f128e62e430c2b4f6ddd84953ed617
* | | | | | | | | | | | | | | | | | | | | | | | | | am 69a86400: Merge "Remove the -O1 WAR for SROA.cpp compilation."Stephen Hines2014-04-171-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '69a8640022b04415ae9fac62f8ab090601d8f889': Remove the -O1 WAR for SROA.cpp compilation.
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove the -O1 WAR for SROA.cpp compilation."Stephen Hines2014-04-171-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | Remove the -O1 WAR for SROA.cpp compilation.Stephen Hines2014-04-171-5/+0
| |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8047767 Change-Id: I036af8d0578f723d3f5cb07f1d26b3c6895d8690
* | | | | | | | | | | | | | | | | | | | | | | | | | am 92e3f69b: Merge "Revert "Make LLVM compile with prebuilt clang.""Tim Murray2014-04-022-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '92e3f69b3f498f1d48e1f31d72fc7205b781ed45': Revert "Make LLVM compile with prebuilt clang."