Skip to content

Commit 2e1232e

Browse files
committed
Merge from mainline.
Revert the part of 45849 that treated weak globals as weak globals rather than commons. While not wrong, this change tickled a latent bug in Darwin's strip, so revert it for now as a workaround. llvm-svn: 46168
1 parent f2190a5 commit 2e1232e

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

llvm/lib/Target/ARM/ARMAsmPrinter.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -845,9 +845,8 @@ bool ARMAsmPrinter::doFinalization(Module &M) {
845845
}
846846
}
847847

848-
if (I->hasInternalLinkage() ||
849-
(!Subtarget->isTargetDarwin() &&
850-
(I->hasWeakLinkage() || I->hasLinkOnceLinkage()))) {
848+
if (I->hasInternalLinkage() || I->hasWeakLinkage() ||
849+
I->hasLinkOnceLinkage()) {
851850
if (Size == 0) Size = 1; // .comm Foo, 0 is undefined, avoid it.
852851
if (!NoZerosInBSS && TAI->getBSSSection())
853852
SwitchToDataSection(TAI->getBSSSection(), I);

0 commit comments

Comments
 (0)