diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2016-09-19 22:57:26 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2016-10-24 23:58:47 -0700 |
| commit | de2d8694e25a814696358e95141f4b1aa4d8847e (patch) | |
| tree | c7d38f5bcbb5cac2908ca83704d58b1d7af72752 /lib/Target/WebAssembly/WebAssemblyTargetMachine.h | |
| parent | da112fc9f478e25fc27ede821e85a18687adfbdf (diff) | |
| download | llvm-de2d8694e25a814696358e95141f4b1aa4d8847e.tar.gz | |
Update aosp/master LLVM for rebase to r275480
Bug: http://b/31320715
This merges commit 7dcf7f03e005379ef2f06db96aa93f06186b66d5 from
aosp/dev.
Test: Build AOSP and run RenderScript tests (host tests for slang and
libbcc, RsTest, CTS)
Change-Id: Iaf3738f74312d875e69f61d604ac058f381a2a1a
Diffstat (limited to 'lib/Target/WebAssembly/WebAssemblyTargetMachine.h')
| -rw-r--r-- | lib/Target/WebAssembly/WebAssemblyTargetMachine.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Target/WebAssembly/WebAssemblyTargetMachine.h b/lib/Target/WebAssembly/WebAssemblyTargetMachine.h index 3226edcdc614..52a2ef78736a 100644 --- a/lib/Target/WebAssembly/WebAssemblyTargetMachine.h +++ b/lib/Target/WebAssembly/WebAssemblyTargetMachine.h @@ -28,7 +28,7 @@ class WebAssemblyTargetMachine final : public LLVMTargetMachine { public: WebAssemblyTargetMachine(const Target &T, const Triple &TT, StringRef CPU, StringRef FS, const TargetOptions &Options, - Reloc::Model RM, CodeModel::Model CM, + Optional<Reloc::Model> RM, CodeModel::Model CM, CodeGenOpt::Level OL); ~WebAssemblyTargetMachine() override; @@ -44,6 +44,8 @@ public: /// \brief Get the TargetIRAnalysis for this target. TargetIRAnalysis getTargetIRAnalysis() override; + + bool usesPhysRegsForPEI() const override { return false; } }; } // end namespace llvm |