diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2016-10-26 18:18:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-26 18:18:00 +0000 |
| commit | ba47b648ad19bdde3642af3e0b6e948a231ef322 (patch) | |
| tree | 96065537ae52025d8bdf72941c0ae7440d804651 | |
| parent | c89d3b55b83c02831d8a6b86948fd0c12db0e291 (diff) | |
| parent | 22d0367e7211b688f3174e27022e89a7ffe615d6 (diff) | |
| download | clang-ba47b648ad19bdde3642af3e0b6e948a231ef322.tar.gz | |
Re-apply local patch dropped during 'git merge' am: 77f300250d am: c092360956 am: 404f959bed
am: 22d0367e72
Change-Id: I9fc030fc36099cec6e97a2fec5334537ea26abb4
| -rw-r--r-- | lib/CodeGen/TargetInfo.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp index 412bd98390..efa5639784 100644 --- a/lib/CodeGen/TargetInfo.cpp +++ b/lib/CodeGen/TargetInfo.cpp @@ -183,7 +183,10 @@ const TargetInfo &ABIInfo::getTarget() const { return CGT.getTarget(); } -bool ABIInfo:: isAndroid() const { return getTarget().getTriple().isAndroid(); } +bool ABIInfo:: isAndroid() const { + return getTarget().getTriple().isAndroid() || + getContext().getLangOpts().RenderScript; +} bool ABIInfo::isHomogeneousAggregateBaseType(QualType Ty) const { return false; |