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 | 57c9d380f627430d2f33b71737104f238266fb7e (patch) | |
| tree | ec403a4549e3df09409757232f86e4a9bea26bba | |
| parent | b755295fdb460d0eeb7ea9dfb54d7cf43d487880 (diff) | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_22@46168 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/ARM/ARMAsmPrinter.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Target/ARM/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp index 4cea34271e..416084adce 100644 --- a/lib/Target/ARM/ARMAsmPrinter.cpp +++ b/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); |