diff options
| author | 2015-08-18 18:14:12 +0000 | |
|---|---|---|
| committer | 2015-08-18 18:14:12 +0000 | |
| commit | edd0a6dbe26bb334f02d5abe649e3da9165277b2 (patch) | |
| tree | f543dc4a884b2d11760e8c316276c9a5737e06c6 | |
| parent | fc5b096fcddb0ddb2d01e2b28e86ed5a02d37b2e (diff) | |
| parent | 6e9cc3912b07d21ced1278eafdd213bc87b25635 (diff) | |
Merge "Fix some global constructors and destructors"
| -rw-r--r-- | runtime/elf.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/elf.h b/runtime/elf.h index 4514bb2688..d1efc92c30 100644 --- a/runtime/elf.h +++ b/runtime/elf.h @@ -42,7 +42,7 @@ typedef uint64_t Elf64_Xword; typedef int64_t Elf64_Sxword; // Object file magic string. -static const char ElfMagic[] = { 0x7f, 'E', 'L', 'F', '\0' }; +static constexpr char ElfMagic[] = { 0x7f, 'E', 'L', 'F', '\0' }; // e_ident size and indices. enum { @@ -60,10 +60,10 @@ enum { }; // BEGIN android-added for <elf.h> compat -const char ELFMAG0 = ElfMagic[EI_MAG0]; -const char ELFMAG1 = ElfMagic[EI_MAG1]; -const char ELFMAG2 = ElfMagic[EI_MAG2]; -const char ELFMAG3 = ElfMagic[EI_MAG3]; +constexpr char ELFMAG0 = ElfMagic[EI_MAG0]; +constexpr char ELFMAG1 = ElfMagic[EI_MAG1]; +constexpr char ELFMAG2 = ElfMagic[EI_MAG2]; +constexpr char ELFMAG3 = ElfMagic[EI_MAG3]; // END android-added for <elf.h> compat struct Elf32_Ehdr { |