Author: tbrethou
Date: Fri Jan 18 13:15:06 2008
New Revision: 46168
URL: http://llvm.org/viewvc/llvm-project?rev=46168&view=rev
Log:
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.
Modified:
llvm/branches/release_22/lib/Target/ARM/ARMAsmPrinter.cpp
Modified: llvm/branches/release_22/lib/Target/ARM/ARMAsmPrinter.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/branches/release_22/lib/Target/ARM/ARMAsmPrinter.cpp?rev=46168&r1=46167&r2=46168&view=diff
==============================================================================
--- llvm/branches/release_22/lib/Target/ARM/ARMAsmPrinter.cpp (original)
+++ llvm/branches/release_22/lib/Target/ARM/ARMAsmPrinter.cpp Fri Jan 18
13:15:06 2008
@@ -845,9 +845,8 @@
}
}
- if (I->hasInternalLinkage() ||
- (!Subtarget->isTargetDarwin() &&
- (I->hasWeakLinkage() || I->hasLinkOnceLinkage()))) {
+ if (I->hasInternalLinkage() || I->hasWeakLinkage() ||
+ I->hasLinkOnceLinkage()) {
if (Size == 0) Size = 1; // .comm Foo, 0 is undefined, avoid it.
if (!NoZerosInBSS && TAI->getBSSSection())
SwitchToDataSection(TAI->getBSSSection(), I);
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
