OSDN Git Service
Dan Albert [Thu, 8 Jan 2015 23:38:33 +0000 (23:38 +0000)]
Merge "Fix for xunit output to work around issue in Jenkins when tests are at the root level"
Dan Albert [Thu, 8 Jan 2015 23:38:28 +0000 (23:38 +0000)]
Merge "Fix corner cases in lit xunit for paths with dots"
Dan Albert [Thu, 8 Jan 2015 23:38:24 +0000 (23:38 +0000)]
Merge "Add a test-case for lit xunit output"
Dan Albert [Thu, 8 Jan 2015 23:38:20 +0000 (23:38 +0000)]
Merge "Don't allow test-suite names with . in them in xml output"
Dan Albert [Thu, 8 Jan 2015 23:38:16 +0000 (23:38 +0000)]
Merge "Give lit a --xunit-xml-output option for saving results in xunit format"
Chris Matthews [Sat, 6 Dec 2014 01:13:49 +0000 (01:13 +0000)]
Fix for xunit output to work around issue in Jenkins when tests are at the root level
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223562
91177308-0d34-0410-b5e6-
96231b3b80d8
(cherry picked from commit
ab1837aef3d93a0bf2294aeaeb488c62e3d45535)
Chris Matthews [Sat, 6 Dec 2014 00:21:08 +0000 (00:21 +0000)]
Fix corner cases in lit xunit for paths with dots
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223549
91177308-0d34-0410-b5e6-
96231b3b80d8
(cherry picked from commit
689f10d1b56f68fafd999debc86e0b58d2d5de80)
Chris Matthews [Wed, 3 Dec 2014 23:01:35 +0000 (23:01 +0000)]
Add a test-case for lit xunit output
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223307
91177308-0d34-0410-b5e6-
96231b3b80d8
(cherry picked from commit
0baca9564c9df7b06645f71abdda0fe3090f46a6)
Chris Matthews [Wed, 3 Dec 2014 22:59:15 +0000 (22:59 +0000)]
Don't allow test-suite names with . in them in xml output
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223305
91177308-0d34-0410-b5e6-
96231b3b80d8
(cherry picked from commit
06a1a5f256cabe6d20cf745cd93b389815c988a9)
Chris Matthews [Tue, 2 Dec 2014 22:19:21 +0000 (22:19 +0000)]
Give lit a --xunit-xml-output option for saving results in xunit format
--xunit-xml-output saves test results to disk in JUnit's xml format. This will allow Jenkins to report the details of a lit run.
Based on a patch by David Chisnall.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223163
91177308-0d34-0410-b5e6-
96231b3b80d8
(cherry picked from commit
dcedd15f58e7b76c2ee61c8030799c209104229b)
Tim Murray [Mon, 5 Jan 2015 18:20:31 +0000 (18:20 +0000)]
Merge "Don't clobber LOCAL_CFLAGS_arm64 in llvm-device-build."
Tim Murray [Mon, 5 Jan 2015 18:09:39 +0000 (10:09 -0800)]
Don't clobber LOCAL_CFLAGS_arm64 in llvm-device-build.
bug
18808781
Change-Id: Iabd483a8ec91a4bb6a21e4569c53f28271abdd22
Tim Murray [Mon, 5 Jan 2015 16:47:08 +0000 (16:47 +0000)]
Merge "Add -fno-inline to LLVM device flags."
Tim Murray [Mon, 29 Dec 2014 20:46:43 +0000 (12:46 -0800)]
Add -fno-inline to LLVM device flags.
This works around a problem in the last rebase where RS compiles
using an AArch64-based toolchain crash.
bug
18808781
Change-Id: I6c51cf6fc34a1da9182b11fae9471791fa959e6e
Stephen Hines [Mon, 22 Dec 2014 19:06:53 +0000 (19:06 +0000)]
Merge "Update LLVM lit test configuration to be able to work for 3.6."
Stephen Hines [Thu, 4 Dec 2014 09:12:46 +0000 (01:12 -0800)]
Update LLVM lit test configuration to be able to work for 3.6.
Add support for building more host verification tools:
+ LLVMHello.so (loadable plugin pass)
+ lli-child-target
+ llvm-symbolizer (missing some Android.mk magic)
+ llvm-vtabledump
+ verify-uselistorder
Change-Id: Id7a9397bf458e97fc330ea0301ebb001750aac7c
Tim Murray [Fri, 19 Dec 2014 22:58:12 +0000 (22:58 +0000)]
Merge "Build opt for the device."
Tim Murray [Fri, 19 Dec 2014 18:59:03 +0000 (10:59 -0800)]
Build opt for the device.
Change-Id: I3b62c323c3d0062b5de3900f7e285f0dbf2ce533
Stephen Hines [Thu, 4 Dec 2014 02:59:27 +0000 (02:59 +0000)]
Merge "Update aosp/master LLVM for rebase to r222494."
Stephen Hines [Mon, 1 Dec 2014 22:51:49 +0000 (14:51 -0800)]
Update aosp/master LLVM for rebase to r222494.
Change-Id: Ic787f5e0124df789bd26f3f24680f45e678eef2d
Elliott Hughes [Tue, 25 Nov 2014 23:09:17 +0000 (23:09 +0000)]
Merge "glibc has <sys/uio.h>."
Elliott Hughes [Tue, 25 Nov 2014 22:50:32 +0000 (14:50 -0800)]
glibc has <sys/uio.h>.
Change-Id: Iaed181ce8f142355b69b8fd9590f62199c13e534
Dan Albert [Sun, 9 Nov 2014 02:08:50 +0000 (02:08 +0000)]
Merge "Don't use libgcc_s on Darwin."
Dan Albert [Sun, 9 Nov 2014 00:10:06 +0000 (16:10 -0800)]
Don't use libgcc_s on Darwin.
Apple doesn't have a libgcc_s.
Change-Id: I2d20a579ec629afb2487e61b962c7f22a920c845
Dan Albert [Sat, 8 Nov 2014 19:19:42 +0000 (19:19 +0000)]
Merge "Enable 64-bit builds of all host LLVM tools."
Stephen Hines [Sat, 8 Nov 2014 18:36:45 +0000 (10:36 -0800)]
Enable 64-bit builds of all host LLVM tools.
Bug:
10653601
Bug:
13751317
We need to manually specify the same libgcc_s that is linked with all other
host tools, because the libc++ build rules explicitly pass -nodefaultlibs.
Change-Id: If85ebb2949f456a2ed5cc412e7d1510cc72a3c76
Stephen Hines [Thu, 6 Nov 2014 00:05:40 +0000 (00:05 +0000)]
am
fbc55c91: Merge "Revert "Enable 64-bit builds of all host LLVM tools.""
* commit '
fbc55c91b9e9eb1f38fd2b9b1a4a1bb3a9c50ef4':
Revert "Enable 64-bit builds of all host LLVM tools."
Stephen Hines [Wed, 5 Nov 2014 23:48:02 +0000 (23:48 +0000)]
Merge "Revert "Enable 64-bit builds of all host LLVM tools.""
Stephen Hines [Wed, 5 Nov 2014 23:46:32 +0000 (23:46 +0000)]
Revert "Enable 64-bit builds of all host LLVM tools."
This reverts commit
f514d2c2b4a722b311d2f2c2a8762d7a83d42c00.
Change-Id: I240b55287c4c8a812b95b950a9a928f3e36628c5
Stephen Hines [Wed, 5 Nov 2014 23:01:24 +0000 (23:01 +0000)]
am
e5a80829: Merge "Enable 64-bit builds of all host LLVM tools."
* commit '
e5a8082990418db051a52f003033a480ca691bec':
Enable 64-bit builds of all host LLVM tools.
Stephen Hines [Wed, 5 Nov 2014 22:42:47 +0000 (22:42 +0000)]
Merge "Enable 64-bit builds of all host LLVM tools."
Stephen Hines [Wed, 5 Nov 2014 00:37:08 +0000 (16:37 -0800)]
Enable 64-bit builds of all host LLVM tools.
Bug:
10653601
Bug:
13751317
We need to manually specify the same libgcc_s that is linked with all other
host tools, because the libc++ build rules explicitly pass -nodefaultlibs.
Change-Id: I09e7d2894e2be90ac81223b523688973fcb7de9a
Stephen Hines [Tue, 4 Nov 2014 00:53:30 +0000 (00:53 +0000)]
am
3160f501: Merge "Add color support for Clang!"
* commit '
3160f5018b58edd927dc288630f115b8f910f8f3':
Add color support for Clang!
Stephen Hines [Mon, 3 Nov 2014 21:59:43 +0000 (21:59 +0000)]
Merge "Add color support for Clang!"
Dan Albert [Mon, 3 Nov 2014 17:54:45 +0000 (17:54 +0000)]
am
0d802495: Merge "Allow mm in these subdirectories."
* commit '
0d8024950adc786e7d360261de0effe0ddd236d0':
Allow mm in these subdirectories.
Dan Albert [Mon, 3 Nov 2014 17:49:49 +0000 (17:49 +0000)]
Merge "Allow mm in these subdirectories."
Dan Albert [Fri, 31 Oct 2014 22:57:45 +0000 (15:57 -0700)]
Allow mm in these subdirectories.
These files weren't including llvm.mk themselves, causing
LLVM_HOST_BUILD_MK to be undefined. For make, include $(undefined_var)
fails without error, because make is quite possibly the worst tool
ever made.
Change-Id: Ic2ddd7ba844cf0da98e527b4f05511acb9db3b06
Stephen Hines [Fri, 31 Oct 2014 08:44:58 +0000 (01:44 -0700)]
Add color support for Clang!
Bug:
18187181
We were missing the HAVE_TERMINFO define, as well as proper linkage against
ncurses to enable this.
Change-Id: I985e1720fadbce4e20ec3608e7d5f0f67d1a74e9
Stephen Hines [Thu, 30 Oct 2014 23:42:59 +0000 (23:42 +0000)]
am
a7f35714: Merge "Add host and device build rules for the llvm-symbolizer binary."
* commit '
a7f357148de9be178f55725575c70ce9a888d81c':
Add host and device build rules for the llvm-symbolizer binary.
Stephen Hines [Thu, 30 Oct 2014 21:10:14 +0000 (21:10 +0000)]
Merge "Add host and device build rules for the llvm-symbolizer binary."
Stephen Hines [Thu, 30 Oct 2014 21:07:03 +0000 (21:07 +0000)]
am
8c094149: Merge "Merge in the following upstream patches to resolve Cortex-A57 crashes."
* commit '
8c094149b5dc8cb6c0cde00f2041b513fa01567b':
Merge in the following upstream patches to resolve Cortex-A57 crashes.
Stephen Hines [Thu, 30 Oct 2014 21:04:03 +0000 (21:04 +0000)]
Merge "Merge in the following upstream patches to resolve Cortex-A57 crashes."
Stephen Hines [Fri, 24 Oct 2014 22:42:31 +0000 (15:42 -0700)]
Merge in the following upstream patches to resolve Cortex-A57 crashes.
r214957
r215233
r216455
r216721
r217682
r217689
r217690
r217735
Change-Id: Ia53b88591471325df132caf26e1087510a65ce36
Stephen Hines [Thu, 23 Oct 2014 17:51:46 +0000 (10:51 -0700)]
Add host and device build rules for the llvm-symbolizer binary.
This change also adds DebugInfo to libLLVM.so on the device. Previously, we
did not require this library to be present.
Change-Id: Ie5791b58fb6d414a6e06e652ba8a63e6e1bdc210
Stephen Hines [Tue, 21 Oct 2014 03:09:44 +0000 (03:09 +0000)]
am
8a177369: Bring in fixes for Cortex-A53 errata + build updates.
* commit '
8a1773694c6d9b1277647440583811ad3d85c6a4':
Bring in fixes for Cortex-A53 errata + build updates.
Stephen Hines [Fri, 17 Oct 2014 15:47:43 +0000 (08:47 -0700)]
Bring in fixes for Cortex-A53 errata + build updates.
Bug:
18034609
(cherry picked from commit
bfc2d688b591c574c0cc788348c74545ce894efa)
Change-Id: I010fb735bb84fe97ccb8e3878f9601cb533962f4
Stephen Hines [Fri, 17 Oct 2014 20:24:27 +0000 (20:24 +0000)]
am
281cc67b: Merge "Bring in fixes for Cortex-A53 errata + build updates."
* commit '
281cc67b6ac794b1eb8232e6efca366d870dad43':
Bring in fixes for Cortex-A53 errata + build updates.
Stephen Hines [Fri, 17 Oct 2014 20:14:58 +0000 (20:14 +0000)]
Merge "Bring in fixes for Cortex-A53 errata + build updates."
Stephen Hines [Fri, 17 Oct 2014 15:47:43 +0000 (08:47 -0700)]
Bring in fixes for Cortex-A53 errata + build updates.
Bug:
18034609
Change-Id: I2cf0094eb9df801a84274ff29018431d75da89dd
Tim Murray [Wed, 15 Oct 2014 23:58:22 +0000 (23:58 +0000)]
am
b86aaa73: add ARM codegen for x86 LLVM if specified
* commit '
b86aaa733ce2042447857baf096ccc58b4ec430a':
add ARM codegen for x86 LLVM if specified
Tim Murray [Wed, 15 Oct 2014 21:05:57 +0000 (14:05 -0700)]
add ARM codegen for x86 LLVM if specified
bug
17765171
Change-Id: Id1135f5804d2738c7de5c264079e0a61d161f997
Stephen Hines [Wed, 1 Oct 2014 22:56:51 +0000 (22:56 +0000)]
am
f8e021ce: Undefined fseeko/ftello for Windows builds.
* commit '
f8e021ce4621688f8f57bf98302cba23f5d7e0f1':
Undefined fseeko/ftello for Windows builds.
Stephen Hines [Wed, 1 Oct 2014 22:56:50 +0000 (22:56 +0000)]
am
8a95734f: Fix windows build for LLVM.
* commit '
8a95734f9813e11664344a198af8c9203451e684':
Fix windows build for LLVM.
Stephen Hines [Tue, 30 Sep 2014 09:31:30 +0000 (02:31 -0700)]
Undefined fseeko/ftello for Windows builds.
Bug:
14416410
These are "defined" when building under mingw, so they can't be
used as identifiers in LLVM. Once we fix this in upstream, we can
pull the patch back and revert this one.
Change-Id: Ib576a9617ca685ab3625a2d2d66f652bcb7f2c3e
Stephen Hines [Tue, 30 Sep 2014 05:54:01 +0000 (22:54 -0700)]
Fix windows build for LLVM.
Don't include libcxx on windows.
Fix PSTR -> PCSTR typo in config header.
Bug:
14416410
Change-Id: I2e66ed56a5a585ab126b9ac181def057908289d0
Stephen Hines [Mon, 22 Sep 2014 22:23:18 +0000 (22:23 +0000)]
am
06d8c96f: Merge "Move libLLVMProfileData to llvm_post_static_libraries."
* commit '
06d8c96f9e7be298f0e1372ccb8dea18fe149afa':
Move libLLVMProfileData to llvm_post_static_libraries.
Stephen Hines [Mon, 22 Sep 2014 21:56:09 +0000 (21:56 +0000)]
Merge "Move libLLVMProfileData to llvm_post_static_libraries."
Tong Shen [Fri, 19 Sep 2014 18:59:15 +0000 (11:59 -0700)]
Move libLLVMProfileData to llvm_post_static_libraries.
This enables us to build libclang for target.
libClangCodeGen in libclang needs libLLVMProfileData.
Change-Id: I80fe903f9633877a4ac39325cdc9b023a5dfc149
Petar Jovanovic [Tue, 16 Sep 2014 18:02:26 +0000 (18:02 +0000)]
am
593a05ca: Add support for scalarizing cttz_zero_undef
* commit '
593a05ca1e177fc584cba399bf66fbf437ba75d9':
Add support for scalarizing cttz_zero_undef
Petar Jovanovic [Tue, 16 Sep 2014 18:02:25 +0000 (18:02 +0000)]
am
f06aaf11: Add support for scalarizing ctlz_zero_undef
* commit '
f06aaf11fff0e6fa12d4ee959569a263bf7bd779':
Add support for scalarizing ctlz_zero_undef
Petar Jovanovic [Sun, 10 Aug 2014 22:49:54 +0000 (22:49 +0000)]
Add support for scalarizing cttz_zero_undef
Follow up to r214266. Add missing case in ScalarizeVectorResult() for
cttz_zero_undef.
Differential Revision: http://reviews.llvm.org/D4813
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@215330
91177308-0d34-0410-b5e6-
96231b3b80d8
(cherry picked from commit
cddb0cfe383207ccec0cc797db401854e5f0c672)
Change-Id: I998526c9a9a77cb340c92ad6b292e7e5a9ba5767
Petar Jovanovic [Wed, 30 Jul 2014 00:44:03 +0000 (00:44 +0000)]
Add support for scalarizing ctlz_zero_undef
Fix the missing case in ScalarizeVectorResult() that was exposed with
libclcore.bc in Android.
Differential Revision: http://reviews.llvm.org/D4645
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@214266
91177308-0d34-0410-b5e6-
96231b3b80d8
(cherry picked from commit
63045274494a5adfedbd4de7280386948f7ca9b9)
Change-Id: I38fc81e0ceefd2cfdd65d7619a62124dc4ceac6f
Benjamin Kramer [Sun, 14 Sep 2014 22:09:13 +0000 (22:09 +0000)]
am
aa9f408c: Legalizer: Use the scalar bit width when promoting bit counting instrs on vectors.
* commit '
aa9f408cef5714fc0bc0ec61fa4016a3ba0a8c61':
Legalizer: Use the scalar bit width when promoting bit counting instrs on vectors.
Stephen Hines [Sun, 14 Sep 2014 21:54:10 +0000 (21:54 +0000)]
am
2e21ddcf: Merge "Legalizer: Use the scalar bit width when promoting bit counting instrs on vectors."
* commit '
2e21ddcfe28456df989b3efa720b151f9bb04cb2':
Legalizer: Use the scalar bit width when promoting bit counting instrs on vectors.
Benjamin Kramer [Fri, 12 Sep 2014 12:50:27 +0000 (12:50 +0000)]
Legalizer: Use the scalar bit width when promoting bit counting instrs on
vectors.
e.g. when promoting ctlz from <2 x i32> to <2 x i64> we have to fixup
the result by 32 bits, not 64. PR20917.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217671
91177308-0d34-0410-b5e6-
96231b3b80d8
Stephen Hines [Sun, 14 Sep 2014 21:28:36 +0000 (21:28 +0000)]
Merge "Legalizer: Use the scalar bit width when promoting bit counting instrs on vectors."
Benjamin Kramer [Fri, 12 Sep 2014 12:50:27 +0000 (12:50 +0000)]
Legalizer: Use the scalar bit width when promoting bit counting instrs on
vectors.
e.g. when promoting ctlz from <2 x i32> to <2 x i64> we have to fixup
the result by 32 bits, not 64. PR20917.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217671
91177308-0d34-0410-b5e6-
96231b3b80d8
Tim Murray [Thu, 4 Sep 2014 23:22:48 +0000 (23:22 +0000)]
am
fc712ff9: Merge "Revert "Add LOCAL_NO_FPIE to LLVM.""
* commit '
fc712ff963549bd41c8a0e344cbdd91f4a3e265c':
Revert "Add LOCAL_NO_FPIE to LLVM."
Tim Murray [Thu, 4 Sep 2014 22:34:55 +0000 (22:34 +0000)]
Merge "Revert "Add LOCAL_NO_FPIE to LLVM.""
Tim Murray [Thu, 4 Sep 2014 22:33:07 +0000 (15:33 -0700)]
Revert "Add LOCAL_NO_FPIE to LLVM."
This reverts commit
1263deef0437859a32bacac8d1068cb3a552af02.
moved to clang's android.mk instead
Tim Murray [Wed, 3 Sep 2014 23:07:45 +0000 (23:07 +0000)]
am
8a76b853: Merge "Add LOCAL_NO_FPIE to LLVM."
* commit '
8a76b85319c755653e808f6cc0979eb5bc68c69a':
Add LOCAL_NO_FPIE to LLVM.
Tim Murray [Wed, 3 Sep 2014 22:46:54 +0000 (22:46 +0000)]
Merge "Add LOCAL_NO_FPIE to LLVM."
Tim Murray [Wed, 3 Sep 2014 22:02:24 +0000 (15:02 -0700)]
Add LOCAL_NO_FPIE to LLVM.
This is primarily so we get all clang/LLVM tools built without
PIE.
bug
15814177
Change-Id: Ic5f877a62de5cff3c82354da5a2949565ff1b479
Stephen Hines [Thu, 28 Aug 2014 02:09:09 +0000 (02:09 +0000)]
am
c4fa175f: Merge "Add support for scalarizing cttz_zero_undef"
* commit '
c4fa175f2865ac9046c1396fd4f1d3eddd73b31b':
Add support for scalarizing cttz_zero_undef
Stephen Hines [Thu, 28 Aug 2014 02:09:08 +0000 (02:09 +0000)]
am
6530fbf5: Merge "Add support for scalarizing ctlz_zero_undef"
* commit '
6530fbf5e01b5563da6ba6ad7dffe387c640afae':
Add support for scalarizing ctlz_zero_undef
Stephen Hines [Thu, 28 Aug 2014 01:22:28 +0000 (01:22 +0000)]
Merge "Add support for scalarizing cttz_zero_undef"
Stephen Hines [Thu, 28 Aug 2014 01:22:12 +0000 (01:22 +0000)]
Merge "Add support for scalarizing ctlz_zero_undef"
Petar Jovanovic [Sun, 10 Aug 2014 22:49:54 +0000 (22:49 +0000)]
Add support for scalarizing cttz_zero_undef
Follow up to r214266. Add missing case in ScalarizeVectorResult() for
cttz_zero_undef.
Differential Revision: http://reviews.llvm.org/D4813
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@215330
91177308-0d34-0410-b5e6-
96231b3b80d8
Petar Jovanovic [Wed, 30 Jul 2014 00:44:03 +0000 (00:44 +0000)]
Add support for scalarizing ctlz_zero_undef
Fix the missing case in ScalarizeVectorResult() that was exposed with
libclcore.bc in Android.
Differential Revision: http://reviews.llvm.org/D4645
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@214266
91177308-0d34-0410-b5e6-
96231b3b80d8
Stephen Hines [Fri, 15 Aug 2014 00:36:54 +0000 (00:36 +0000)]
am
080fb918: Merge "Fix build of llvm-ar."
* commit '
080fb91868d9464ed7ed94b336dae6683b434098':
Fix build of llvm-ar.
Stephen Hines [Fri, 15 Aug 2014 00:26:57 +0000 (00:26 +0000)]
Merge "Fix build of llvm-ar."
Stephen Hines [Tue, 12 Aug 2014 23:07:11 +0000 (23:07 +0000)]
am
3b6d7c8f: Merge "Fixes the build when NDEBUG is not defined."
* commit '
3b6d7c8ffa4bedbe1c2ab1c4484815b3ec3dba04':
Fixes the build when NDEBUG is not defined.
Stephen Hines [Tue, 12 Aug 2014 22:55:49 +0000 (22:55 +0000)]
Merge "Fixes the build when NDEBUG is not defined."
Ying Wang [Fri, 8 Aug 2014 22:57:20 +0000 (22:57 +0000)]
am
ed033265: Exclude only modules with prebuilt in prebuilts/sdk.
* commit '
ed0332659297c141650bf13cdb515b378a7146cf':
Exclude only modules with prebuilt in prebuilts/sdk.
Ying Wang [Fri, 1 Aug 2014 21:11:37 +0000 (14:11 -0700)]
Exclude only modules with prebuilt in prebuilts/sdk.
So we can do tapas build in full platform source tree.
Change-Id: I95d2b8bc569f6d19130f45c78915b4a48cdee3a6
(cherry picked from commit
689012a3e1b656ee6fffa3a4eb007bee9a55f404)
Stephen Hines [Fri, 25 Jul 2014 21:06:57 +0000 (21:06 +0000)]
am
0e7612c1: Fix build rules for BuildVariables.inc in llvm-config.
* commit '
0e7612c18f67b96f3a235cf5e444974106b045d5':
Fix build rules for BuildVariables.inc in llvm-config.
Stephen Hines [Fri, 25 Jul 2014 21:04:33 +0000 (14:04 -0700)]
resolved conflicts for merge of
cd81d943 to lmp-dev-plus-aosp
Change-Id: Icae8c23ceee4647dcde679b9403cf0c990e634cc
Stephen Hines [Fri, 25 Jul 2014 08:23:30 +0000 (01:23 -0700)]
Fix build of llvm-ar.
Bug:
15433215
llvm-ar was accidentally including static libraries and libLLVM dynamically,
leading to redefined options.
Change-Id: If1f05ff68a3c88580b9ff1981937e8d2cf99ee02
Stephen Hines [Sat, 19 Jul 2014 10:44:24 +0000 (03:44 -0700)]
Fix build rules for BuildVariables.inc in llvm-config.
Our previous rules didn't actually construct this file in the appropriate
location. It instead was creating it inside of the source tree. We now
use a custom build rule to create the proper file and include it from an
intermediate build object directory.
Change-Id: I571387a647e95e2053fc2520bcb8151cbaec422e
Stephen Hines [Mon, 21 Jul 2014 07:45:20 +0000 (00:45 -0700)]
Update LLVM for rebase to r212749.
Includes a cherry-pick of:
r212948 - fixes a small issue with atomic calls
Change-Id: Ib97bd980b59f18142a69506400911a6009d9df18
Stephen Hines [Thu, 24 Jul 2014 02:32:30 +0000 (02:32 +0000)]
am
c4c1f81a: Merge "Fix build rules for BuildVariables.inc in llvm-config."
* commit '
c4c1f81ae1b07138df50e0459631abf3082bda9c':
Fix build rules for BuildVariables.inc in llvm-config.
Stephen Hines [Thu, 24 Jul 2014 02:32:26 +0000 (02:32 +0000)]
am
e0dc531c: Merge "Update LLVM for rebase to r212749."
* commit '
e0dc531c0d840f6f3118a71f6e53ebb82a3be22c':
Update LLVM for rebase to r212749.
Stephen Hines [Thu, 24 Jul 2014 02:15:21 +0000 (02:15 +0000)]
Merge "Fix build rules for BuildVariables.inc in llvm-config."
Stephen Hines [Thu, 24 Jul 2014 02:15:15 +0000 (02:15 +0000)]
Merge "Update LLVM for rebase to r212749."
Stephen Hines [Sat, 19 Jul 2014 10:44:24 +0000 (03:44 -0700)]
Fix build rules for BuildVariables.inc in llvm-config.
Our previous rules didn't actually construct this file in the appropriate
location. It instead was creating it inside of the source tree. We now
use a custom build rule to create the proper file and include it from an
intermediate build object directory.
Change-Id: I571387a647e95e2053fc2520bcb8151cbaec422e
Stephen Hines [Mon, 21 Jul 2014 07:45:20 +0000 (00:45 -0700)]
Update LLVM for rebase to r212749.
Includes a cherry-pick of:
r212948 - fixes a small issue with atomic calls
Change-Id: Ib97bd980b59f18142a69506400911a6009d9df18
Dan Albert [Sun, 20 Jul 2014 05:44:19 +0000 (22:44 -0700)]
Fixes the build when NDEBUG is not defined.
Symbols from the added file are needed in the Debug() block on line 927
of lib/ExecutionEngine/JIT/JITEmitter.cpp.
Change-Id: I17a02b8f26066232cc9b5d60bdd683a566a955a5
Stephen Hines [Mon, 9 Jun 2014 17:00:55 +0000 (17:00 +0000)]
am
0d041145: am
19c6fbb3: Merge "Adds the ability to run the llvm test suite in-tree."
* commit '
0d041145196fef243311f50b9bf388c1a5263417':
Adds the ability to run the llvm test suite in-tree.
Stephen Hines [Mon, 9 Jun 2014 16:56:50 +0000 (16:56 +0000)]
am
19c6fbb3: Merge "Adds the ability to run the llvm test suite in-tree."
* commit '
19c6fbb3e8aaf74093afa08013134b61fa08f245':
Adds the ability to run the llvm test suite in-tree.
Stephen Hines [Mon, 9 Jun 2014 16:49:54 +0000 (16:49 +0000)]
Merge "Adds the ability to run the llvm test suite in-tree."