aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Update aosp/master llvm for rebase to r233350"Pirama Arumuga Nainar2015-04-106817-117534/+152810
|\
| * Update aosp/master llvm for rebase to r233350Pirama Arumuga Nainar2015-04-096817-117534/+152810
|/ | | | Change-Id: I07d935f8793ee8ec6b7da003f6483046594bca49
* Merge "Take HOST_PREFER_32_BIT into account"Colin Cross2015-04-081-0/+4
|\
| * Take HOST_PREFER_32_BIT into accountColin Cross2015-04-081-0/+4
| | | | | | | | | | | | | | LLVM modules should compile for 64-bit for the host, except when HOST_PREFER_32_BIT is set. Change-Id: I8179df10b929ce1cc655e097814fa50ca0c3c43e
* | Merge "Set LOCAL_MULTLIB := first for all LLVM host builds"Colin Cross2015-04-081-0/+2
|\ \ | |/
| * Set LOCAL_MULTLIB := first for all LLVM host buildsColin Cross2015-04-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default multlib setting for host libraries is going to change from "both" to "first". This breaks LLVM host compiles on 64-bit when FORCE_BUILD_LLVM_COMPONENTS, because LLVMHello tries to compile for both 64-bit and 32-bit, the 32-bit version tries to link against 32-bit libLLVM, but prebuilts/sdk/tools/* only provides a 64-bit version of libLLVM.so. When compiling for a 32-bit host we always set FORCE_BUILD_LLVM_COMPONENTS=true, so the easy fix is to force 64-bit host builds to only build LLVM components for 64-bit by setting LOCAL_MULTILIB := first in llvm-host-build.mk. Change-Id: Ia17c045649b59b90bdc06d4cbe03f2542bf42371
* | Merge "Update lit.site.cfg to be able to run LLVM tests properly again."Stephen Hines2015-04-024-1/+73
|\ \
| * | Update lit.site.cfg to be able to run LLVM tests properly again.Stephen Hines2015-04-024-1/+73
|/ / | | | | | | | | | | | | | | | | | | | | | | Bug: 15433215 Add support for building llvm-dsymutil. Add support for building llvm-pdbdump. We still have 4 unexpected failures to track down with the Android build/run of these tests. These are all related to module loading support. Change-Id: Ibd39cbd2c0ee232a0df23a414d491420493ea94a
* | Merge "Update aosp/master LLVM for rebase to r230699."Stephen Hines2015-04-014970-116913/+282029
|\ \ | |/ |/|
| * Update aosp/master LLVM for rebase to r230699.Stephen Hines2015-03-234970-116913/+282029
| | | | | | | | Change-Id: I2b5be30509658cb8266be782de0ab24f9099f9b9
* | Merge "Remove uses of libcxx.mk."Dan Albert2015-03-272-4/+0
|\ \ | |/ |/|
| * Remove uses of libcxx.mk.Dan Albert2015-03-272-4/+0
|/ | | | | | This is a no-op. Change-Id: I5dc6a2a5a0e0f7e34a0ae26566798daa085ce8f2
* Merge "Add NOTICE file"Conley Owens2015-03-181-0/+70
|\
| * Add NOTICE fileConley Owens2015-03-121-0/+70
|/ | | | Change-Id: I4794bc70b088df4bb417e2fd980e363b2becb52b
* am 22cea81c: Merge "Revert "Add -fno-inline to LLVM device flags.""Stephen Hines2015-01-291-4/+0
|\ | | | | | | | | * commit '22cea81c7ab789adf765705c89bc49cdba1a4fe6': Revert "Add -fno-inline to LLVM device flags."
| * Merge "Revert "Add -fno-inline to LLVM device flags.""Stephen Hines2015-01-291-4/+0
| |\
| | * Revert "Add -fno-inline to LLVM device flags."Stephen Hines2015-01-211-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 666dcadba6e445a06085ee785721bab99a01a226. Bug: 18808781 Change-Id: I222968a99bdafe2368c97d1602081bbcdff70ed0
* | | am e5656de2: Merge "MISched: Fix moving stores across barriers"Stephen Hines2015-01-292-6/+49
|\ \ \ | |/ / | | | | | | | | | * commit 'e5656de27822209f895cc8d3524f74c6f9f9afcb': MISched: Fix moving stores across barriers
| * | Merge "MISched: Fix moving stores across barriers"Stephen Hines2015-01-292-6/+49
| |\ \ | | |/
| | * MISched: Fix moving stores across barriersTom Stellard2015-01-212-6/+49
| |/ | | | | | | | | | | | | | | This fixes an issue with ScheduleDAGInstrs::buildSchedGraph where stores without an underlying object would not be added as a predecessor to the current BarrierChain. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223717 91177308-0d34-0410-b5e6-96231b3b80d8
* | am 5a622b72: Merge "Pass LSAN_OPTIONS down so that it is possible to add ↵Dan Albert2015-01-091-1/+2
|\ \ | |/ | | | | | | | | | | suppressions." * commit '5a622b72ff719e56da5e4384343c08305152e83e': Pass LSAN_OPTIONS down so that it is possible to add suppressions.
| * Merge "Pass LSAN_OPTIONS down so that it is possible to add suppressions."Dan Albert2015-01-081-1/+2
| |\
| | * Pass LSAN_OPTIONS down so that it is possible to add suppressions.Rafael Espindola2015-01-081-1/+2
| | | | | | | | | | | | | | | git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224777 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit 50c8c5686ec5fbae19d8ec72d46b228feb960862)
* | | am 51f06ecc: Merge "Split executeShTest into two parts so that it can be ↵Dan Albert2015-01-091-13/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | better leveraged by libc++" * commit '51f06ecc5d0f71448146f98905b1796ae88d28da': Split executeShTest into two parts so that it can be better leveraged by libc++
| * | Merge "Split executeShTest into two parts so that it can be better leveraged ↵Dan Albert2015-01-081-13/+18
| |\ \ | | |/ | | | | | | by libc++"
| | * Split executeShTest into two parts so that it can be better leveraged by libc++Eric Fiselier2015-01-081-13/+18
| | | | | | | | | | | | | | | git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224672 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit 2bea59bd02fe2a448314dfba205cd748a66ac6b9)
* | | am f41cd32a: Merge "[LIT] Add JSONMetricValue type to wrap types supported ↵Dan Albert2015-01-091-0/+36
|\ \ \ | |/ / | | | | | | | | | | | | | | | by the json encoder." * commit 'f41cd32af0994358ae9f3acca23c0354de5b3f0d': [LIT] Add JSONMetricValue type to wrap types supported by the json encoder.
| * | Merge "[LIT] Add JSONMetricValue type to wrap types supported by the json ↵Dan Albert2015-01-081-0/+36
| |\ \ | | |/ | | | | | | encoder."
| | * [LIT] Add JSONMetricValue type to wrap types supported by the json encoder.Eric Fiselier2015-01-081-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary: The following types can be encoded and decoded by the json library: `dict`, `list`, `tuple`, `str`, `unicode`, `int`, `long`, `float`, `bool`, `NoneType`. `JSONMetricValue` can be constructed with any of these types, and used as part of Test.Result. This patch also adds a toMetricValue function that converts a value into a MetricValue. Reviewers: ddunbar, EricWF Reviewed By: EricWF Subscribers: cfe-commits, llvm-commits Differential Revision: http://reviews.llvm.org/D6576 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224628 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit 74430387cd6b1d0e3f89b604f747fa53fc3315b3)
* | | am d74cfd3c: Merge "Now that we require a newer python, use the new ↵Dan Albert2015-01-091-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | exception syntax." * commit 'd74cfd3c1f507ab51b576e0d2ce80dc8906c2e8e': Now that we require a newer python, use the new exception syntax.
| * | Merge "Now that we require a newer python, use the new exception syntax."Dan Albert2015-01-081-1/+1
| |\ \ | | |/
| | * Now that we require a newer python, use the new exception syntax.Rafael Espindola2015-01-081-1/+1
| | | | | | | | | | | | | | | git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224130 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit fe6c7ee0f0e11a368d8c98db7e75d26c1c2b32e6)
* | | am f13bcf2b: Merge "Require python 2.7."Dan Albert2015-01-096-20/+18
|\ \ \ | |/ / | | | | | | | | | * commit 'f13bcf2b4eeafa087bd649070bd8ed0ded10eb2b': Require python 2.7.
| * | Merge "Require python 2.7."Dan Albert2015-01-086-20/+18
| |\ \ | | |/
| | * Require python 2.7.Rafael Espindola2015-01-086-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were already requiring 2.5, which meant that people on old linux distros had to upgrade anyway. Requiring python 2.6 will make supporting 3.X easier as we can use the 3.X exception syntax. According to the discussion on llvmdev, there is not much value is requiring just 2.6, we may as well just require 2.7. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224129 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit 708bc15ff07dc2fcee3a66988bfc5bc15b80eb5f)
* | | am 51e2fa82: Merge "[LIT] Add support for `UNSUPPORTED` tag to ↵Dan Albert2015-01-092-19/+29
|\ \ \ | |/ / | | | | | | | | | | | | | | | `TestRunner.parseIntegratedTestScript`" * commit '51e2fa825ba84f67cebe4c3d1c93bd2f94fb1318': [LIT] Add support for `UNSUPPORTED` tag to `TestRunner.parseIntegratedTestScript`
| * | Merge "[LIT] Add support for `UNSUPPORTED` tag to ↵Dan Albert2015-01-082-19/+29
| |\ \ | | |/ | | | | | | `TestRunner.parseIntegratedTestScript`"
| | * [LIT] Add support for `UNSUPPORTED` tag to ↵Eric Fiselier2015-01-082-19/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `TestRunner.parseIntegratedTestScript` Summary: This patch gives me just enough to leverage the existing functionality in `TestRunner` for use in `libc++` and `libc++abi` . It does the following: * Adds the `UNSUPPORTED` tag to `TestRunner.parseIntegratedTestScript`. * Allows `parseIntegratedTestScript` to return an empty script if a script is not required by the caller. Reviewers: ddunbar, EricWF Reviewed By: EricWF Subscribers: cfe-commits, llvm-commits Differential Revision: http://reviews.llvm.org/D6589 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223915 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit bd112609813171fad2eeb4ad5f7a9cd95fc78b2e)
* | | am 70fd1f24: Merge "lit: Don\'t use python 2.6 features"Dan Albert2015-01-091-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '70fd1f24656a2a0f9ea114b4a780fe5d381de68d': lit: Don't use python 2.6 features
| * | Merge "lit: Don't use python 2.6 features"Dan Albert2015-01-081-1/+1
| |\ \ | | |/
| | * lit: Don't use python 2.6 featuresDavid Majnemer2015-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | LLVM supports python 2.5, this fixes a (somewhat) recent regression. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223626 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit 726bd4160263609011b3a8168bde045203fd021b)
* | | am a3c7e9e1: Merge "Fix for xunit output to work around issue in Jenkins ↵Dan Albert2015-01-091-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | when tests are at the root level" * commit 'a3c7e9e11ece48c38dec9d9c645c24c608e62494': Fix for xunit output to work around issue in Jenkins when tests are at the root level
| * | Merge "Fix for xunit output to work around issue in Jenkins when tests are ↵Dan Albert2015-01-081-1/+1
| |\ \ | | |/ | | | | | | at the root level"
| | * Fix for xunit output to work around issue in Jenkins when tests are at the ↵Chris Matthews2015-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | root level git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223562 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit ab1837aef3d93a0bf2294aeaeb488c62e3d45535)
* | | am 04092cf9: Merge "Fix corner cases in lit xunit for paths with dots"Dan Albert2015-01-091-2/+9
|\ \ \ | |/ / | | | | | | | | | * commit '04092cf98d875585f3b6ece0b7e71f2b3a2d3b97': Fix corner cases in lit xunit for paths with dots
| * | Merge "Fix corner cases in lit xunit for paths with dots"Dan Albert2015-01-081-2/+9
| |\ \ | | |/
| | * Fix corner cases in lit xunit for paths with dotsChris Matthews2015-01-081-2/+9
| | | | | | | | | | | | | | | git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223549 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit 689f10d1b56f68fafd999debc86e0b58d2d5de80)
* | | am 2ee64e38: Merge "Add a test-case for lit xunit output"Dan Albert2015-01-091-0/+10
|\ \ \ | |/ / | | | | | | | | | * commit '2ee64e38ab63e8d94fcdbceba954b35c605bd83e': Add a test-case for lit xunit output
| * | Merge "Add a test-case for lit xunit output"Dan Albert2015-01-081-0/+10
| |\ \ | | |/
| | * Add a test-case for lit xunit outputChris Matthews2015-01-081-0/+10
| | | | | | | | | | | | | | | git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223307 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit 0baca9564c9df7b06645f71abdda0fe3090f46a6)