diff options
| author | James Henderson <jh7370@my.bristol.ac.uk> | 2017-04-06 15:22:58 +0000 |
|---|---|---|
| committer | James Henderson <jh7370@my.bristol.ac.uk> | 2017-04-06 15:22:58 +0000 |
| commit | d9831807789a6b5d0b61a850fa8f01572b05a7c0 (patch) | |
| tree | 4e43619661a141ef94cbfed6b2d16298a7ef24ef /lld/ELF/LinkerScript.cpp | |
| parent | 9fa169601f3cf42a32305ecf26024fc9c149c98c (diff) | |
| download | bcm5719-llvm-d9831807789a6b5d0b61a850fa8f01572b05a7c0.tar.gz bcm5719-llvm-d9831807789a6b5d0b61a850fa8f01572b05a7c0.zip | |
Revert r299635 because it exposed a latent bug.
llvm-svn: 299655
Diffstat (limited to 'lld/ELF/LinkerScript.cpp')
| -rw-r--r-- | lld/ELF/LinkerScript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp index e5076be283d..9e39a5de32e 100644 --- a/lld/ELF/LinkerScript.cpp +++ b/lld/ELF/LinkerScript.cpp @@ -862,12 +862,12 @@ bool LinkerScript::ignoreInterpSection() { return true; } -Optional<uint32_t> LinkerScript::getFiller(StringRef Name) { +uint32_t LinkerScript::getFiller(StringRef Name) { for (BaseCommand *Base : Opt.Commands) if (auto *Cmd = dyn_cast<OutputSectionCommand>(Base)) if (Cmd->Name == Name) return Cmd->Filler; - return None; + return 0; } static void writeInt(uint8_t *Buf, uint64_t Data, uint64_t Size) { |
