diff options
| author | Tanya Lattner <tonic@nondot.org> | 2008-01-18 19:15:06 +0000 |
|---|---|---|
| committer | Tanya Lattner <tonic@nondot.org> | 2008-01-18 19:15:06 +0000 |
| commit | 2e1232ef6f689b49e74bf6501b5bbf1afb96c8fb (patch) | |
| tree | 0a64e10764fa20358eb995a2fd5bf20ece675c03 | |
| parent | f2190a5c186f7b4c5f3106c7ba2f6e878cd0f5ea (diff) | |
| download | llvm-2e1232ef6f689b49e74bf6501b5bbf1afb96c8fb.zip llvm-2e1232ef6f689b49e74bf6501b5bbf1afb96c8fb.tar.gz llvm-2e1232ef6f689b49e74bf6501b5bbf1afb96c8fb.tar.bz2 | |
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
| -rw-r--r-- | llvm/lib/Target/ARM/ARMAsmPrinter.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/ARMAsmPrinter.cpp b/llvm/lib/Target/ARM/ARMAsmPrinter.cpp index 4cea342..416084a 100644 --- a/llvm/lib/Target/ARM/ARMAsmPrinter.cpp +++ b/llvm/lib/Target/ARM/ARMAsmPrinter.cpp @@ -845,9 +845,8 @@ bool ARMAsmPrinter::doFinalization(Module &M) { } } - 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); |