diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2016-12-07 21:13:27 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2016-12-07 21:13:27 +0000 |
| commit | d4db0b374840a6cd9ab2b0d96e7c1f6e41ec3f12 (patch) | |
| tree | 53a81ebec4715af3730f58ebf95cacf2343d6bf1 | |
| parent | 25ec226dfc5f76a9e84a277e444ba4641dd0b889 (diff) | |
| download | bcm5719-llvm-d4db0b374840a6cd9ab2b0d96e7c1f6e41ec3f12.tar.gz bcm5719-llvm-d4db0b374840a6cd9ab2b0d96e7c1f6e41ec3f12.zip | |
Rename MaxPageSize to DefaultMaxPageSize to avoid confusion.
Thanks to Rui for the suggestion.
llvm-svn: 288982
| -rw-r--r-- | lld/ELF/Driver.cpp | 2 | ||||
| -rw-r--r-- | lld/ELF/Target.cpp | 6 | ||||
| -rw-r--r-- | lld/ELF/Target.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index 4a97ea51b6a..6afaf77ceb8 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -762,7 +762,7 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &Args) { // Initialize Config->MaxPageSize. The default value is defined by // each target. Config->MaxPageSize = - getZOptionValue(Args, "max-page-size", Target->MaxPageSize); + getZOptionValue(Args, "max-page-size", Target->DefaultMaxPageSize); if (!isPowerOf2_64(Config->MaxPageSize)) error("max-page-size: value isn't a power of 2"); diff --git a/lld/ELF/Target.cpp b/lld/ELF/Target.cpp index b4a20e14149..4c12d78e8fa 100644 --- a/lld/ELF/Target.cpp +++ b/lld/ELF/Target.cpp @@ -1020,7 +1020,7 @@ PPC64TargetInfo::PPC64TargetInfo() { // We need 64K pages (at least under glibc/Linux, the loader won't // set different permissions on a finer granularity than that). - MaxPageSize = 65536; + DefaultMaxPageSize = 65536; // The PPC64 ELF ABI v1 spec, says: // @@ -1190,7 +1190,7 @@ AArch64TargetInfo::AArch64TargetInfo() { GotPltEntrySize = 8; PltEntrySize = 16; PltHeaderSize = 32; - MaxPageSize = 65536; + DefaultMaxPageSize = 65536; // It doesn't seem to be documented anywhere, but tls on aarch64 uses variant // 1 of the tls structures and the tcb size is 16. @@ -1932,7 +1932,7 @@ bool ARMTargetInfo::isTlsInitialExecRel(uint32_t Type) const { template <class ELFT> MipsTargetInfo<ELFT>::MipsTargetInfo() { GotPltHeaderEntriesNum = 2; - MaxPageSize = 65536; + DefaultMaxPageSize = 65536; GotEntrySize = sizeof(typename ELFT::uint); GotPltEntrySize = sizeof(typename ELFT::uint); PltEntrySize = 16; diff --git a/lld/ELF/Target.h b/lld/ELF/Target.h index 9e995ede6fb..c393b7261f8 100644 --- a/lld/ELF/Target.h +++ b/lld/ELF/Target.h @@ -63,7 +63,7 @@ public: unsigned TlsGdRelaxSkip = 1; unsigned PageSize = 4096; - unsigned MaxPageSize = 4096; + unsigned DefaultMaxPageSize = 4096; // On FreeBSD x86_64 the first page cannot be mmaped. // On Linux that is controled by vm.mmap_min_addr. At least on some x86_64 |
