diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2016-09-19 22:19:55 -0700 |
|---|---|---|
| committer | Pirama Arumuga Nainar <pirama@google.com> | 2016-10-06 21:01:10 -0700 |
| commit | 4967a710c84587c654b56c828382219c3937dacb (patch) | |
| tree | ae0d585998e15fc175ca3e9146b21e53f290624b /unittests/CodeGen | |
| parent | d27d7495bf70da4faffda3d8083396e0e07f2931 (diff) | |
| download | clang-4967a710c84587c654b56c828382219c3937dacb.tar.gz | |
Update aosp/master Clang for rebase to r275480
Bug: http://b/31320715
This merges commit ac9cc4764cf47a6c3f031687d8592e080c9f5001 from
aosp/dev.
Test: Build AOSP and run RenderScript tests (host tests for slang and
libbcc, RsTest, CTS)
Change-Id: Ic2875e5c3673c83448cd7d1013861e42947b1b55
Diffstat (limited to 'unittests/CodeGen')
| -rw-r--r-- | unittests/CodeGen/BufferSourceTest.cpp | 3 | ||||
| -rw-r--r-- | unittests/CodeGen/Makefile | 20 |
2 files changed, 2 insertions, 21 deletions
diff --git a/unittests/CodeGen/BufferSourceTest.cpp b/unittests/CodeGen/BufferSourceTest.cpp index 85df768aa1..1934e66138 100644 --- a/unittests/CodeGen/BufferSourceTest.cpp +++ b/unittests/CodeGen/BufferSourceTest.cpp @@ -39,6 +39,7 @@ const char TestProgram[] = "EmitCXXGlobalInitFunc test; "; TEST(BufferSourceTest, EmitCXXGlobalInitFunc) { + LLVMContext Context; CompilerInstance compiler; compiler.createDiagnostics(); @@ -65,7 +66,7 @@ TEST(BufferSourceTest, EmitCXXGlobalInitFunc) { compiler.getHeaderSearchOpts(), compiler.getPreprocessorOpts(), compiler.getCodeGenOpts(), - llvm::getGlobalContext()))); + Context))); compiler.createSema(clang::TU_Prefix, nullptr); diff --git a/unittests/CodeGen/Makefile b/unittests/CodeGen/Makefile deleted file mode 100644 index de347e1afd..0000000000 --- a/unittests/CodeGen/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -##===- unittests/CodeGen/Makefile --------------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -CLANG_LEVEL = ../.. -TESTNAME = CodeGen -include $(CLANG_LEVEL)/../../Makefile.config -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader mc option \ - profiledata support -USEDLIBS = clangCodeGen.a clangFrontend.a clangSerialization.a \ - clangDriver.a \ - clangParse.a clangSema.a clangAnalysis.a \ - clangEdit.a clangAST.a clangLex.a clangBasic.a - -include $(CLANG_LEVEL)/unittests/Makefile |