diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-01 09:16:49 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-03-01 09:16:49 -0800 |
| commit | 3d504075f7c1204d581923460754bf6d3714b13f (patch) | |
| tree | e095ee11d308f264b3dfb9f4c510f14fe6b1259c /compiler/elf_writer_mclinker.h | |
| parent | e4a74a6ac8d1486b1227504044a60002e69a9fec (diff) | |
| download | art-3d504075f7c1204d581923460754bf6d3714b13f.tar.gz art-3d504075f7c1204d581923460754bf6d3714b13f.tar.bz2 art-3d504075f7c1204d581923460754bf6d3714b13f.zip | |
Make out arguments non-reference types.
Also, tidy some portable related code.
Change-Id: I67c8aa52eef8b556ca117ecda1b1e75465ba06a5
Diffstat (limited to 'compiler/elf_writer_mclinker.h')
| -rw-r--r-- | compiler/elf_writer_mclinker.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/compiler/elf_writer_mclinker.h b/compiler/elf_writer_mclinker.h index 8ee7231f79..13757edecd 100644 --- a/compiler/elf_writer_mclinker.h +++ b/compiler/elf_writer_mclinker.h @@ -37,11 +37,11 @@ namespace art { class CompiledCode; -class ElfWriterMclinker : public ElfWriter { +class ElfWriterMclinker FINAL : public ElfWriter { public: // Write an ELF file. Returns true on success, false on failure. static bool Create(File* file, - OatWriter& oat_writer, + OatWriter* oat_writer, const std::vector<const DexFile*>& dex_files, const std::string& android_root, bool is_host, @@ -49,10 +49,11 @@ class ElfWriterMclinker : public ElfWriter { SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); protected: - virtual bool Write(OatWriter& oat_writer, - const std::vector<const DexFile*>& dex_files, - const std::string& android_root, - bool is_host) + bool Write(OatWriter* oat_writer, + const std::vector<const DexFile*>& dex_files, + const std::string& android_root, + bool is_host) + OVERRIDE SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); private: @@ -65,13 +66,11 @@ class ElfWriterMclinker : public ElfWriter { void AddCompiledCodeInput(const CompiledCode& compiled_code); void AddRuntimeInputs(const std::string& android_root, bool is_host); bool Link(); -#if defined(ART_USE_PORTABLE_COMPILER) void FixupOatMethodOffsets(const std::vector<const DexFile*>& dex_files) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); uint32_t FixupCompiledCodeOffset(ElfFile& elf_file, - ::llvm::ELF::Elf32_Addr oatdata_address, + uint32_t oatdata_address, const CompiledCode& compiled_code); -#endif // Setup by Init() UniquePtr<mcld::LinkerConfig> linker_config_; |