diff options
| author | Vladimir Marko <vmarko@google.com> | 2017-05-16 10:31:41 +0100 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2017-05-16 15:08:55 +0100 |
| commit | 764d454d1d51448deb81f6e8d2d7d317c7f4d1b4 (patch) | |
| tree | 029f9e65cfe7e953df55b7af45e099924ffdbbac /compiler/optimizing/code_generator_x86.h | |
| parent | 7974468d32b817be1d49dfcf513605f646c481bc (diff) | |
| download | art-764d454d1d51448deb81f6e8d2d7d317c7f4d1b4.tar.gz art-764d454d1d51448deb81f6e8d2d7d317c7f4d1b4.tar.bz2 art-764d454d1d51448deb81f6e8d2d7d317c7f4d1b4.zip | |
Remove LoadString/Class kind kBootImageLinkTimeAddress.
We no longer support non-PIC boot image compilation.
Also clean up some obsolete code for method patches
and make JIT correctly report itself as non-PIC.
Test: testrunner.py --host
Test: testrunner.py --target
Bug: 33192586
Change-Id: I593289c5c1b0e88b82b86a933038be97bbb15ad2
Diffstat (limited to 'compiler/optimizing/code_generator_x86.h')
| -rw-r--r-- | compiler/optimizing/code_generator_x86.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/code_generator_x86.h b/compiler/optimizing/code_generator_x86.h index ca3a9eadd2..f08d642f5e 100644 --- a/compiler/optimizing/code_generator_x86.h +++ b/compiler/optimizing/code_generator_x86.h @@ -633,9 +633,9 @@ class CodeGeneratorX86 : public CodeGenerator { // PC-relative DexCache access info. ArenaDeque<X86PcRelativePatchInfo> pc_relative_dex_cache_patches_; - // String patch locations; type depends on configuration (app .bss or boot image PIC/non-PIC). + // String patch locations; type depends on configuration (app .bss or boot image). ArenaDeque<X86PcRelativePatchInfo> string_patches_; - // Type patch locations for boot image; type depends on configuration (boot image PIC/non-PIC). + // PC-relative type patch info for kBootImageLinkTimePcRelative. ArenaDeque<X86PcRelativePatchInfo> boot_image_type_patches_; // Type patch locations for kBssEntry. ArenaDeque<X86PcRelativePatchInfo> type_bss_entry_patches_; |