Skip to content

Commit ed5bb93

Browse files
committedSep 26, 2018
Allow later -z name=<int> args to override earlier args
Summary: lld already gives later -z options precedence in getZFlag(). This matches the behavior of ld.bfd and ld.gold, where later options override earlier ones. (I tested with -z max-page-size and -z stack-size.) Reviewers: ruiu, espindola, grimar Reviewed By: ruiu, grimar Subscribers: grimar, emaste, arichardson, llvm-commits Differential Revision: https://reviews.llvm.org/D52526 llvm-svn: 343145
1 parent b7c8d2d commit ed5bb93

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed
 

‎lld/Common/Args.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ std::vector<StringRef> lld::args::getStrings(opt::InputArgList &Args, int Id) {
4141

4242
uint64_t lld::args::getZOptionValue(opt::InputArgList &Args, int Id,
4343
StringRef Key, uint64_t Default) {
44-
for (auto *Arg : Args.filtered(Id)) {
44+
for (auto *Arg : Args.filtered_reverse(Id)) {
4545
std::pair<StringRef, StringRef> KV = StringRef(Arg->getValue()).split('=');
4646
if (KV.first == Key) {
4747
uint64_t Result = Default;

‎lld/test/ELF/zstack-size.s

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
# RUN: ld.lld -z stack-size=0 %t -o %t2
77
# RUN: llvm-readobj -program-headers %t2 | FileCheck %s -check-prefix=CHECK2
88

9+
# RUN: ld.lld -z stack-size=0x2000 -z stack-size=0x1000 %t -o %t3
10+
# RUN: llvm-readobj -program-headers %t3 | FileCheck %s -check-prefix=CHECK1
11+
912
.global _start
1013
_start:
1114
nop

0 commit comments

Comments
 (0)
Please sign in to comment.