diff options
| author | simonb <simonb@chromium.org> | 2014-11-12 11:15:34 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-12 19:15:49 +0000 |
| commit | d6ffc1d773c7c9f15d244eec80ecc4a1492da6a3 (patch) | |
| tree | a987f8ac162c77ed7b4349998a9256119d8b8fd7 /third_party/android_crazy_linker | |
| parent | 0d5560df23c0230dc738da1e2f838078848bfcc4 (diff) | |
| download | chromium_src-d6ffc1d773c7c9f15d244eec80ecc4a1492da6a3.zip chromium_src-d6ffc1d773c7c9f15d244eec80ecc4a1492da6a3.tar.gz chromium_src-d6ffc1d773c7c9f15d244eec80ecc4a1492da6a3.tar.bz2 | |
Fix -Wreorder warning.
Fixes:
.../src/crazy_linker_elf_loader.h: In constructor 'crazy::ElfLoader::ElfLoader(bool)':
.../src/crazy_linker_elf_loader.h:80:20: error: 'crazy::ElfLoader::loaded_phdr_' will be initialized after [-Werror=reorder]
.../src/crazy_linker_elf_loader.h:74:14: error: 'bool const crazy::ElfLoader::no_map_exec_support_fallback_enabled_' [-Werror=reorder]
.../src/crazy_linker_elf_loader.cpp:24:1: error: when initialized here [-Werror=reorder]
BUG=398425,390618
Review URL: https://codereview.chromium.org/719713003
Cr-Commit-Position: refs/heads/master@{#303867}
Diffstat (limited to 'third_party/android_crazy_linker')
| -rw-r--r-- | third_party/android_crazy_linker/README.chromium | 3 | ||||
| -rw-r--r-- | third_party/android_crazy_linker/src/src/crazy_linker_elf_loader.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/third_party/android_crazy_linker/README.chromium b/third_party/android_crazy_linker/README.chromium index 4892262..7e999a8 100644 --- a/third_party/android_crazy_linker/README.chromium +++ b/third_party/android_crazy_linker/README.chromium @@ -59,3 +59,6 @@ Local Modifications: - Add method for enabling/disabling the memory fallback (disabled by default). - Add a check whether file is uncompressed in zip file. + +- Fix -Wreorder warning (error with -Werror) in class ElfLoader. + diff --git a/third_party/android_crazy_linker/src/src/crazy_linker_elf_loader.h b/third_party/android_crazy_linker/src/src/crazy_linker_elf_loader.h index 76b0b82..1fdd7f3 100644 --- a/third_party/android_crazy_linker/src/src/crazy_linker_elf_loader.h +++ b/third_party/android_crazy_linker/src/src/crazy_linker_elf_loader.h @@ -71,14 +71,14 @@ class ElfLoader { // values in the library to get the corresponding // memory address. + const ELF::Phdr* loaded_phdr_; // points to the loaded program header. + const bool no_map_exec_support_fallback_enabled_; // Whether the fallback due // to lack of support for // mapping the APK file // with executable // permission is enabled. - const ELF::Phdr* loaded_phdr_; // points to the loaded program header. - // Individual steps used by ::LoadAt() bool ReadElfHeader(Error* error); bool ReadProgramHeader(Error* error); |